From c6bda1524ff7b5e92abcb1cbcd8a2ad3cf510d58 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 4 May 2016 08:23:48 +0000 Subject: [PATCH] Mobile theme: - Replace 'Edit' caption in view template with an icon, makes it similar to other dialogs --- api/js/jsapi/app_base.js | 1 - pixelegg/css/mobile.css | 6 +---- pixelegg/css/pixelegg.css | 40 ---------------------------------- pixelegg/mobile/fw_mobile.css | 16 +++++++++----- pixelegg/mobile/fw_mobile.less | 4 ++++ 5 files changed, 15 insertions(+), 52 deletions(-) diff --git a/api/js/jsapi/app_base.js b/api/js/jsapi/app_base.js index 3db88b87e3..301b00ad7b 100644 --- a/api/js/jsapi/app_base.js +++ b/api/js/jsapi/app_base.js @@ -457,7 +457,6 @@ var AppJS = (function(){ "use strict"; return Class.extend( .click(function(){ egw.open(rowID, self.appname); }) - .text(egw.lang('Edit')) .appendTo(this.viewContainer); } // view template main container (content) diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index ea50481fb7..42dc627498 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -23,10 +23,6 @@ /** * addapted from orginal styles.php */ -/** - * EGroupware general def_*.less are moved to phpgwapi/templates/default/*.less - * so they can be included from app specific files and are independent of Pixelegg template - */ /** * All app_* files are now again in $app/templates/default/app.less&css and will be included independent * @@ -5778,7 +5774,7 @@ a.textSidebox { * * @link http://www.egroupware.org * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License - * @author Hadi NAtegh + * @author Hadi Nategh * @package phpgwapi * @version $Id$ */ diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index f74dd7042f..833b6394b1 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -1465,26 +1465,6 @@ div#ui-datepicker-div { .ms-ctn .ms-trigger { border-left: none; } -/** - * EGroupware: CSS with less preprocessor - - * traditional.less - * included in pixelegg.less since 17/03/2014 - - - * - * Please do NOT change css-files directly, instead change less-files and compile them! - * - * @link http://www.egroupware.org - * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License - * @author Stefan Reinhard - * @package phpgwapi - * @version $Id$ - */ -/* - font styling - allowed attributes: font-family,font-size,color,font-weight -*/ /** * layout_*.less files are Pixelegg template specific */ @@ -2459,7 +2439,6 @@ button[id="add"] { button[id="add"]:active { background-color: #1aa200 !important; } -/*Button Ende #######################################################*/ /** * EGroupware: Stylite Pixelegg template * @@ -3387,10 +3366,6 @@ h6 { td.lettersearch { background-image: none; } -/*.nextmatch_header table { - border: none !important; - width: 99% !important; -}*/ /** * EGroupware: CSS with less preprocessor * @@ -5147,21 +5122,6 @@ button.image_button { * @package pixelegg * @version $Id$ */ -/* disabled for now in pixelegg.less, until we use svg outside filemanager thumbnails - -//SVG Filter / not for Logo -#egw_fw_sidebar img[src$="svg"]{ - .gradient_vertical (@gray_60, @gray_60); - .rounded(3px); - border: 1px solid @gray_0;; -} - -#egw_fw_main img[src$="svg"], -#egw_fw_footer img[src$="svg"]{ - //.gradient_vertical (@egw_color_2_a, @egw_color_2_a); - .gradient_vertical (fade(@gray_100,50%), fade(@gray_100,50%)); - -}*/ /** * EGroupware: Stylite Pixelegg template * diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css index 77bac25c7e..1bcc582280 100644 --- a/pixelegg/mobile/fw_mobile.css +++ b/pixelegg/mobile/fw_mobile.css @@ -29,15 +29,11 @@ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @author Stefan Reinhard * @package pixelegg - * @version $Id: pixelegg.less 50920 2014-11-26 16:54:04Z ralfbecker $ + * @version $Id: pixelegg.less 55973 2016-05-02 12:31:24Z ralfbecker $ */ /** * addapted from orginal styles.php */ -/** - * EGroupware general def_*.less are moved to phpgwapi/templates/default/*.less - * so they can be included from app specific files and are independent of Pixelegg template - */ /** * All app_* files are now again in $app/templates/default/app.less&css and will be included independent * @@ -5789,7 +5785,7 @@ a.textSidebox { * * @link http://www.egroupware.org * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License - * @author Hadi NAtegh + * @author Hadi Nategh * @package phpgwapi * @version $Id$ */ @@ -7965,6 +7961,14 @@ form[id^="tracker-"] .dialogHeadbar { z-index: 104; font-size: 18pt !important; color: white; + background-image: url(../images/edit.svg); + background-repeat: no-repeat; + -webkit-filter: brightness(0) invert(1) !important; + filter: brightness(0) invert(1) !important; + background-color: transparent !important; + background-size: 24px 24px !important; + border: none; + background-position: center; display: block; } body .mobile-view-editBtn:before { diff --git a/pixelegg/mobile/fw_mobile.less b/pixelegg/mobile/fw_mobile.less index 3c12e0d54c..417a56430f 100644 --- a/pixelegg/mobile/fw_mobile.less +++ b/pixelegg/mobile/fw_mobile.less @@ -1163,6 +1163,10 @@ z-index:104; font-size:18pt !important; color: white; + background-image: url(../images/edit.svg); + background-repeat: no-repeat; + .white-svg; + background-position: center; &:before { content: ""; font-size: 24pt;