From 9f81603afbed036945c33d3112ade2910f5613e9 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 24 Mar 2017 16:18:53 +0100 Subject: [PATCH] Set 'iframe' class to instead of , cleanup some font-sizes --- skins/elastic/includes/layout.html | 12 +++++++----- skins/elastic/styles/layout.less | 15 +++++++-------- skins/elastic/styles/styles.less | 10 +++++----- skins/elastic/styles/widgets/searchbar.less | 4 ---- skins/elastic/styles/widgets/toolbar.less | 2 -- 5 files changed, 19 insertions(+), 24 deletions(-) diff --git a/skins/elastic/includes/layout.html b/skins/elastic/includes/layout.html index a6fa040f9..4a1a6583f 100644 --- a/skins/elastic/includes/layout.html +++ b/skins/elastic/includes/layout.html @@ -1,7 +1,11 @@ + + + + <roundcube:object name="pagetitle" /> @@ -16,9 +20,7 @@ - "> -
- -"> - + +
+ diff --git a/skins/elastic/styles/layout.less b/skins/elastic/styles/layout.less index 07567400d..a46d2b736 100644 --- a/skins/elastic/styles/layout.less +++ b/skins/elastic/styles/layout.less @@ -36,10 +36,10 @@ NOTE: below 1024px we do some UI elements bigger, as this is good (imho) html { height: 100%; + font-size: @page-font-size; } body { - font-size: @page-font-size; line-height: 1; min-width: @page-min-width; height: 100%; @@ -54,7 +54,6 @@ body > #layout { height: 100%; width: 100%; - & > div { &.sidebar, &.list { @@ -116,10 +115,10 @@ body > #layout { & > .header, & > .footer { background-color: @layout-header-background-color; - font-size: 1.2em; + font-size: 1rem; font-weight: bold; - line-height: 2.5em; - height: 2.5em; + line-height: 2.5rem; + height: 2.5rem; padding: 0 0.25em; margin: 0; position: relative; /* for absolute positioning of searchbar */ @@ -146,7 +145,7 @@ body > #layout { } } -body.iframe { +html.iframe body { overflow: auto; #content { @@ -179,8 +178,8 @@ body.iframe { } @media screen and (max-width: @screen-width-medium) { - body:not(.iframe) { - font-size: 1.2em; + html:not(.iframe) { + font-size: 120%; } } diff --git a/skins/elastic/styles/styles.less b/skins/elastic/styles/styles.less index 458910f07..bc05b2b29 100644 --- a/skins/elastic/styles/styles.less +++ b/skins/elastic/styles/styles.less @@ -72,10 +72,10 @@ button, input, select, textarea { .font-icon-class { font-size: 1.25em; - /*display: inline-block;*/ - /* FIXME: with inline-block we have a problem with icon alignment, - use display:block; float: left; - */ + /* + display: inline-block; + FIXME: with inline-block we have some problems with icon alignment + */ display: block; float: left; margin: 0em 0.25rem 0em 0em; @@ -128,7 +128,7 @@ button, input, select, textarea { display: none; } -body.iframe { +html.iframe body { .formcontent { padding: 1em; } diff --git a/skins/elastic/styles/widgets/searchbar.less b/skins/elastic/styles/widgets/searchbar.less index 3225900e4..571fc50f2 100644 --- a/skins/elastic/styles/widgets/searchbar.less +++ b/skins/elastic/styles/widgets/searchbar.less @@ -10,10 +10,6 @@ top: 0; right: 0; - & > * { - height: 2.5em; - } - form, a.button.options, a.button.reset { diff --git a/skins/elastic/styles/widgets/toolbar.less b/skins/elastic/styles/widgets/toolbar.less index f50fbcd86..5b2638e91 100644 --- a/skins/elastic/styles/widgets/toolbar.less +++ b/skins/elastic/styles/widgets/toolbar.less @@ -107,8 +107,6 @@ } .dropbutton { - display: inline-block; - a.button:first-child { padding-right: 0; }