From dec5096381ec9223e2fca528686b73161436a8de Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Sun, 2 Jun 2013 20:01:55 +0200 Subject: [PATCH] Fixed layout issue --- com.woltlab.wcf/template/footer.tpl | 17 +-- com.woltlab.wcf/template/header.tpl | 63 +++++----- .../acp/style/blueTemptation/individual.less | 20 +-- .../files/acp/style/setup/WCFSetup.css | 55 +++++---- .../install/files/acp/templates/footer.tpl | 3 +- .../install/files/acp/templates/header.tpl | 73 +++++------ wcfsetup/install/files/style/layout.less | 114 +++++++++--------- wcfsetup/setup/template/footer.tpl | 3 +- wcfsetup/setup/template/header.tpl | 14 +-- 9 files changed, 188 insertions(+), 174 deletions(-) diff --git a/com.woltlab.wcf/template/footer.tpl b/com.woltlab.wcf/template/footer.tpl index 7a5730c2b0..fc07a66ff1 100644 --- a/com.woltlab.wcf/template/footer.tpl +++ b/com.woltlab.wcf/template/footer.tpl @@ -1,12 +1,13 @@ - {event name='contents'} + {event name='contents'} + + {if $skipBreadcrumbs|empty}{include file='breadcrumbs' __microdata=false}{/if} + + - {if $skipBreadcrumbs|empty}{include file='breadcrumbs' __microdata=false}{/if} - - - - {if $sidebarOrientation|isset && $sidebarOrientation == 'right'} - {@$__sidebar} - {/if} + {if $sidebarOrientation|isset && $sidebarOrientation == 'right'} + {@$__sidebar} + {/if} + diff --git a/com.woltlab.wcf/template/header.tpl b/com.woltlab.wcf/template/header.tpl index 54a540138b..7559b88e7f 100644 --- a/com.woltlab.wcf/template/header.tpl +++ b/com.woltlab.wcf/template/header.tpl @@ -45,37 +45,38 @@
- {capture assign='__sidebar'} - {if $sidebar|isset} - - - {if $sidebarOrientation|isset && $sidebarOrientation == 'right'} - +
+ {capture assign='__sidebar'} + {if $sidebar|isset} + + + {if $sidebarOrientation|isset && $sidebarOrientation == 'right'} + + {/if} {/if} - {/if} - {/capture} - - {if !$sidebarOrientation|isset || $sidebarOrientation == 'left'} - {@$__sidebar} - {/if} - -
+ {/capture} - {event name='contents'} - - {if $skipBreadcrumbs|empty}{include file='breadcrumbs'}{/if} + {if !$sidebarOrientation|isset || $sidebarOrientation == 'left'} + {@$__sidebar} + {/if} + +
+ + {event name='contents'} + + {if $skipBreadcrumbs|empty}{include file='breadcrumbs'}{/if} \ No newline at end of file diff --git a/wcfsetup/install/files/acp/style/blueTemptation/individual.less b/wcfsetup/install/files/acp/style/blueTemptation/individual.less index 0b8130034f..848e174bba 100644 --- a/wcfsetup/install/files/acp/style/blueTemptation/individual.less +++ b/wcfsetup/install/files/acp/style/blueTemptation/individual.less @@ -126,16 +126,18 @@ body, .tabularBox, .dialogTitlebar { #main { > div { - > .sidebar { - .boxShadowInset(0, 0, rgba(0, 0, 0, .1), 2px); - - > span > .collapsibleButton { - border-width: 1px 0 1px 1px; - border-style: solid; - border-color: darken(@wcfSidebarBackgroundColor, 8%); - clip: rect(-5px 25px 31px -5px); + > div { + > .sidebar { + .boxShadowInset(0, 0, rgba(0, 0, 0, .1), 2px); - .boxShadow(0, 0, rgba(0, 0, 0, 0.1), 2px); + > span > .collapsibleButton { + border-width: 1px 0 1px 1px; + border-style: solid; + border-color: darken(@wcfSidebarBackgroundColor, 8%); + clip: rect(-5px 25px 31px -5px); + + .boxShadow(0, 0, rgba(0, 0, 0, 0.1), 2px); + } } } } diff --git a/wcfsetup/install/files/acp/style/setup/WCFSetup.css b/wcfsetup/install/files/acp/style/setup/WCFSetup.css index e6852317e7..de8f8cd9d1 100644 --- a/wcfsetup/install/files/acp/style/setup/WCFSetup.css +++ b/wcfsetup/install/files/acp/style/setup/WCFSetup.css @@ -1,4 +1,4 @@ -/* stylesheet for 'Blue Temptation', generated on Tue, 28 May 2013 13:51:45 +0000 -- DO NOT EDIT */ +/* stylesheet for 'Blue Temptation', generated on Sun, 02 Jun 2013 17:58:58 +0000 -- DO NOT EDIT */ html, body, @@ -415,6 +415,7 @@ q:after { } .codeBox { background-color: #ffffff; + clear: both; } .codeBox > div { padding: 14px 21px 14px 14px; @@ -544,6 +545,7 @@ q:after { } .quoteBox { background-color: #ffffff; + clear: both; min-height: 28px; margin-bottom: 4px; position: relative; @@ -590,6 +592,7 @@ q:after { } .spoilerBox { background-color: #ffffff; + clear: both; padding-bottom: 7px; } .spoilerBox > header { @@ -2233,7 +2236,7 @@ a.badge:hover.pink { @font-face { font-family: 'FontAwesome'; src: url('../font/fontawesome-webfont.eot?v=3.1.1'); - src: url('../font/fontawesome-webfont.eot?#iefix&v=3.1.1') format('embedded-opentype'), url('../font/fontawesome-webfont.ttf?v=3.1.1') format('truetype'); + src: url('../font/fontawesome-webfont.eot?#iefix&v=3.1.1') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.1.1') format('woff'), url('../font/fontawesome-webfont.ttf?v=3.1.1') format('truetype'); font-weight: normal; font-style: normal; } @@ -2282,7 +2285,6 @@ a > span.icon:not(.pointer) { } .icon-spinner { height: auto; - width: auto; -moz-animation: spin 2s infinite linear; -o-animation: spin 2s infinite linear; -webkit-animation: spin 2s infinite linear; @@ -3422,7 +3424,7 @@ a > span.icon:not(.pointer) { } @media only screen and (min-width: 801px) { body { - min-width: 1024px; + min-width: 980px; } } #pageHeader { @@ -3994,21 +3996,21 @@ a > span.icon:not(.pointer) { } #main { z-index: 110; - box-sizing: border-box; - -moz-box-sizing: border-box; +} +#main > div { display: table; - width: 100%; table-layout: fixed; + width: 100%; } -#main > div { +#main > div > div { display: table-row; } -#main > div > .sidebar, -#main > div > .content { +#main > div > div > .sidebar, +#main > div > div > .content { display: table-cell; vertical-align: top; } -#main > div > .sidebar { +#main > div > div > .sidebar { background-color: #d8e7f5; width: 300px; z-index: 120; @@ -4019,10 +4021,10 @@ a > span.icon:not(.pointer) { -webkit-transition-timing-function: ease; transition-timing-function: ease; } -#main > div > .sidebar > span { +#main > div > div > .sidebar > span { position: relative; } -#main > div > .sidebar > span > .collapsibleButton { +#main > div > div > .sidebar > span > .collapsibleButton { background-color: #d8e7f5; border-radius: 6px 0 0 6px; display: block; @@ -4033,7 +4035,7 @@ a > span.icon:not(.pointer) { top: 0; width: 24px; } -#main > div > .sidebar > span > .collapsibleButton:before { +#main > div > div > .sidebar > span > .collapsibleButton:before { content: "\f054"; font-family: FontAwesome; font-size: 14px; @@ -4042,7 +4044,7 @@ a > span.icon:not(.pointer) { top: 4px; text-shadow: 0 1px 0 rgba(255,255,255,0.8); } -#main > div > .sidebar > div { +#main > div > div > .sidebar > div { overflow: hidden; width: 300px; -webkit-transition-property: width; @@ -4052,7 +4054,7 @@ a > span.icon:not(.pointer) { -webkit-transition-timing-function: ease; transition-timing-function: ease; } -#main > div > .content { +#main > div > div > .content { background-color: #ffffff; min-height: 100px; padding: 7px 38px 21px; @@ -4061,26 +4063,28 @@ a > span.icon:not(.pointer) { #main:not(.sidebarOrientationLeft):not(.sidebarOrientationRight) .sidebar { display: none; } -#main.sidebarOrientationRight.sidebarCollapsed > div > .sidebar { +#main.sidebarOrientationRight.sidebarCollapsed > div > div > .sidebar { width: 20px; } -#main.sidebarOrientationRight.sidebarCollapsed > div > .sidebar > span > .collapsibleButton:before { +#main.sidebarOrientationRight.sidebarCollapsed > div > div > .sidebar > span > .collapsibleButton:before { content: "\f053"; } -#main.sidebarOrientationRight.sidebarCollapsed > div > .sidebar > div { +#main.sidebarOrientationRight.sidebarCollapsed > div > div > .sidebar > div { width: 0; } @media only screen and (max-width: 800px) { #main { - display: block; position: relative; margin-top: 7px; } #main > div { display: block; } - #main > div > .sidebar, - #main > div > .content { + #main > div > div { + display: block; + } + #main > div > div > .sidebar, + #main > div > div > .content { display: block; } #main.sidebarOrientationRight .sidebar { @@ -5927,6 +5931,9 @@ li:nth-child(2n+1) .message .messageContent { .cke_combo__fontsize .cke_combo_text { width: auto !important; } +.cke_dialog_background_cover { + background-color: #000 !important; +} @media only screen and (max-width: 800px) { .message.messageSidebarOrientationLeft .messageContent, .message.messageSidebarOrientationRight .messageContent { @@ -6817,10 +6824,10 @@ body, -webkit-transition-timing-function: linear; transition-timing-function: linear; } - #main > div > .sidebar { + #main > div > div > .sidebar { box-shadow: inset 0 0 2px 0 rgba(0,0,0,0.1); } - #main > div > .sidebar > span > .collapsibleButton { + #main > div > div > .sidebar > span > .collapsibleButton { border-width: 1px 0 1px 1px; border-style: solid; border-color: #b8d3ed; diff --git a/wcfsetup/install/files/acp/templates/footer.tpl b/wcfsetup/install/files/acp/templates/footer.tpl index 2e6a466c00..c5af57076e 100644 --- a/wcfsetup/install/files/acp/templates/footer.tpl +++ b/wcfsetup/install/files/acp/templates/footer.tpl @@ -1,4 +1,5 @@ -
+
+
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl index 0c5173af38..a8fbbd0328 100644 --- a/wcfsetup/install/files/acp/templates/header.tpl +++ b/wcfsetup/install/files/acp/templates/header.tpl @@ -173,40 +173,41 @@
- {hascontent} - - {/hascontent} - -
+
+ {hascontent} + + {/hascontent} + +
\ No newline at end of file diff --git a/wcfsetup/install/files/style/layout.less b/wcfsetup/install/files/style/layout.less index 48d19fedf0..2c1a65a205 100644 --- a/wcfsetup/install/files/style/layout.less +++ b/wcfsetup/install/files/style/layout.less @@ -571,72 +571,69 @@ #main { z-index: 110; - box-sizing:border-box; - -moz-box-sizing: border-box; /* Firefox */ - display: table; - table-layout: fixed; - - &.layoutFluid { - width: 100%; - } - > div { - display: table-row; + display: table; + table-layout: fixed; + width: 100%; - > .sidebar, - > .content { - display: table-cell; - vertical-align: top; - } - - > .sidebar { - background-color: @wcfSidebarBackgroundColor; - width: 300px; - z-index: 120; - - .transition(width, .2s, ease); + > div { + display: table-row; - > span { - position: relative; + > .sidebar, + > .content { + display: table-cell; + vertical-align: top; + } + + > .sidebar { + background-color: @wcfSidebarBackgroundColor; + width: 300px; + z-index: 120; - > .collapsibleButton { - background-color: @wcfSidebarBackgroundColor; - border-radius: 6px 0 0 6px; - display: block; - height: 24px; - left: -20px; - position: absolute; - text-decoration: none; - top: 0; - width: 24px; + .transition(width, .2s, ease); + + > span { + position: relative; - &:before { - content: "\f054"; - font-family: FontAwesome; - font-size: 14px; + > .collapsibleButton { + background-color: @wcfSidebarBackgroundColor; + border-radius: 6px 0 0 6px; + display: block; + height: 24px; + left: -20px; position: absolute; - left: 6px; - top: 4px; + text-decoration: none; + top: 0; + width: 24px; - .textShadow(@wcfSidebarBackgroundColor); + &:before { + content: "\f054"; + font-family: FontAwesome; + font-size: 14px; + position: absolute; + left: 6px; + top: 4px; + + .textShadow(@wcfSidebarBackgroundColor); + } } } + + > div { + overflow: hidden; + width: 300px; + + .transition(width, .2s, ease); + } } - > div { - overflow: hidden; - width: 300px; - - .transition(width, .2s, ease); + > .content { + background-color: @wcfContentBackgroundColor; + min-height: 100px; + padding: @wcfGapSmall @wcfGapLarge * 2 - @wcfGapTiny @wcfGapLarge; + z-index: 130; } } - - > .content { - background-color: @wcfContentBackgroundColor; - min-height: 100px; - padding: @wcfGapSmall @wcfGapLarge * 2 - @wcfGapTiny @wcfGapLarge; - z-index: 130; - } } &:not(.sidebarOrientationLeft):not(.sidebarOrientationRight) { @@ -646,7 +643,7 @@ } &.sidebarOrientationRight { - &.sidebarCollapsed > div { + &.sidebarCollapsed > div > div { > .sidebar { width: 20px; @@ -667,16 +664,19 @@ @media only screen and (max-width: 800px) { /* hide sidebar */ #main { - display: block; position: relative; margin-top: 7px; > div { display: block; - > .sidebar, - > .content { + > div { display: block; + + > .sidebar, + > .content { + display: block; + } } } diff --git a/wcfsetup/setup/template/footer.tpl b/wcfsetup/setup/template/footer.tpl index 73d1c71afc..6724962f43 100644 --- a/wcfsetup/setup/template/footer.tpl +++ b/wcfsetup/setup/template/footer.tpl @@ -1,4 +1,5 @@ -
+
+
diff --git a/wcfsetup/setup/template/header.tpl b/wcfsetup/setup/template/header.tpl index 9a5af39c75..b5df6bc33d 100644 --- a/wcfsetup/setup/template/header.tpl +++ b/wcfsetup/setup/template/header.tpl @@ -44,10 +44,10 @@
-
-
-

{lang}wcf.global.title{/lang}

-

{lang}wcf.global.title.subtitle{/lang}

-

{@$progress}%

-
- +
+
+
+

{lang}wcf.global.title{/lang}

+

{lang}wcf.global.title.subtitle{/lang}

+

{@$progress}%

+
-- 2.20.1