From: eggy <eggy@localhost>
Date: Tue, 18 Jul 2017 18:03:51 +0000 (+0200)
Subject: flex erstmal teilweise wieder raus
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=d910c25af2dda9862f3be3db6f6d2dd13d783949;p=dfde-theme.git

flex erstmal teilweise wieder raus
---

diff --git a/template/overall_footer.html b/template/overall_footer.html
index 8ff5bee..dfc3bca 100644
--- a/template/overall_footer.html
+++ b/template/overall_footer.html
@@ -1,8 +1,16 @@
 		<!-- EVENT overall_footer_content_after -->
 	</div>
+	</div>
 
 <!-- EVENT overall_footer_page_body_after -->
 
+<!-- debianforum: anfang -->
+<div class="debianforumde-sidebar">
+<!-- INCLUDE debianforumde_sidebar_menu.html -->
+</div>  
+<!-- ende -->
+
+
 <div id="page-footer" class="page-footer" role="contentinfo">
 	<!-- INCLUDE navbar_footer.html -->
 
@@ -14,7 +22,7 @@
                 <br /><a href="https://wiki.debianforum.de/debianforum.de/Impressum">Haftungsausschluss und Impressum</a> &ndash;
                 <a href="https://wiki.debianforum.de/debianforum.de/Verhaltensregeln">debianforum.de Verhaltensregeln</a>
 		<br /><br />
-		<!-- -- >
+		<!-- -->
 
 		{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
diff --git a/template/overall_header.html b/template/overall_header.html
index bfe54fd..4a2fca4 100644
--- a/template/overall_header.html
+++ b/template/overall_header.html
@@ -122,9 +122,10 @@
 		<!-- INCLUDE navbar_header.html -->
 	</div>
 
+	<div id=debianforum-outer> <!-- div ende ist in overall_footer.html --> 
+	
 	<!-- EVENT overall_header_page_body_before -->
 
-	<div id=debianforum-outer> <!-- div ende ist in overall_footer.html -->
 
 	<a id="start_here" class="anchor"></a>
 	<div id="page-body" class="page-body" role="main">
diff --git a/theme/stylesheet.css b/theme/stylesheet.css
index f3358e1..154c1ce 100644
--- a/theme/stylesheet.css
+++ b/theme/stylesheet.css
@@ -20,7 +20,7 @@
 @import url("colours.css?v=3.2");
 @import url("responsive.css?v=3.2");
 
-@import url("debianforum.css");
+@import url("debianforum.css?v=3.2");
 
 
 #debianforum_outer { 
@@ -28,7 +28,7 @@
 
 /* #debianforum_content { */
 #page-body {
-	flex: 1;
+	/*flex: 1;*/
 }
 #debianforum_nav {
 }
@@ -49,7 +49,7 @@
 		    /* margin-left: 160px;
 		    margin-right: 16px;
 	        padding-left: 15px;	*/
-            flex:1;	
+            /* flex:1; */	
 }
 
 	.debianforumde-sidebar {
@@ -64,7 +64,7 @@
 /* #debianforum_content { */
 #page-body {
 	/* background-color: red; */
-	flex: 1;
+/*	flex: 1; */
 }
 #debianforum_nav {
 	/* background-color: blue; */
@@ -78,7 +78,7 @@
 
 #debianforum-outer {
 		        display: flex;
-				flex-direction: row-reverse;
+				flex-direction: row-reverse; 
 
 }