banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set 'iframe' class to <html> instead of <body>, cleanup some font-sizes

Browse Source
pull/5742/merge
Aleksander Machniak 8 years ago
parent 3e0ac3bfb8
commit 9f81603afb
5 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File

12
skins/elastic/includes/layout.html
Unescape Escape View File

@ -1,7 +1,11 @@
<roundcube:add_label name="errortitle" /> <roundcube:add_label name="errortitle" />
<roundcube:object name="doctype" value="html5" /> <roundcube:object name="doctype" value="html5" />
<roundcube:if condition="!env:framed || env:extwin" />
<html> <html>
<roundcube:else />
<html class="iframe">
<roundcube:endif />
<head> <head>
<title><roundcube:object name="pagetitle" /></title> <title><roundcube:object name="pagetitle" /></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no" id="viewport"> <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no" id="viewport">
@ -16,9 +20,7 @@
<roundcube:link rel="stylesheet" type="text/css" href="/styles/print.css" condition="env:action == 'print'" /> <roundcube:link rel="stylesheet" type="text/css" href="/styles/print.css" condition="env:action == 'print'" />
<roundcube:endif /> <roundcube:endif />
</head> </head>
<roundcube:if condition="!env:framed || env:extwin" />
<body class="task-<roundcube:exp expression="env:task ?: 'error'">"> <body class="task-<roundcube:exp expression="env:task ?: 'error'">">
<div id="layout"> <roundcube:if condition="!env:framed || env:extwin" />
<roundcube:else /> <div id="layout">
<body class="iframe task-<roundcube:exp expression="env:task ?: 'error'">"> <roundcube:endif />
<roundcube:endif />

15
skins/elastic/styles/layout.less
Unescape Escape View File

@ -36,10 +36,10 @@ NOTE: below 1024px we do some UI elements bigger, as this is good (imho)
html { html {
height: 100%; height: 100%;
font-size: @page-font-size;
} }
body { body {
font-size: @page-font-size;
line-height: 1; line-height: 1;
min-width: @page-min-width; min-width: @page-min-width;
height: 100%; height: 100%;
@ -54,7 +54,6 @@ body > #layout {
height: 100%; height: 100%;
width: 100%; width: 100%;
& > div { & > div {
&.sidebar, &.sidebar,
&.list { &.list {
@ -116,10 +115,10 @@ body > #layout {
& > .header, & > .header,
& > .footer { & > .footer {
background-color: @layout-header-background-color; background-color: @layout-header-background-color;
font-size: 1.2em; font-size: 1rem;
font-weight: bold; font-weight: bold;
line-height: 2.5em; line-height: 2.5rem;
height: 2.5em; height: 2.5rem;
padding: 0 0.25em; padding: 0 0.25em;
margin: 0; margin: 0;
position: relative; /* for absolute positioning of searchbar */ position: relative; /* for absolute positioning of searchbar */
@ -146,7 +145,7 @@ body > #layout {
} }
} }
body.iframe { html.iframe body {
overflow: auto; overflow: auto;
#content { #content {
@ -179,8 +178,8 @@ body.iframe {
} }
@media screen and (max-width: @screen-width-medium) { @media screen and (max-width: @screen-width-medium) {
body:not(.iframe) { html:not(.iframe) {
font-size: 1.2em; font-size: 120%;
} }
} }

8
skins/elastic/styles/styles.less
Unescape Escape View File

@ -72,9 +72,9 @@ button, input, select, textarea {
.font-icon-class { .font-icon-class {
font-size: 1.25em; font-size: 1.25em;
/*display: inline-block;*/ /*
/* FIXME: with inline-block we have a problem with icon alignment, display: inline-block;
use display:block; float: left; FIXME: with inline-block we have some problems with icon alignment
*/ */
display: block; display: block;
float: left; float: left;
@ -128,7 +128,7 @@ button, input, select, textarea {
display: none; display: none;
} }
body.iframe { html.iframe body {
.formcontent { .formcontent {
padding: 1em; padding: 1em;
} }

4
skins/elastic/styles/widgets/searchbar.less
Unescape Escape View File

@ -10,10 +10,6 @@
top: 0; top: 0;
right: 0; right: 0;
& > * {
height: 2.5em;
}
form, form,
a.button.options, a.button.options,
a.button.reset { a.button.reset {

2
skins/elastic/styles/widgets/toolbar.less
Unescape Escape View File

@ -107,8 +107,6 @@
} }
.dropbutton { .dropbutton {
display: inline-block;
a.button:first-child { a.button:first-child {
padding-right: 0; padding-right: 0;
} }

Write Preview
Loading…
Cancel
Save