Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission

* phpbb/develop: (704 commits) [ticket/11630] Improvements to the PHP lint pre-commit hook [feature/auth-refactor] Move auth providers to separate directory [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file(). [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [ticket/10838] Fix URL for wiki and remove irrelevant line [ticket/10838] Remove php 5.4 and builtin server references [ticket/10838] Fix missing data [ticket/10838] separate database used mentioned in unit tests [ticket/11585] Make $auth_admin class property [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init ... Conflicts: phpBB/docs/sphinx.sample.conf phpBB/feed.php phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html
author: Joas Schilling <nickvergessen@gmx.de> 2013-07-11 11:41:48 +0200
committer: Joas Schilling <nickvergessen@gmx.de> 2013-07-11 11:41:48 +0200
commit: bdb7ec0ceb3210955b2457bfe6fe469b1781d8d6 (patch)
tree: 4a6cd814385ae839f577866d3c45175f9ea4928e /phpBB/styles/prosilver/theme
parent: d41cf293e1609be9d0cc08e5ccd37947481e61ca (diff)
parent: 2fcae1ca16d096d2839b487e8c1bcbe0f313d91f (diff)
download: forums-bdb7ec0ceb3210955b2457bfe6fe469b1781d8d6.tar
forums-bdb7ec0ceb3210955b2457bfe6fe469b1781d8d6.tar.gz
forums-bdb7ec0ceb3210955b2457bfe6fe469b1781d8d6.tar.bz2
forums-bdb7ec0ceb3210955b2457bfe6fe469b1781d8d6.tar.xz
forums-bdb7ec0ceb3210955b2457bfe6fe469b1781d8d6.zip
7 files changed, 207 insertions, 81 deletions
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index 5cff0a811b..f617428565 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -268,8 +268,45 @@
 	left: 0;
 }
 
-.rtl ul.topiclist dt {
+.rtl ul.topiclist dt, .rtl li.header dt {
 	float: right;
+	margin-right: 0;
+	margin-left: -410px;
+}
+
+.rtl ul.topiclist.missing-column dt {
+	margin-right: 0;
+	margin-left: -330px;
+}
+
+.rtl ul.topiclist.two-long-columns dt {
+	margin-right: 0;
+	margin-left: -250px;
+}
+
+.rtl ul.topiclist.two-columns dt {
+	margin-right: 0;
+	margin-left: -80px;
+}
+
+.rtl ul.topiclist dt .list-inner {
+	margin-right: 0;
+	margin-left: 410px;
+}
+
+.rtl ul.topiclist.missing-column dt .list-inner {
+	margin-right: 0;
+	margin-left: 330px;
+}
+
+.rtl ul.topiclist.two-long-columns dt .list-inner {
+	margin-right: 0;
+	margin-left: 250px;
+}
+
+.rtl ul.topiclist.two-columns dt .list-inner {
+	margin-right: 0;
+	margin-left: 80px;
 }
 
 .rtl ul.topiclist dl {
@@ -308,31 +345,24 @@
 	background-position: 99.5% 50%;
 }
 
-.rtl li.header dl.icon dt {
+.rtl li.header dl.icon dt .list-inner {
 	/* Tweak for headers alignment when folder icon used */
 	padding-right: 0;
 	padding-left: 50px;
 }
 
 .rtl dl.icon dt {
-	padding-left: 0;
-	padding-right: 45px;					/* Space for folder icon */
 	background-position: 99.5% 95%;			/* Position of topic icon */
 }
 
-.rtl dd.lastpost span, .rtl ul.topiclist dd.searchby span, .rtl ul.topiclist dd.info span, .rtl ul.topiclist dd.time span, .rtl dd.redirect span, .rtl dd.moderation span {
+.rtl dl.icon dt .list-inner {
 	padding-left: 0;
-	padding-right: 5px;
-}
-
-.rtl dd.mark {
-	float: left !important;
+	padding-right: 45px;					/* Space for folder icon */
 }
 
-.rtl ul.topiclist dd.searchextra {
-	margin-left: 0;
-	margin-right: 5px;
-	border-right: none;
+.rtl dd.lastpost span, .rtl ul.topiclist dd.info span, .rtl ul.topiclist dd.time span, .rtl dd.redirect span, .rtl dd.moderation span {
+	padding-left: 0;
+	padding-right: 5px;
 }
 
 /* Post body styles
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index c3210887b6..09021c771f 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -97,6 +97,19 @@ a.sendemail {
 	padding: 1px 0 0 17px;
 }
 
+.icon-notification:before, .icon-notification:after {
+	display: inline;
+	font: inherit;
+}
+
+.icon-notification:before {
+	content: '[';
+}
+
+.icon-notification:after {
+	content: ']';
+}
+
 /* Poster profile icons
 ----------------------------------------*/
 ul.profile-icons {
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index baff88d6b7..7d0462be1b 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -406,11 +406,6 @@ li.header dt, li.header dd {
 	color: #FFFFFF;
 }
 
-/* Forum list column styles */
-ul.topiclist dd.searchextra {
-	color: #333333;
-}
-
 /* Post body styles
 ----------------------------------------*/
 .postbody {
@@ -1000,6 +995,14 @@ fieldset.quick-login input.inputbox {
 	color: #333333;
 }
 
+.inputbox:-moz-placeholder {
+	color: #333333;
+}
+
+.inputbox::-webkit-input-placeholder {
+	color: #333333;
+}
+
 .inputbox:hover {
 	border-color: #11A3EA;
 }
@@ -1009,6 +1012,15 @@ fieldset.quick-login input.inputbox {
 	color: #0F4987;
 }
 
+.inputbox:focus:-moz-placeholder {
+	color: transparent;
+}
+
+.inputbox:focus::-webkit-input-placeholder {
+	color: transparent;
+}
+
+
 /* Form button styles
 ---------------------------------------- */
 
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index ed462c770d..89b3ab7ada 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -306,8 +306,12 @@ a#logo:hover {
 ul.linklist {
 	display: block;
 	margin: 0;
-	height: 4%;
-	overflow: hidden;
+}
+
+ul.linklist:after {
+	content: '';
+	display: block;
+	clear: both;
 }
 
 #cp-main .panel {
@@ -476,6 +480,8 @@ dl.details dd {
 	margin-bottom: 5px;
 	float: left;
 	width: 65%;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
 .clearfix, #tabs, #minitabs, fieldset dl, ul.topiclist dl, dl.polls {
@@ -687,28 +693,33 @@ p.rules a {
 	vertical-align: text-bottom;
 }
 
+.icon-notification {
+	position: relative;
+}
+
 #notification_list {
 	display: none;
 	position: absolute;
+	left: 0;
 	width: 330px;
 	z-index: 1;
 	border: 1px solid;
 	box-shadow: 3px 3px 5px darkgray;
 	border-radius: 5px;
-	margin-top: 8px;
+	top: 32px;
 }
 
 #notification_list ul {
 	max-height: 350px;
 	overflow-y: auto;
 	overflow-x: hidden;
+	clear: both;
 }
 
 #notification_list ul li {
-	width: 310px;
 	padding: 10px;
 	margin: 0;
-	float: left;
+	float: none;
 	border-bottom: 1px solid;
 	list-style-type: none;
 	font-size: 0.95em;
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index b6012f8a63..4b8c972697 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -25,20 +25,53 @@ ul.topiclist li.row dl {
 	padding: 2px 0;
 }
 
-ul.topiclist dt {
+ul.topiclist dt, ul.topiclist dd {
 	display: block;
 	float: left;
-	width: 50%;
+}
+
+ul.topiclist dt {
+	width: 100%;
+	margin-right: -410px;
 	font-size: 1.1em;
+}
+
+ul.topiclist.missing-column dt {
+	margin-right: -330px;
+}
+
+ul.topiclist.two-long-columns dt {
+	margin-right: -250px;
+}
+
+ul.topiclist.two-columns dt {
+	margin-right: -80px;
+}
+
+ul.topiclist dt .list-inner {
+	margin-right: 410px;
 	padding-left: 5px;
 	padding-right: 5px;
 }
 
+ul.topiclist.missing-column dt .list-inner {
+	margin-right: 330px;
+}
+
+ul.topiclist.two-long-columns dt .list-inner {
+	margin-right: 250px;
+}
+
+ul.topiclist.two-columns dt .list-inner {
+	margin-right: 80px;
+}
+
 ul.topiclist dd {
-	display: block;
-	float: left;
 	border-left: 1px solid transparent;
 	padding: 4px 0;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
 }
 
 ul.topiclist dfn {
@@ -85,17 +118,26 @@ li.header dt, li.header dd {
 
 li.header dt {
 	font-weight: bold;
+	width: 100%;
+	margin-right: -410px;
+}
+
+li.header dt .list-inner {
+	margin-right: 410px;
 }
 
 li.header dd {
-	margin-left: 1px;
+	padding-left: 1px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
 }
 
-li.header dl.icon {
+li.header dl.icon dt, li.header dl.icon dd {
 	min-height: 0;
 }
 
-li.header dl.icon dt {
+li.header dl.icon dt .list-inner {
 	/* Tweak for headers alignment when folder icon used */
 	padding-left: 0;
 	padding-right: 50px;
@@ -103,19 +145,25 @@ li.header dl.icon dt {
 
 /* Forum list column styles */
 dl.icon {
-	min-height: 35px;
 	background-position: 10px 50%;		/* Position of folder icon */
 	background-repeat: no-repeat;
 }
 
 dl.icon dt {
-	padding-left: 45px;					/* Space for folder icon */
 	background-repeat: no-repeat;
 	background-position: 5px 95%;		/* Position of topic icon */
 }
 
-dd.posts, dd.topics, dd.views {
-	width: 8%;
+dl.icon dt .list-inner {
+	padding-left: 45px;					/* Space for folder icon */
+}
+
+dl.icon dt, dl.icon dd {
+	min-height: 35px;
+}
+
+dd.posts, dd.topics, dd.views, dd.extra, dd.mark {
+	width: 80px;
 	text-align: center;
 	line-height: 2.2em;
 	font-size: 1.2em;
@@ -133,73 +181,35 @@ dl.icon dt li {
 	list-style-type: inherit;
 }
 
-dd.lastpost {
-	width: 25%;
+dd.lastpost, dd.redirect, dd.moderation, dd.time, dd.info {
+	width: 250px;
 	font-size: 1.1em;
 }
 
 dd.redirect {
-	font-size: 1.1em;
 	line-height: 2.5em;
 }
 
-dd.moderation {
-	font-size: 1.1em;
-}
-
-dd.lastpost span, ul.topiclist dd.searchby span, ul.topiclist dd.info span, ul.topiclist dd.time span, dd.redirect span, dd.moderation span {
-	display: block;
-	padding-left: 5px;
-}
-
 dd.time {
-	width: auto;
 	line-height: 200%;
-	font-size: 1.1em;
 }
 
-dd.extra {
-	width: 12%;
-	line-height: 200%;
-	text-align: center;
-	font-size: 1.1em;
+dd.lastpost span, ul.topiclist dd.info span, ul.topiclist dd.time span, dd.redirect span, dd.moderation span {
+	display: block;
+	padding-left: 5px;
 }
 
-dd.mark {
-	float: right !important;
-	width: 9%;
-	text-align: center;
+dd.extra, dd.mark {
 	line-height: 200%;
-	font-size: 1.2em;
-}
-
-dd.info {
-	width: 30%;
 }
 
 dd.option {
-	width: 15%;
+	width: 125px;
 	line-height: 200%;
 	text-align: center;
 	font-size: 1.1em;
 }
 
-dd.searchby {
-	width: 47%;
-	font-size: 1.1em;
-	line-height: 1em;
-}
-
-ul.topiclist dd.searchextra {
-	margin-left: 5px;
-	padding: 0.2em 0;
-	font-size: 1.1em;
-	border-left: none;
-	clear: both;
-	width: 98%;
-	overflow: hidden;
-}
-
 /* Container for post/reply buttons and pagination */
 .topic-actions {
 	margin-bottom: 3px;
@@ -669,6 +679,11 @@ fieldset.polls dd div {
 	margin-left: 8px;
 }
 
+.postprofile dd {
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
 .postprofile strong {
 	font-weight: normal;
 }
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index 8829211934..b66544acf7 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -286,6 +286,15 @@ textarea.inputbox {
 	width: auto !important;
 }
 
+input[type="search"] {
+	-webkit-appearance: textfield;
+	-webkit-box-sizing: content-box;
+}
+
+input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-results-button, input[type="search"]::-webkit-search-results-decoration {
+	display: none;
+}
+
 /* Form button styles
 ---------------------------------------- */
 input.button1, input.button2 {
diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css
index cd6865f66f..ca4e9a23b6 100644
--- a/phpBB/styles/prosilver/theme/tweaks.css
+++ b/phpBB/styles/prosilver/theme/tweaks.css
@@ -9,6 +9,10 @@ tweaks required due to its poor CSS support.
 	zoom: 1;
 }
 
+ul.linklist {
+	zoom: 1;
+}
+
 /* Align checkboxes/radio buttons nicely */
 dd label input { 
 	vertical-align: text-bottom; 
@@ -29,4 +33,36 @@ dl.details dd {
 /* Headerbar height fix for IE7 */
 #site-description p {
 	*margin-bottom: 1.0em;
-}
-\ No newline at end of file
+}
+
+/* Forum list column styles for IE7 */
+dl.icon dt, dl.icon dd {
+	*min-height: 32px;
+}
+
+dd.posts, dd.topics, dd.views, dd.extra, dd.mark {
+	*width: 79px;
+}
+
+dd.lastpost, dd.redirect, dd.moderation, dd.time, dd.info {
+	*width: 249px;
+}
+
+dd.option {
+	*width: 124px;
+}
+
+/* Notifications list for IE7 */
+#notification_list {
+	*left: 0;
+}
+
+#notification_list .header_settings {
+	*position: absolute;
+	*right: 10px;
+	*top: 0;
+}
+
+.icon-notification {
+	*z-index: 2;
+}
author	Joas Schilling <nickvergessen@gmx.de>	2013-07-11 11:41:48 +0200
committer	Joas Schilling <nickvergessen@gmx.de>	2013-07-11 11:41:48 +0200
commit	bdb7ec0ceb3210955b2457bfe6fe469b1781d8d6 (patch)
tree	4a6cd814385ae839f577866d3c45175f9ea4928e /phpBB/styles/prosilver/theme
parent	d41cf293e1609be9d0cc08e5ccd37947481e61ca (diff)
parent	2fcae1ca16d096d2839b487e8c1bcbe0f313d91f (diff)
download	forums-bdb7ec0ceb3210955b2457bfe6fe469b1781d8d6.tar forums-bdb7ec0ceb3210955b2457bfe6fe469b1781d8d6.tar.gz forums-bdb7ec0ceb3210955b2457bfe6fe469b1781d8d6.tar.bz2 forums-bdb7ec0ceb3210955b2457bfe6fe469b1781d8d6.tar.xz forums-bdb7ec0ceb3210955b2457bfe6fe469b1781d8d6.zip