From: eggy <eggy@localhost>
Date: Tue, 18 Jul 2017 16:03:33 +0000 (+0200)
Subject: Merge branch 'prosilverhistory'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=4036efb9d611fcb36a467da060cece3d388a685d;p=dfde-theme.git

Merge branch 'prosilverhistory'

versuch live und prosilver 3.2.1 zu mergen, teilweise erfolgreich
---

4036efb9d611fcb36a467da060cece3d388a685d
diff --cc template/bbcode.html
index 3eaf5a8,940c0ac..ef3aefa
--- a/template/bbcode.html
+++ b/template/bbcode.html
@@@ -35,10 -35,8 +35,8 @@@
  				<xsl:value-of select="$L_COLON"/>
  				<xsl:if test="@post_url">
  					<xsl:text> </xsl:text>
 -					<a href="{@post_url}" data-post-id="{@post_id}" onclick="if(document.getElementById(hash.substr(1)))href=hash">&#8593;</a>
 +					<a class="debianforum_uparrow" href="{@post_url}" data-post-id="{@post_id}" onclick="if(document.getElementById(hash.substr(1)))href=hash"><img src="https://debianforum.de/forum/styles/debianforumde/theme/images/debianforum_uparrow.png" alt="&#8593; zum Beitrag &#8593;" /></a>
  				</xsl:if>
- 				<xsl:if test="@date">
- 				</xsl:if>
  				<xsl:if test="@date">
  					<div class="responsive-hide"><xsl:value-of select="@date"/></div>
  				</xsl:if>
diff --cc template/navbar_header.html
index be12ab8,b8080a6..4bd0cab
--- a/template/navbar_header.html
+++ b/template/navbar_header.html
@@@ -168,11 -173,9 +173,13 @@@
  		<!-- ENDIF -->
  		<!-- EVENT navbar_header_logged_out_content -->
  	<!-- ENDIF -->
- 	<!--
- 	 	 </ul>
 +
- 	<ul id="nav-breadcrumbs" class="nav-breadcrumbs linklist navlinks" role="menubar"> 
++	<!--  DEBIANFORUM: keine brotkrummennagivation
+ 	</ul>
+ 
+ 	<ul id="nav-breadcrumbs" class="nav-breadcrumbs linklist navlinks" role="menubar">
 +	-->
++
  		<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
  		<!-- EVENT overall_header_breadcrumbs_before -->
  		<li class="breadcrumbs">
diff --cc template/overall_footer.html
index 57e01f4,97a21f9..8ff5bee
--- a/template/overall_footer.html
+++ b/template/overall_footer.html
@@@ -18,10 -8,6 +8,14 @@@
  
  	<div class="copyright">
  		<!-- EVENT overall_footer_copyright_prepend -->
++		
++		<!-- Debianforum: disclaimer: -->
 +		Diese Webseite ist keine offizielle Webseite des <a href="http://www.debian.org/">Debian</a>-Projekts.
 +                <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 -->
  		<!-- EVENT overall_footer_copyright_append -->
diff --cc template/overall_header.html
index c793877,09824d0..bfe54fd
--- a/template/overall_header.html
+++ b/template/overall_header.html
@@@ -85,10 -85,8 +85,14 @@@
  
  			<div id="site-description" class="site-description">
  				<a id="logo" class="logo" href="<!-- IF U_SITE_HOME -->{U_SITE_HOME}<!-- ELSE -->{U_INDEX}<!-- ENDIF -->" title="<!-- IF U_SITE_HOME -->{L_SITE_HOME}<!-- ELSE -->{L_INDEX}<!-- ENDIF -->"><span class="site_logo"></span></a>
