Merge branch 'prosilverhistory'

versuch live und prosilver 3.2.1 zu mergen, teilweise erfolgreich

theme/bidi.css

@@ -13,6 +13,10 @@
 	text-align: left;
 }
 
+.rtl p.jumpbox-return {
+	float: right;
+}
+
 .rtl div.rules ul {
 	margin-left: 0;
 	margin-right: 20px;
@@ -118,6 +122,11 @@
 	float: left;
 }
 
+.rtl .jumpbox .dropdown-contents a {
+	margin-right: 0;
+	margin-left: 20px;
+}
+
 /* Notifications
 -----------------------------------------*/
 .rtl .notification_list ul li img {
@@ -261,11 +270,6 @@
 	margin-right: 0;
 }
 
-.rtl .topic-poster {
-	float: right;
-	padding-left: 0.5em;
-}
-
 /* Action Bar styles
 ---------------------------------------- */
 .rtl .action-bar .button {
@@ -497,7 +501,6 @@ li.breadcrumbs span:first-child > a {
 /* Quote block */
 .rtl blockquote {
 	margin: 0.5em 25px 0 1px;
-	background-position: 99% 8px;
 }
 
 .rtl blockquote blockquote {
@@ -507,10 +510,13 @@ li.breadcrumbs span:first-child > a {
 
 .rtl blockquote cite {
 	/* Username/source of quoter */
-	margin-right: 20px;
 	margin-left: 0;
 }
 
+.rtl blockquote cite:before, .rtl .uncited:before {
+	padding-left: 5px;
+}
+
 .rtl blockquote .codebox {
 	margin-right: 0;
 }
@@ -600,11 +606,12 @@ li.breadcrumbs span:first-child > a {
 */
 
 .rtl .caret {
-	float: right;
+	border-right: 1px solid;
+	border-right-color: inherit;
+	border-left: none;
+	right: 6px;
 }
 
-
-
 /* Post control buttons
 --------------------------------------------- */
 .rtl .post-buttons {
@@ -919,7 +926,8 @@ li.breadcrumbs span:first-child > a {
 	float: right;
 }
 
-.button-search-end {
+.rtl .button-search-end {
+	border-radius: 4px 0 0 4px;
 	border-left-width: 1px;
 	border-right-width: 0;
 }

theme/colours.css

@@ -413,14 +413,9 @@ dl.faq dt {
 /* Quote block */
 blockquote {
 	background-color: #EBEADD;
-	background-image: url("./images/quote.gif");
 	border-color:#DBDBCE;
 }
 
-.rtl blockquote {
-	background-image: url("./images/quote_rtl.gif");
-}
-
 blockquote blockquote {
 	/* Nested quotes */
 	background-color:#EFEED9;
@@ -445,13 +440,6 @@ blockquote blockquote blockquote {
 	color: #2E8B57;
 }
 
-.syntaxbg		{ color: #FFFFFF; }
-.syntaxcomment	{ color: #FF8000; }
-.syntaxdefault	{ color: #0000BB; }
-.syntaxhtml		{ color: #000000; }
-.syntaxkeyword	{ color: #007700; }
-.syntaxstring	{ color: #DD0000; }
-
 /* Attachments
 ----------------------------------------*/
 .attachbox {

theme/common.css

@@ -97,10 +97,18 @@ b, strong {
 	font-weight: bold;
 }
 
+.text-strong {
+	font-weight: bold;
+}
+
 i, em {
 	font-style: italic;
 }
 
+.text-italics {
+	font-style: italic;
+}
+
 u {
 	text-decoration: underline;
 }
@@ -133,6 +141,7 @@ a:hover	{ text-decoration: underline; }
 	border: 1px solid transparent;
 	border-radius: 8px;
 	margin: 0 auto;
+	max-width: 1152px;
 	min-width: 625px;
 	padding: 0px 7px 0px 7px;
 }
@@ -159,15 +168,15 @@ a:hover	{ text-decoration: underline; }
 }
 
 @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;
@@ -227,8 +236,6 @@ a:hover	{ text-decoration: underline; }
 			margin-left: 2px;
 			overflow: hidden;
 }
-								
-								
 
 /* Site description and logo */
 .site-description {
@@ -263,14 +270,15 @@ a:hover	{ text-decoration: underline; }
 	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;
@@ -947,6 +955,11 @@ fieldset.fields1 dl.pmlist dd.recipients {
 .row .pagination {
 	display: block;
 	margin-top: -0.8em;  /*TODO: macht evtl woanders was kaputt */
+        
+   	/*
+	margin-top: 0.3em;
+        margin-top: -12px;
+        */
 }
 
 .row .pagination > ul {
@@ -959,6 +972,8 @@ fieldset.fields1 dl.pmlist dd.recipients {
 	font-size: 9px;
 }
 
+
+/* TODO: .topic-poster ist raus aus 3.2.1, benutzen wir das irgendwo? */
 .topic-poster {
 	float: left;
 	padding-right: 0.5em;
@@ -1316,7 +1331,7 @@ ul.linklist:after,
 	margin: 0 7px 0 0;
 }
 
-.linklist.compact .rightside > a > span span {
+.linklist.compact .rightside > a > span {
 	display: none;
 }
 

theme/content.css

@@ -134,15 +134,17 @@ li.header dl.row-item dt .list-inner {
 dl.row-item {
 	background-position: 10px 50%;		/* Position of folder icon */
 	background-repeat: no-repeat;
+	background-size: 32px;
 }
 
 dl.row-item dt {
 	background-repeat: no-repeat;
 	background-position: 5px 95%;		/* Position of topic icon */
+	background-size: 17px;
 }
 
 dl.row-item dt .list-inner {
-	padding-left: 45px;					/* Space for folder icon */
+	padding-left: 52px;					/* Space for folder icon */
 }
 
 dl.row-item dt, dl.row-item dd {
@@ -446,7 +448,6 @@ ul.searchresults {
 ----------------------------------------*/
 /* Quote block */
 blockquote {
-	background: transparent none 6px 8px no-repeat;
 	border: 1px solid transparent;
 	font-size: 0.95em;
 	margin: 1em 1px 1em 25px;
@@ -464,7 +465,6 @@ blockquote cite {
 	/* Username/source of quoter */
 	font-style: normal;
 	font-weight: bold;
-	margin-left: 20px;
 	display: block;
 	font-size: 0.9em;
 }
@@ -473,8 +473,8 @@ blockquote cite cite {
 	font-size: 1em;
 }
 
-blockquote.uncited {
-	padding-top: 25px;
+blockquote cite:before, .uncited:before {
+	padding-right: 5px;
 }
 
 blockquote cite > div {
@@ -489,16 +489,17 @@ blockquote cite > div {
 
 /* Code block */
 .codebox {
-	padding: 3px;
 	border: 1px solid transparent;
 	font-size: 1em;
 	margin: 1em 0 1.2em 0;
+	word-wrap: normal;
 }
 
 .codebox p {
 	text-transform: uppercase;
 	border-bottom: 1px solid transparent;
-	margin-bottom: 3px;
+	margin-bottom: 0;
+	padding: 3px;
 	font-size: 0.8em !important;
 	font-weight: bold;
 	display: block;
@@ -513,10 +514,9 @@ blockquote .codebox {
 	display: block;
 	height: auto;
 	max-height: 200px;
-	padding-top: 5px;
+	padding: 5px 3px;
 	font: 0.9em Monaco, "Andale Mono","Courier New", Courier, monospace;
 	line-height: 1.3em;
-	margin: 2px 0;
 }
 
 /* Attachments

theme/forms.css

@@ -267,11 +267,11 @@ fieldset.submit-buttons input {
 	resize: vertical;
 	outline: 3px dashed transparent;
 	outline-offset: -4px;
-	-webkit-transition: all .5s ease;
-	-moz-transition: all .5s ease;
-	-ms-transition: all .5s ease;
-	-o-transition: all .5s ease;
-	transition: all .5s ease;
+	-webkit-transition: all .5s ease, height 1ms linear;
+	-moz-transition: all .5s ease, height 1ms linear;
+	-ms-transition: all .5s ease, height 1ms linear;
+	-o-transition: all .5s ease, height 1ms linear;
+	transition: all .5s ease, height 1ms linear;
 }
 
 /* Emoticons panel */
@@ -310,7 +310,7 @@ textarea.inputbox {
 }
 
 input[type="number"] {
-	-moz-padding-end: inherit;
+	-moz-padding-end: 0;
 }
 
 input[type="search"] {

theme/icons.css

@@ -9,7 +9,7 @@
  * Just change the name of the font after the 14/1 to the name of
  * the font you wish to use.
  */
-.icon, .button .icon  {
+.icon, .button .icon, blockquote cite:before, .uncited:before {
 	display: inline-block;
   	font-weight: normal;
   	font-style: normal;
@@ -54,6 +54,10 @@
 	font-size: 16px;
 }
 
+.arrow-left .icon {
+	float: left;
+}
+
 .arrow-left:hover .icon {
 	margin-left: -5px;
 	margin-right: 5px;
@@ -81,3 +85,12 @@
     line-height: .9;
     height: 12px;
 }
+
+blockquote cite:before, .uncited:before {
+	content: '\f10d'; /* Font Awesome quote-left */
+}
+
+.rtl blockquote cite:before, .rtl .uncited:before {
+	content: '\f10e'; /* Font Awesome quote-right */
+}
+

theme/links.css

@@ -89,6 +89,17 @@ a.lastsubject:hover {
 	text-decoration: underline;
 }
 
+.row-item a:hover {
+	text-decoration: none
+}
+
+.row-item .topictitle:hover,
+.row-item .subforum:hover,
+.row-item .username:hover,
+.row-item .username-coloured:hover {
+	text-decoration: underline;
+}
+
 /* Post body links */
 .postlink {
 	text-decoration: none;

theme/print.css

@@ -137,3 +137,12 @@ div.spacer { clear: both; }
 .skip_link { display: none; }
 
 .codebox p { display: none; }
+
+/* stylelint-disable declaration-property-unit-whitelist */
+.emoji {
+	min-height: 18px;
+	min-width: 18px;
+	height: 1em;
+	width: 1em;
+}
+/* stylelint-enable declaration-property-unit-whitelist */

theme/responsive.css

@@ -280,11 +280,6 @@
 		margin: 5px 0 0;
 	}
 
-	.row .pagination {
-		margin-top: 2px;
-		margin-bottom: 2px;
-	}
-
 	.row .pagination .ellipsis + li {
 		display: none !important;
 	}
@@ -567,13 +562,11 @@
 
 @media (max-width: 850px) {
 	.postprofile { width: 28%; }
+
+
 }
 
 @media (min-width: 701px) and (max-width: 950px) {
-	.row .pagination {
-		margin-top: 2px;
-		margin-bottom: 2px;
-	}
 
 	ul.topiclist dt {
     	margin-right: -410px;
@@ -588,3 +581,11 @@
 	}
 }
 
+@media (max-width: 992px) {
+	.row .pagination {
+		text-align: left;
+		float: left;
+		margin-top: 4px;
+		margin-bottom: 4px;
+	}
+}

theme/stylesheet.css

@@ -1,24 +1,25 @@
 /*  phpBB3 Style Sheet
     --------------------------------------------------------------
-	Style name:			prosilver (the default phpBB 3.1.x style)
+	Style name:			prosilver (the default phpBB 3.2.x style)
 	Based on style:
 	Original author:	Tom Beddard ( http://www.subblue.com/ )
 	Modified by:		phpBB Limited ( https://www.phpbb.com/ )
     --------------------------------------------------------------
 */
 
-@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");