diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-06-20 15:30:17 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-06-20 15:30:17 +0200 |
| commit | 1db12a9037796610df11a8be819cf126011b5818 (patch) | |
| tree | 1fd10e7f5ff1a0ea8ab405f5b8f8d4014759023d | |
| parent | 219461fc7443e56ce93d5d3eee2891d32aa95d0c (diff) | |
Fix so all pages are displayed correctly in extwin mode (#1489952)
| -rw-r--r-- | plugins/managesieve/skins/larry/templates/managesieve.html | 2 | ||||
| -rw-r--r-- | skins/larry/styles.css | 16 | ||||
| -rw-r--r-- | skins/larry/templates/addressbook.html | 2 | ||||
| -rw-r--r-- | skins/larry/templates/folders.html | 2 | ||||
| -rw-r--r-- | skins/larry/templates/identities.html | 3 | ||||
| -rw-r--r-- | skins/larry/templates/importcontacts.html | 25 | ||||
| -rw-r--r-- | skins/larry/templates/responses.html | 2 | ||||
| -rw-r--r-- | skins/larry/templates/settings.html | 2 |
8 files changed, 30 insertions, 24 deletions
diff --git a/plugins/managesieve/skins/larry/templates/managesieve.html b/plugins/managesieve/skins/larry/templates/managesieve.html index 8d648dbdc..494af6ae2 100644 --- a/plugins/managesieve/skins/larry/templates/managesieve.html +++ b/plugins/managesieve/skins/larry/templates/managesieve.html @@ -4,7 +4,7 @@ <title><roundcube:object name="pagetitle" /></title> <roundcube:include file="/includes/links.html" /> </head> -<body class="noscroll"> +<roundcube:if condition="env:extwin" /><body class="noscroll extwin"><roundcube:else /><body class="noscroll"><roundcube:endif /> <roundcube:include file="/includes/header.html" /> diff --git a/skins/larry/styles.css b/skins/larry/styles.css index 83adaebec..743ad71f4 100644 --- a/skins/larry/styles.css +++ b/skins/larry/styles.css @@ -1054,6 +1054,14 @@ a.iconlink.upload { bottom: 0; } +#mainscreen.offset { + top: 132px; +} + +#mainscreen .offset { + top: 42px; +} + .minimal #mainscreen { top: 62px; } @@ -1066,12 +1074,8 @@ a.iconlink.upload { top: 40px; } -#mainscreen.offset { - top: 132px; -} - -#mainscreen .offset { - top: 42px; +.extwin #mainscreen.offset { + top: 86px; } .uibox { diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html index 153cfc4d7..60ea35525 100644 --- a/skins/larry/templates/addressbook.html +++ b/skins/larry/templates/addressbook.html @@ -4,7 +4,7 @@ <title><roundcube:object name="pagetitle" /></title> <roundcube:include file="/includes/links.html" /> </head> -<body class="noscroll"> +<roundcube:if condition="env:extwin" /><body class="noscroll extwin"><roundcube:else /><body class="noscroll"><roundcube:endif /> <roundcube:include file="/includes/header.html" /> diff --git a/skins/larry/templates/folders.html b/skins/larry/templates/folders.html index ffb0a7ee1..eed563133 100644 --- a/skins/larry/templates/folders.html +++ b/skins/larry/templates/folders.html @@ -4,7 +4,7 @@ <title><roundcube:object name="pagetitle" /></title> <roundcube:include file="/includes/links.html" /> </head> -<body class="noscroll"> +<roundcube:if condition="env:extwin" /><body class="noscroll extwin"><roundcube:else /><body class="noscroll"><roundcube:endif /> <roundcube:include file="/includes/header.html" /> diff --git a/skins/larry/templates/identities.html b/skins/larry/templates/identities.html index 5878155c6..163469d16 100644 --- a/skins/larry/templates/identities.html +++ b/skins/larry/templates/identities.html @@ -4,7 +4,7 @@ <title><roundcube:object name="pagetitle" /></title> <roundcube:include file="/includes/links.html" /> </head> -<body class="noscroll"> +<roundcube:if condition="env:extwin" /><body class="noscroll extwin"><roundcube:else /><body class="noscroll"><roundcube:endif /> <roundcube:include file="/includes/header.html" /> @@ -15,7 +15,6 @@ <roundcube:include file="/includes/settingstabs.html" /> <div id="settings-right" role="main" aria-labelledby="aria-label-identitieslist"> - <div id="identitieslist" class="uibox listbox"> <h2 class="boxtitle" id="aria-label-identitieslist"><roundcube:label name="identities" /></h2> <div class="scroller withfooter"> diff --git a/skins/larry/templates/importcontacts.html b/skins/larry/templates/importcontacts.html index 2bc1d4a26..f18338cc0 100644 --- a/skins/larry/templates/importcontacts.html +++ b/skins/larry/templates/importcontacts.html @@ -4,26 +4,29 @@ <title><roundcube:object name="pagetitle" /></title> <roundcube:include file="/includes/links.html" /> </head> -<body> +<roundcube:if condition="env:extwin" /><body class="extwin"><roundcube:else /><body><roundcube:endif /> <roundcube:include file="/includes/header.html" /> <div id="mainscreen"> -<div id="addressbooktoolbar" class="toolbar"> +<h1 class="voice"><roundcube:label name="addressbook" /> : <roundcube:label name="importcontacts" /></h1> + +<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2> +<div id="addressbooktoolbar" class="toolbar" role="toolbar" aria-labelledby="aria-label-toolbar"> <roundcube:button command="list" type="link" class="button back disabled" classAct="button back" classSel="button back pressed" label="back" /> </div> -<div id="pluginbody" class="offset uibox contentbox"> -<h1 class="boxtitle"><roundcube:label name="importcontacts" /></h1> +<div id="mainscreencontent" class="uibox contentbox"> + <h2 class="boxtitle"><roundcube:label name="importcontacts" /></h2> -<div id="import-box" class="boxcontent"> -<roundcube:object name="importstep" class="propform" /> -<br/> -<p class="formbuttons"> - <roundcube:object name="importnav" class="button" /> -</p> -</div> + <div id="import-box" class="boxcontent"> + <roundcube:object name="importstep" class="propform" /> + <br/> + <p class="formbuttons"> + <roundcube:object name="importnav" class="button" /> + </p> + </div> </div> </div> diff --git a/skins/larry/templates/responses.html b/skins/larry/templates/responses.html index 538a025f0..8f91a8f65 100644 --- a/skins/larry/templates/responses.html +++ b/skins/larry/templates/responses.html @@ -4,7 +4,7 @@ <title><roundcube:object name="pagetitle" /></title> <roundcube:include file="/includes/links.html" /> </head> -<body class="noscroll"> +<roundcube:if condition="env:extwin" /><body class="noscroll extwin"><roundcube:else /><body class="noscroll"><roundcube:endif /> <roundcube:include file="/includes/header.html" /> diff --git a/skins/larry/templates/settings.html b/skins/larry/templates/settings.html index 406b9c9b3..34c3440cc 100644 --- a/skins/larry/templates/settings.html +++ b/skins/larry/templates/settings.html @@ -4,7 +4,7 @@ <title><roundcube:object name="pagetitle" /></title> <roundcube:include file="/includes/links.html" /> </head> -<body class="noscroll"> +<roundcube:if condition="env:extwin" /><body class="noscroll extwin"><roundcube:else /><body class="noscroll"><roundcube:endif /> <roundcube:include file="/includes/header.html" /> |