++
++				<!-- Debianforum: Titel klickbar -->			
 +				<a id="dfdeHeader" class="dfdeHeader" href="<!-- IF U_SITE_HOME -->{U_SITE_HOME}<!-- ELSE -->{U_INDEX}<!-- ENDIF -->" title="<!-- IF U_SITE_HOME -->{L_SITE_HOME}<!-- ELSE -->{L_INDEX}<!-- ENDIF -->">
  				<h1>{SITENAME}</h1>
  				<p>{SITE_DESCRIPTION}</p>
 +				</a>
++				<!-- -->
++
  				<p class="skiplink"><a href="#start_here">{L_SKIP}</a></p>
  			</div>
  
@@@ -120,8 -118,6 +124,8 @@@
  
  	<!-- EVENT overall_header_page_body_before -->
  
- 	<div id=debianforum-outer> 
++	<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">
  		<!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN and (U_MCP or U_ACP) -->
diff --cc theme/common.css
index 148babe,ed2cc36..db6604e
--- a/theme/common.css
+++ b/theme/common.css
@@@ -133,8 -141,9 +141,9 @@@ a:hover	{ text-decoration: underline; 
  	border: 1px solid transparent;
  	border-radius: 8px;
  	margin: 0 auto;
+ 	max-width: 1152px;
  	min-width: 625px;
 -	padding: 15px;
 +	padding: 0px 7px 0px 7px;
  }
  
  @media only screen and (max-width: 1220px), only screen and (max-device-width: 1220px) {
@@@ -143,45 -152,11 +152,45 @@@
  	}
  }
  
 +/* *************** */
 +/* TODO: evtl breite anders berechnen, sieht auf 1366x768 ok aus, woanders evtl probleme */
 +
 +.page-body {
 +		    margin: 4px 0;
 +			
 +}
 +
 +.debianforumde-sidebar {
 +		margin-top:4px;
 +		margin-left:8px;
 +	    width: 150px;
 +		float:left;
 +}
 +
 +@media only screen and (min-width: 680px) {
- 	.page-body {
- 		    margin: 4px 0;
- 			clear: both;
+ .page-body {
+ 	margin: 4px 0;
+ 	clear: both;
 +			float:right;
 +		    /* margin-left: 160px;
 +		    margin-right: 16px;
 +	        padding-left: 15px;	*/
 +            width:85%;
- 	}
+ }
  
 +	.debianforumde-sidebar {
 +			margin-top:4px;
 +			margin-left:8px;
 +	   		width: 150px;
 +			left: 15px;
 +			position: absolute;
 +			top: 140px;
 +			float:left;
 +	}  
 +}
 +
 +
 +/* *************** */
  .page-footer {
  	clear: both;
  }
@@@ -200,35 -175,11 +209,33 @@@
  	text-decoration: none;
  }
  
 +.dfdeHeader.h1 {
 +	float: left;
 +	width: auto;
 +	padding: 10px 13px 0 10px;
 +		    color: #606060;
 +			    font-family: "Bitstream Vera Serif",Georgia,Palatino,serif;
 +				    font-size: 40px;
 +					    font-weight: 100;
 +						    margin: 14px 0 0 69px;
 +}
 +
 +
 +.dfdeHeader:hover {
 +	text-decoration: none;
 +
 +}
 +	    
  .site_logo {
 -	display: inline-block;
 -	width: 149px;
 -	height: 52px;
 +		    padding-top: 80px;
 +			background-image: url("./images/site_logo.gif");
 +			background-repeat:no-repeat; 
 +			padding-left: 80px; 
 +			display: inline-block !important;
 +			height: 0;
 +			margin-left: 2px;
 +			overflow: hidden;
  }
- 								
- 								
  
  /* Site description and logo */
  .site-description {
@@@ -253,24 -204,13 +260,25 @@@
  	border-radius: 7px;
  }
  
 +
 +/* TODO: farben nach colors schieben */
  .forabg {
 +	background-color: #dbdbdb;
 +	border-color: #d0d0d0 #d0d0d0 #d0d0d0 #d70751;
 +	border-image: none;
 +	border-radius: 5px;
 +	border-style: solid;
 +	border-width: 1px 1px 1px 3px;
 +	color: #000000;
- 	clear: both;
  	margin-bottom: 4px;
+ 	padding: 5px;
+ 	clear: both;
++	/* clear: both; */	
 +	margin-right: 3px;
- 	padding: 0 5px;
+ 	border-radius: 7px;
++	
  }
  
