From bc18985bd4a0b270de889b333d281a9408fab5cb Mon Sep 17 00:00:00 2001
From: Michael Miday <midaym@gmail.com>
Date: Wed, 16 Sep 2015 17:17:43 +0200
Subject: [PATCH] [ticket/12769] slightly refactor linklists

---
 phpBB/styles/prosilver/template/navbar_footer.html | 2 +-
 phpBB/styles/prosilver/template/navbar_header.html | 4 ++--
 phpBB/styles/prosilver/theme/common.css            | 6 +++++-
 phpBB/styles/prosilver/theme/links.css             | 6 ------
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html
index fad7328e44..5ea8fd80c8 100644
--- a/phpBB/styles/prosilver/template/navbar_footer.html
+++ b/phpBB/styles/prosilver/template/navbar_footer.html
@@ -1,7 +1,7 @@
 <div class="navbar" role="navigation">
 	<div class="inner">
 
-	<ul id="nav-footer" class="linklist bulletin" role="menubar">
+	<ul id="nav-footer" class="nav-footer linklist" role="menubar">
 		<li class="breadcrumbs">
 			<!-- IF U_SITE_HOME -->
 				<span class="crumb">
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html
index b7ae33ce39..ba504a5c5b 100644
--- a/phpBB/styles/prosilver/template/navbar_header.html
+++ b/phpBB/styles/prosilver/template/navbar_header.html
@@ -1,7 +1,7 @@
 <div class="navbar" role="navigation">
 	<div class="inner">
 
-	<ul id="nav-main" class="linklist bulletin" role="menubar">
+	<ul id="nav-main" class="nav-main linklist" role="menubar">
 
 		<li id="quick-links" class="quick-links dropdown-container<!-- IF not S_DISPLAY_QUICK_LINKS and not S_DISPLAY_SEARCH --> hidden<!-- ENDIF -->" data-skip-responsive="true">
 			<a href="#" class="dropdown-trigger">
@@ -173,7 +173,7 @@
 	<!-- ENDIF -->
 	</ul>
 
-	<ul id="nav-breadcrumbs" class="linklist navlinks" role="menubar">
+	<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 --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 5eecd79b8e..f58d8015b7 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -230,6 +230,11 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul {
 ----------------------------------------*/
 .navbar ul.linklist {
 	padding: 2px 0;
+	list-style-type: none;
+}
+
+.navbar .linklist > li {
+	display: inline-block;
 }
 
 ul.linklist {
@@ -584,7 +589,6 @@ ul.linklist.bulletin > li.no-bulletin:before {
 }
 
 .breadcrumbs .crumb a {
-	display: inline-block;
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	vertical-align: bottom;
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css
index 0477204fd0..11acdb2f0f 100644
--- a/phpBB/styles/prosilver/theme/links.css
+++ b/phpBB/styles/prosilver/theme/links.css
@@ -28,12 +28,6 @@ a {
 	text-decoration: underline;
 }
 
-/* Navigation bar links */
-li.breadcrumbs span:first-child > a {
-	display: inline-block;
-	padding-left: 17px;
-}
-
 /* Notification mark read link */
 .dropdown-extended a.mark_read {
 	background-position: center center;