From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 21 Jan 2016 22:00:32 +0000 (+0100)
Subject: Improved overall layout
X-Git-Tag: 3.0.0_Beta_1~2030^2~142
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5c448cc25649b3861fc3c84106fb6e2cea710115;p=GitHub%2FWoltLab%2FWCF.git

Improved overall layout
---

diff --git a/wcfsetup/install/files/style/layout/global.scss b/wcfsetup/install/files/style/layout/global.scss
index 3f18f9105e..a59b4bdf3c 100644
--- 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 6d7d23d398..5613049332 100644
--- 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 d52c7f18cc..0354a08e5f 100644
--- 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 57250d1646..74abc2e0f4 100644
--- 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 ab99143e3e..75fb2f8942 100644
--- 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)');