[ticket/12662] Change CSS selectors to direct descendants for linklist

PHPBB3-12662
author: PayBas <contact@paybas.com> 2014-06-24 14:58:17 +0200
committer: PayBas <contact@paybas.com> 2014-06-25 14:19:03 +0200
commit: 8c7127f573d3f8b62fd3b167b3c86f91b67fc23a (patch)
tree: 0db3f609a1c1647001a1f34b98fc64e2a0c76c65
parent: e528a57c2f4aebae72d833c9156611f6471c0b45 (diff)
download: forums-8c7127f573d3f8b62fd3b167b3c86f91b67fc23a.tar
forums-8c7127f573d3f8b62fd3b167b3c86f91b67fc23a.tar.gz
forums-8c7127f573d3f8b62fd3b167b3c86f91b67fc23a.tar.bz2
forums-8c7127f573d3f8b62fd3b167b3c86f91b67fc23a.tar.xz
forums-8c7127f573d3f8b62fd3b167b3c86f91b67fc23a.zip
4 files changed, 34 insertions, 47 deletions
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index 8e533088c3..cdbf6bb7c5 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -59,20 +59,20 @@
 
 /* Horizontal lists
 ----------------------------------------*/
-.rtl ul.linklist li {
+.rtl ul.linklist > li {
 	float: right;
 	margin-right: 0;
 	margin-left: 7px;
 }
 
-.rtl ul.linklist li.rightside, .rtl p.rightside {
+.rtl ul.linklist > li.rightside, .rtl p.rightside {
 	float: left;
 	margin-right: 7px;
 	margin-left: 0;
 	text-align: left;
 }
 
-.rtl ul.leftside li, .rtl ul.rightside li {
+.rtl ul.leftside > li, .rtl ul.rightside > li {
 	float: left;
 }
 
@@ -92,7 +92,7 @@
 
 /* Bulletin icons for list items
 ----------------------------------------*/
-.rtl ul.linklist.bulletin li:before {
+.rtl ul.linklist.bulletin > li:before {
 	padding-left: 4px;
 	padding-right: 0;
 }
@@ -117,10 +117,8 @@
 	padding-right: 10px;
 }
 
-.rtl ul.linklist .dropdown li {
-	margin: 0;
-	padding-left: 0;
-	padding-right: 4px;
+.rtl .dropdown-extended .header {
+	text-align: right;
 }
 
 .rtl .dropdown-extended .header .header_settings {
@@ -630,7 +628,8 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 ---------------------------------------- */
 .rtl .small-icon {
 	background-position: 100% 50%;
-	padding: 0 19px 0 0;
+	padding-left: 0;
+	padding-right: 19px;
 }
 
 .rtl ul.linklist li.small-icon {
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index c5e97d03c4..5e952667a8 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -96,7 +96,7 @@ ul.linklist li.small-icon {
 	padding-left: 0;
 }
 
-ul.linklist.bulletin li.small-icon:before {
+ul.linklist.bulletin > li.small-icon:before {
 	display: none;
 }
 
@@ -156,7 +156,7 @@ ul.linklist.bulletin li.small-icon:before {
 	margin-top: 2px;
 }
 
-.post-buttons li {
+.post-buttons > li {
 	float: left;
 	margin-right: 3px;
 }
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 3249f66234..90c1c88073 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -1134,7 +1134,7 @@ input.disabled {
 }
 
 .dropdown-extended ul li {
-	border-bottom-color: #B9B9B9;
+	border-top-color: #B9B9B9;
 }
 
 .dropdown-extended ul li:hover {
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 206f261b14..fa38f5a9bb 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -326,7 +326,7 @@ ul.linklist:after {
 	padding: 5px 10px;
 }
 
-ul.linklist li {
+ul.linklist > li {
 	display: block;
 	list-style-type: none;
 	float: left;
@@ -337,7 +337,7 @@ ul.linklist li {
 	padding-top: 1px;
 }
 
-ul.linklist li.rightside, p.rightside {
+ul.linklist > li.rightside, p.rightside {
 	float: right;
 	margin-right: 0;
 	margin-left: 7px;
@@ -412,15 +412,9 @@ ul.linklist .dropdown-up .dropdown {
 	bottom: 18px;
 }
 
-ul.linklist .dropdown li {
-	clear: both;
-	margin: 0;
-	padding: 4px 4px 4px 0;
-}
-
 /* Bulletin icons for list items
 ----------------------------------------*/
-ul.linklist.bulletin li:before {
+ul.linklist.bulletin > li:before {
 	display: inline-block;
 	content: "\2022";
 	font-size: inherit;
@@ -428,11 +422,9 @@ ul.linklist.bulletin li:before {
 	padding-right: 4px;
 }
 
-ul.linklist.bulletin li:first-child:before, ul.linklist.bulletin li.rightside:last-child:before {
-	content: none;
-}
-
-ul.linklist.bulletin li.no-bulletin:before {
+ul.linklist.bulletin > li:first-child:before, 
+ul.linklist.bulletin > li.rightside:last-child:before,
+ul.linklist.bulletin > li.no-bulletin:before {
 	content: none;
 }
 
@@ -606,29 +598,16 @@ ul.linklist.bulletin li.no-bulletin:before {
 	white-space: normal;
 }
 
-.dropdown li:before, .dropdown li:after {
-	display: none !important;
-}
-
 .dropdown li.separator {
 	border-top: 1px solid transparent;
-	margin: 4px 0 !important;
-	padding: 0 !important;
+	margin: 4px 0;
+	padding: 0;
 }
 
 .dropdown li.separator:first-child, .dropdown li.separator:last-child {
 	display: none !important;
 }
 
-.dropdown .clone + li.separator {
-	display: none;
-}
-
-.responsive .dropdown .clone + li.separator {
-	display: inherit;
-}
-
-
 /* Responsive breadcrumbs
 ----------------------------------------*/
 .breadcrumbs .crumb {
@@ -1147,19 +1126,19 @@ form > p.post-notice strong {
 	padding: 0;
 	margin: 0 !important;
 	float: none;
-	border-bottom: 1px solid;
+	border-top: 1px solid;
 	list-style-type: none;
 	font-size: 0.95em;
 	clear: both;
 	position: relative;
 }
 
-.dropdown-extended ul li.no_notifications {
-	padding: 10px;
+.dropdown-extended ul li:first-child {
+	border-top: none;
 }
 
-.dropdown-extended ul li:before, .dropdown-extended ul li:after {
-	display: none;
+.dropdown-extended ul li.no_notifications {
+	padding: 10px;
 }
 
 .dropdown-extended .dropdown-contents {
@@ -1172,6 +1151,7 @@ form > p.post-notice strong {
 	font-family: Arial, "Helvetica Neue", Helvetica, Arial, sans-serif;
 	font-size: 11px;
 	font-weight: bold;
+	text-align: left;
 	text-shadow: 1px 1px 1px white;
 	text-transform: uppercase;	
 	line-height: 30px;
@@ -1263,7 +1243,7 @@ form > p.post-notice strong {
 	display: block;
 }
 
-/* Main navigation specific list items
+/* Navbar specific list items
 ----------------------------------------*/
 
 #quick-links {
@@ -1314,3 +1294,11 @@ form > p.post-notice strong {
 .responsive .dropdown .clone {
 	display: inherit;
 }
+
+.dropdown .clone + li.separator {
+	display: none;
+}
+
+.responsive .dropdown .clone + li.separator {
+	display: inherit;
+}
author	PayBas <contact@paybas.com>	2014-06-24 14:58:17 +0200
committer	PayBas <contact@paybas.com>	2014-06-25 14:19:03 +0200
commit	8c7127f573d3f8b62fd3b167b3c86f91b67fc23a (patch)
tree	0db3f609a1c1647001a1f34b98fc64e2a0c76c65
parent	e528a57c2f4aebae72d833c9156611f6471c0b45 (diff)
download	forums-8c7127f573d3f8b62fd3b167b3c86f91b67fc23a.tar forums-8c7127f573d3f8b62fd3b167b3c86f91b67fc23a.tar.gz forums-8c7127f573d3f8b62fd3b167b3c86f91b67fc23a.tar.bz2 forums-8c7127f573d3f8b62fd3b167b3c86f91b67fc23a.tar.xz forums-8c7127f573d3f8b62fd3b167b3c86f91b67fc23a.zip