From eb0f7d5978630335bbb0d4f52a2e5eac90421150 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 31 Mar 2016 10:05:39 +0000 Subject: [PATCH] Mobile theme W.I.P.: - Fix edit dialogs get scrollbar - Fix missing function brackets - Apply padding fixes from commit 55572 into mobile fw --- phpgwapi/js/egw_action/egw_action_popup.js | 2 +- phpgwapi/js/jsapi/app_base.js | 11 ++++----- pixelegg/css/pixelegg.css | 2 +- pixelegg/mobile/fw_mobile.css | 28 ++++++++++++---------- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/phpgwapi/js/egw_action/egw_action_popup.js b/phpgwapi/js/egw_action/egw_action_popup.js index d04b7b4da0..b6ddad015b 100644 --- a/phpgwapi/js/egw_action/egw_action_popup.js +++ b/phpgwapi/js/egw_action/egw_action_popup.js @@ -131,7 +131,7 @@ function egwPopupActionImplementation() var defaultHandler = function(e) { // Prevent bubbling bound event on tag, on touch devices // a tag should be handled by default event - if (egwIsMobile && e.target.tagName == "A") return true; + if (egwIsMobile() && e.target.tagName == "A") return true; if (typeof document.selection != "undefined" && typeof document.selection.empty != "undefined") { diff --git a/phpgwapi/js/jsapi/app_base.js b/phpgwapi/js/jsapi/app_base.js index 6606220e83..b640bbc7e2 100644 --- a/phpgwapi/js/jsapi/app_base.js +++ b/phpgwapi/js/jsapi/app_base.js @@ -429,20 +429,19 @@ var AppJS = (function(){ "use strict"; return Class.extend( // view container this.viewContainer = jQuery(document.createElement('div')) .addClass('et2_mobile_view') - .css({"z-index":102, + .css({ + "z-index":102, width:"100%", height:"100%", background:"white", display:'block', position: 'absolute', - top:0, left:0, bottom:0, right:0, - overflow:'auto', - "padding":'60px 0 10px 0'}) + overflow:'auto' + }) .attr('id','popupMainDiv') - .addClass('popupMainDiv') .appendTo('body'); // close button @@ -464,7 +463,7 @@ var AppJS = (function(){ "use strict"; return Class.extend( // view template main container (content) this.viewTemplate = jQuery(document.createElement('div')) .attr('id', this.appname+'-view') - .addClass('et2_mobile-view-container') + .addClass('et2_mobile-view-container popupMainDiv') .appendTo(this.viewContainer); var templateName = _action.data.mobileViewTemplate || 'edit'; diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index a6675bafd5..01346141b0 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -3655,7 +3655,7 @@ td.message span.message { } .egwGridView_scrollarea { width: 100%; - overflow-y: auto; + overflow-y: scroll; overflow-x: hidden; } /** diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css index 0a4703f1aa..f49e1e8e3f 100644 --- a/pixelegg/mobile/fw_mobile.css +++ b/pixelegg/mobile/fw_mobile.css @@ -76,7 +76,6 @@ button, select { margin: 1px; - padding: 0px; /*-webkit-appearance: none;*/ } /** @@ -2662,7 +2661,7 @@ div.client_error_log tr td.stack > div { * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @author Stefan Reinhardt * @package phpgwapi - * @version $Id: layout_content_elements.less 54870 2016-01-28 18:17:40Z hnategh $ + * @version $Id: layout_content_elements.less 55572 2016-03-31 09:21:55Z ralfbecker $ */ /* ####################################################################################### * @@ -2692,7 +2691,6 @@ input { &:focus{.Complete_Button_input_focus;}*/ } select { - padding: 3px; margin: 0; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -2747,7 +2745,9 @@ input, button { color: #000000; /*font-size:99%;*/ - padding: 2px 0px; + padding-top: 2px; + padding-bottom: 2px; + padding-right: 0; border-width: 1px; border-style: solid; border-color: #e6e6e6; @@ -2900,7 +2900,7 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @author Stefan Reinhard * @package pixelegg - * @version $Id: layout_dialog.less 53382 2015-08-14 09:49:57Z hnategh $ + * @version $Id: layout_dialog.less 55572 2016-03-31 09:21:55Z ralfbecker $ */ /*body { background-color: @gray_0; @@ -2919,17 +2919,16 @@ div#popupMainDiv > * { form.et2_container { padding: 0; } -form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget select { +form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget select, +form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input { height: 20px; - padding: 0; - margin: 0px; + padding-right: 0; + padding-top: 0; + padding-bottom: 0; font-size: 0.95em; } form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input { - height: 20px; - padding: 0; margin: 4px 5px 4px 0; - font-size: 0.95em; -webkit-border-top-right-radius: 3px; -webkit-border-bottom-right-radius: 3px; -webkit-border-bottom-left-radius: 3px; @@ -3215,6 +3214,9 @@ div#etemplate\.tab_widget { .dialogFooterToolbar td { padding: 0px 5px 0px 0px; } +.dialogFooterToolbar td:first-child { + padding-left: 5px; +} .dialogFooterToolbar button { height: 24px; min-width: 86px; @@ -3659,7 +3661,7 @@ td.message span.message { * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @author Stefan Reinhardt * @package pixelegg - * @version $Id: layout_raster.less 50846 2014-07-24 08:27:05Z pixelegg $ + * @version $Id: layout_raster.less 55572 2016-03-31 09:21:55Z ralfbecker $ */ /* ################################################# * Basecontainer @@ -3675,7 +3677,7 @@ td.message span.message { } .egwGridView_scrollarea { width: 100%; - overflow-y: auto; + overflow-y: scroll; overflow-x: hidden; } /**