Improved overall layout

diff --git a/wcfsetup/install/files/style/layout/global.scss b/wcfsetup/install/files/style/layout/global.scss
index 3f18f9105e2ddf8412d0677f5e3f42050b9ca60a..a59b4bdf3cadbb3c629b54add35d59f60eca89ac 100644 (file)
--- a/wcfsetup/install/files/style/layout/global.scss
+++ b/wcfsetup/install/files/style/layout/global.scss
@@ -1,5 +1,6 @@
 .layoutBoundary {
        margin: 0 auto;
+       padding: 0 20px;
        
        @if $useFluidLayout {
                min-width: $wcfLayoutMinWidth;

diff --git a/wcfsetup/install/files/style/layout/layout.scss b/wcfsetup/install/files/style/layout/layout.scss
index 6d7d23d39846315f86aa12a0c4b939cd17010f15..5613049332d429a39830f8e344c6dd0eb1bd3a19 100644 (file)
--- a/wcfsetup/install/files/style/layout/layout.scss
+++ b/wcfsetup/install/files/style/layout/layout.scss
@@ -56,8 +56,14 @@ a {
        }
 }
 
-#content {
-       flex: 1 auto;
+.content {
+       flex: 0 0 auto;
+       
+       // sidebar follows
+       &:not(:last-child) {
+               flex-basis: calc(100% - 340px);
+               max-width: calc(100% - 340px); // IE fix
+       }
 }
 
 .sidebar {
@@ -66,9 +72,20 @@ a {
        &:first-child {
                margin-right: 30px;
        }
+       
+       & + .content {
+               flex-basis: calc(100% - 340px);
+               max-width: calc(100% - 340px); // IE fix
+               
+               // sidebar follows
+               &:not(:last-child) {
+                       flex-basis: calc(100% - 680px);
+                       max-width: calc(100% - 680px); // IE fix
+               }
+       }
 }
 
-#content + .sidebar {
+.content + .sidebar {
        margin-left: 30px;
 }
 

diff --git a/wcfsetup/install/files/style/layout/pageHeader.scss b/wcfsetup/install/files/style/layout/pageHeader.scss
index d52c7f18cc3d498bcadcc0368e78718f1d3d9afa..0354a08e5ff72ed711df71e52a4a223df0780f67 100644 (file)
--- a/wcfsetup/install/files/style/layout/pageHeader.scss
+++ b/wcfsetup/install/files/style/layout/pageHeader.scss
@@ -19,7 +19,8 @@
        align-items: center;
        display: flex;
        flex-wrap: wrap;
-       padding: 20px 0;
+       padding-top: 20px;
+       padding-bottom: 20px;
 }
 
 /* LOGO */
@@ -95,6 +96,22 @@
                        }
                }
                
+               // TESTING
+               > .boxMenuHasChildren > a {
+                       padding-right: 30px;
+                       
+                       &::before {
+                               border-left: 1px solid $wcfHeaderBackground;
+                               bottom: 0;
+                               content: "";
+                               display: block;
+                               position: absolute;
+                               right: 22px;
+                               top: 0;
+                       }
+               }
+               // TESTING
+               
                .boxMenuDepth1 {
                        background-color: $wcfHeaderMenuDropdownBackground;
                        border-bottom: 1px solid $wcfHeaderMenuDropdownBorder;

diff --git a/wcfsetup/install/files/style/layout/pageHeaderSticky.scss b/wcfsetup/install/files/style/layout/pageHeaderSticky.scss
index 57250d1646e9f2aeb95f286e8c20b281398fba22..74abc2e0f40b78abd90101a53b9a4f32d47cc991 100644 (file)
--- a/wcfsetup/install/files/style/layout/pageHeaderSticky.scss
+++ b/wcfsetup/install/files/style/layout/pageHeaderSticky.scss
@@ -19,7 +19,8 @@
                right: 0;
                
                > div {
-                       padding: 10px 0;
+                       padding-bottom: 10px;
+                       padding-top: 10px;
                }
        }
        

diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index ab99143e3eb097de7b9fd49a6e431040145739da..75fb2f89420f8298ba8941b958ad6fe147870cfc 100644 (file)
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -2057,7 +2057,7 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputTe
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputPlaceholder', 'rgba(169, 169, 169, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfLayoutFixedWidth', '1200px');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfLayoutMaxWidth', '1400px');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfLayoutMinWidth', '980px');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfLayoutMinWidth', '1240px');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfNavigationBackground', 'rgba(52, 73, 94, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfNavigationLink', 'rgba(255, 255, 255, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfNavigationLinkActive', 'rgba(255, 255, 255, 1)');