- 
- 
  .forumbg {
  	margin-bottom: 4px;
  	padding: 5px;
@@@ -946,7 -886,7 +954,12 @@@ fieldset.fields1 dl.pmlist dd.recipient
  /* Pagination in viewforum for multipage topics */
  .row .pagination {
  	display: block;
 -	margin-top: -12px;
 +	margin-top: -0.8em;  /*TODO: macht evtl woanders was kaputt */
++        
++   	/*
++	margin-top: 0.3em;
++        margin-top: -12px;
++        */
  }
  
  .row .pagination > ul {
@@@ -959,12 -899,6 +972,14 @@@
  	font-size: 9px;
  }
  
++
++/* TODO: .topic-poster ist raus aus 3.2.1, benutzen wir das irgendwo? */
 +.topic-poster {
 +	float: left;
 +	padding-right: 0.5em;
 +	margin-top: 0.3em;
 +}
 +
  /* jQuery popups
  ---------------------------------------- */
  .phpbb_alert {
diff --cc theme/en/icon_user_online.gif
index 90c5381,6b571ff..c2c8509
Binary files differ
diff --cc theme/stylesheet.css
index 9d41d82,45eb5b6..f3358e1
--- a/theme/stylesheet.css
+++ b/theme/stylesheet.css
@@@ -7,81 -7,15 +7,82 @@@
      --------------------------------------------------------------
  */
  
- @import url("normalize.css");
- @import url("base.css");
- @import url("utilities.css");
- @import url("common.css");
- @import url("links.css");
- @import url("content.css");
- @import url("buttons.css");
- @import url("cp.css");
- @import url("forms.css");
- @import url("icons.css");
- @import url("colours.css");
- @import url("responsive.css");
+ @import url("normalize.css?v=3.2");
+ @import url("base.css?v=3.2");
+ @import url("utilities.css?v=3.2");
+ @import url("common.css?v=3.2");
+ @import url("links.css?v=3.2");
+ @import url("content.css?v=3.2");
+ @import url("buttons.css?v=3.2");
+ @import url("cp.css?v=3.2");
+ @import url("forms.css?v=3.2");
+ @import url("icons.css?v=3.2");
+ @import url("colours.css?v=3.2");
+ @import url("responsive.css?v=3.2");
++
 +@import url("debianforum.css");
 +
 +
 +#debianforum_outer { 
 +}
 +
 +/* #debianforum_content { */
 +#page-body {
 +	flex: 1;
 +}
 +#debianforum_nav {
 +}
 +
 +
 +
 +.debianforumde-sidebar {
 +	    width: 150px;
 +}
 +
 +#debianforum-outer {
 +		        display: flex;
 +
 +}
 +
 +@media only screen and (min-width: 480px) {
 +	.page-body {
 +		    /* margin-left: 160px;
 +		    margin-right: 16px;
 +	        padding-left: 15px;	*/
 +            flex:1;	
 +}
 +
 +	.debianforumde-sidebar {
 +	   		width: 150px;
 +	}  
 +
 +
 +#debianforum_outer { 
 +	display: flex;
 +}
 +
 +/* #debianforum_content { */
 +#page-body {
 +	/* background-color: red; */
 +	flex: 1;
 +}
 +#debianforum_nav {
 +	/* background-color: blue; */
 +}
 +
 +
 +
 +.debianforumde-sidebar {
 +	    width: 150px;
 +}
 +
 +#debianforum-outer {
 +		        display: flex;
 +				flex-direction: row-reverse;
 +
 +}
 +
 +
 +
 +}
 +