From 15b5b3cc5c987e4079c1be625de85b25a66a26ad Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Mon, 11 Apr 2016 09:10:51 +0000 Subject: [PATCH] Mobile theme W.I.P.: - Get CKEditor html toolbar working - Fix popups scroll area --- mail/templates/mobile/app.css | 3 --- mail/templates/mobile/app.less | 3 --- pixelegg/mobile/fw_mobile.css | 16 ++++++++++++++++ pixelegg/mobile/fw_mobile.less | 22 ++++++++++++++++++++++ 4 files changed, 38 insertions(+), 6 deletions(-) diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css index 07cb9847bc..e39b2dc034 100644 --- a/mail/templates/mobile/app.css +++ b/mail/templates/mobile/app.css @@ -2612,9 +2612,6 @@ div.mailComposeHeaderSection > table { border: none; box-shadow: none; } - body #mail-compose span#cke_1_top { - display: none; - } body #mail-compose .mailComposeHeaderSection > table { padding: 0; } diff --git a/mail/templates/mobile/app.less b/mail/templates/mobile/app.less index 0085894f5e..2fc3d79f60 100644 --- a/mail/templates/mobile/app.less +++ b/mail/templates/mobile/app.less @@ -163,9 +163,6 @@ border:none; box-shadow: none; } - span#cke_1_top { - display: none; - } .mailComposeHeaderSection > table { padding: 0; tr.mailComposeHeaders.subjectContainer td:first-child::after { diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css index a6d3eeb50c..90076ff03a 100644 --- a/pixelegg/mobile/fw_mobile.css +++ b/pixelegg/mobile/fw_mobile.css @@ -7067,6 +7067,8 @@ form[id^="tracker-"] .dialogHeadbar { /**************************************/ /*************** SLIDESWITCH **********/ /***************************************/ + /*************** CKEDITOR **************/ + /***************************************/ } body button[id*="save"]:hover, body button[id*="apply"]:hover, @@ -8079,4 +8081,18 @@ form[id^="tracker-"] .dialogHeadbar { box-shadow: 0 2px 2px #474747, 0 0px 0 rgba(255, 255, 255, 0.2); z-index: 2; } + body .cke_inner .cke_toolbox .cke_toolbox_main { + height: 30px; + white-space: nowrap; + display: inline-block; + overflow-y: hidden; + width: 100%; + } + body .cke_inner .cke_toolbox .cke_toolbox_main .cke_toolbar { + display: inline-block; + float: none; + } + body .cke_inner .cke_toolbox .cke_toolbox_collapser { + height: auto; + } } diff --git a/pixelegg/mobile/fw_mobile.less b/pixelegg/mobile/fw_mobile.less index 446f0f35ab..fd04483103 100644 --- a/pixelegg/mobile/fw_mobile.less +++ b/pixelegg/mobile/fw_mobile.less @@ -1267,5 +1267,27 @@ } } } + + /*************** CKEDITOR **************/ + /***************************************/ + .cke_inner { + .cke_toolbox { + .cke_toolbox_main { + height: 30px; + white-space: nowrap; + display: inline-block; + overflow-y: hidden; + width: 100%; + .cke_toolbar { + display: inline-block; + float: none; + } + } + + .cke_toolbox_collapser { + height: auto; + } + } + } } }