Merge pull request #2128 from nickvergessen/ticket/12271

[ticket/12271] Decouple dropdown header and footer from #notifications_list
author: Dhruv Goel <dhruv.goel92@gmail.com> 2014-03-14 22:24:42 +0530
committer: Dhruv Goel <dhruv.goel92@gmail.com> 2014-03-14 22:24:42 +0530
commit: eafba554fd3bf5c6898433d6cd53dc0a5c2e3637 (patch)
tree: a18c34b268abc7a7aa8e1f84902d2587c3392bc4
parent: f852630ef321d921cdf6faa8aeff1c6f6ce590a7 (diff)
parent: d9037965c8081be16536205f384bba741c693c2c (diff)
download: forums-eafba554fd3bf5c6898433d6cd53dc0a5c2e3637.tar
forums-eafba554fd3bf5c6898433d6cd53dc0a5c2e3637.tar.gz
forums-eafba554fd3bf5c6898433d6cd53dc0a5c2e3637.tar.bz2
forums-eafba554fd3bf5c6898433d6cd53dc0a5c2e3637.tar.xz
forums-eafba554fd3bf5c6898433d6cd53dc0a5c2e3637.zip
7 files changed, 31 insertions, 25 deletions
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index a89585d899..df02963e3c 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -101,7 +101,7 @@
 				<!-- IF S_NOTIFICATIONS_DISPLAY -->
 				<li class="small-icon icon-notification" data-skip-responsive="true">
 					<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a>
-					<div id="notification_list" class="dropdown notification_list">
+					<div id="notification_list" class="dropdown dropdown-extended notification_list">
 						<div class="pointer"><div class="pointer-inner"></div></div>
 						<div class="dropdown-contents">
 							<div class="header">
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 4ccc232e86..5f6ca4929c 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -273,7 +273,7 @@ a:active	{ color: #368AD2; }
 }
 
 /* Notification mark read link */
-#notification_list a.mark_read {
+.dropdown-extended a.mark_read {
 	background-color: #FFFFFF;
 }
 
@@ -1151,21 +1151,27 @@ input.disabled {
 	background-image: url("./images/loading.gif");
 }
 
-#notification_list ul li {
+.dropdown-extended ul li {
 	border-bottom-color: #B9B9B9;
 }
 
-#notification_list ul li:hover {
+.dropdown-extended ul li:hover {
 	background-color: #CFE1F6;
 	color: #000000;
 }
 
-#notification_list .header, .notification_list .footer {
+.dropdown-extended .header, .dropdown-extended .footer {
 	border-color: #B9B9B9;
 	color: #000000;
 }
 
-#notification_list .header {
+.dropdown-extended .footer {
+	padding: 5px 0;
+	border-top-style: solid;
+	border-top-width: 1px;
+}
+
+.dropdown-extended .header {
 	background: #F1F8FF;
 	background: -moz-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%);
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #F1F8FF), color-stop(100%, #CADCEB));
@@ -1183,7 +1189,7 @@ input.disabled {
 	border-color: #FFF transparent;
 }
 
-#notification_list .pointer-inner, #minitabs .pointer-inner {
+.dropdown-extended .pointer-inner, #minitabs .pointer-inner {
 	border-color: #F1F8FF transparent;
 }
 
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 1b4bdfcc6a..50683c6808 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -578,7 +578,7 @@ ul.linklist.bulletin li.no-bulletin:before {
 	padding-left: 10px;
 }
 
-.wrap .dropdown li, .dropdown.wrap li, #notification_list li {
+.wrap .dropdown li, .dropdown.wrap li, .dropdown-extended li {
 	white-space: normal;
 }
 
@@ -1014,7 +1014,7 @@ form > p.post-notice strong {
 	position: relative;
 }
 
-#notification_list {
+.dropdown-extended {
 	display: none;
 	position: absolute;
 	left: 0;
@@ -1023,14 +1023,14 @@ form > p.post-notice strong {
 	top: 22px;
 }
 
-#notification_list ul {
+.dropdown-extended ul {
 	max-height: 350px;
 	overflow-y: auto;
 	overflow-x: hidden;
 	clear: both;
 }
 
-#notification_list ul li {
+.dropdown-extended ul li {
 	padding: 10px;
 	margin: 0;
 	float: none;
@@ -1041,16 +1041,16 @@ form > p.post-notice strong {
 	position: relative;
 }
 
-#notification_list ul li:before, #notification_list ul li:after {
+.dropdown-extended ul li:before, .dropdown-extended ul li:after {
 	display: none;
 }
 
-#notification_list .dropdown-contents {
+.dropdown-extended .dropdown-contents {
 	max-height: none;
 	padding: 0;
 }
 
-#notification_list .header {
+.dropdown-extended .header {
 	padding: 0 10px;
 	font-family: Arial, "Helvetica Neue", Helvetica, Arial, sans-serif;
 	font-size: 11px;
@@ -1062,18 +1062,18 @@ form > p.post-notice strong {
 	border-radius: 5px 5px 0 0;
 }
 
-#notification_list .header .header_settings {
+.dropdown-extended .header .header_settings {
 	float: right;
 	font-weight: normal;
 	text-transform: none;
 }
 
-#notification_list .footer {
+.dropdown-extended .footer {
 	text-align: center;
 	font-size: 1.2em;
 }
 
-#notification_list ul li a, .notification_list dt > a, #notification_list .footer > a {
+.dropdown-extended ul li a, .notification_list dt > a, .dropdown-extended .footer > a {
 	display: block;
 	text-decoration: none;
 }
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 389f93fa4e..03473a34f4 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -767,7 +767,7 @@ div.dl_links {
 
 /* Show scrollbars for items with overflow on iOS devices
 ----------------------------------------*/
-.postbody .content::-webkit-scrollbar, #topicreview::-webkit-scrollbar, #post_details::-webkit-scrollbar, .codebox code::-webkit-scrollbar, .attachbox dd::-webkit-scrollbar, .attach-image::-webkit-scrollbar, #notification_list ul::-webkit-scrollbar {
+.postbody .content::-webkit-scrollbar, #topicreview::-webkit-scrollbar, #post_details::-webkit-scrollbar, .codebox code::-webkit-scrollbar, .attachbox dd::-webkit-scrollbar, .attach-image::-webkit-scrollbar, .dropdown-extended ul::-webkit-scrollbar {
 	width: 8px;
 	height: 8px;
 	-webkit-appearance: none;
@@ -775,7 +775,7 @@ div.dl_links {
 	border-radius: 3px;
 }
 
-.postbody .content::-webkit-scrollbar-thumb, #topicreview::-webkit-scrollbar-thumb, #post_details::-webkit-scrollbar-thumb, .codebox code::-webkit-scrollbar-thumb, .attachbox dd::-webkit-scrollbar-thumb, .attach-image::-webkit-scrollbar-thumb, #notification_list ul::-webkit-scrollbar-thumb {
+.postbody .content::-webkit-scrollbar-thumb, #topicreview::-webkit-scrollbar-thumb, #post_details::-webkit-scrollbar-thumb, .codebox code::-webkit-scrollbar-thumb, .attachbox dd::-webkit-scrollbar-thumb, .attach-image::-webkit-scrollbar-thumb, .dropdown-extended ul::-webkit-scrollbar-thumb {
 	background: rgba(0, 0, 0, .3);
 	border-radius: 3px;
 }
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css
index d43886256d..ff6df7c9a7 100644
--- a/phpBB/styles/prosilver/theme/links.css
+++ b/phpBB/styles/prosilver/theme/links.css
@@ -50,7 +50,7 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 }
 
 /* Notification mark read link */
-#notification_list a.mark_read {
+.dropdown-extended a.mark_read {
 	background-position: center center;
 	background-repeat: no-repeat;
 	border-radius: 3px 0 0 3px;
@@ -64,11 +64,11 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 	height: 40px;
 }
 
-#notification_list li:hover a.mark_read {
+.dropdown-extended li:hover a.mark_read {
 	display: block;
 }
 
-#notification_list a.mark_read:hover {
+.dropdown-extended a.mark_read:hover {
 	width: 40px;
 }
 
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index 7e4caf5301..13711c1267 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -190,7 +190,7 @@ ul.topiclist li.row dt a.subforum {
 ----------------------------------------*/
 @media only screen and (max-width: 350px), only screen and (max-device-width: 350px)
 {
-	#notification_list {
+	.dropdown-extended {
 		width: 250px;
 	}
 }
diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css
index ca4e9a23b6..456bbf3479 100644
--- a/phpBB/styles/prosilver/theme/tweaks.css
+++ b/phpBB/styles/prosilver/theme/tweaks.css
@@ -53,11 +53,11 @@ dd.option {
 }
 
 /* Notifications list for IE7 */
-#notification_list {
+.dropdown-extended {
 	*left: 0;
 }
 
-#notification_list .header_settings {
+.dropdown-extended .header_settings {
 	*position: absolute;
 	*right: 10px;
 	*top: 0;
author	Dhruv Goel <dhruv.goel92@gmail.com>	2014-03-14 22:24:42 +0530
committer	Dhruv Goel <dhruv.goel92@gmail.com>	2014-03-14 22:24:42 +0530
commit	eafba554fd3bf5c6898433d6cd53dc0a5c2e3637 (patch)
tree	a18c34b268abc7a7aa8e1f84902d2587c3392bc4
parent	f852630ef321d921cdf6faa8aeff1c6f6ce590a7 (diff)
parent	d9037965c8081be16536205f384bba741c693c2c (diff)
download	forums-eafba554fd3bf5c6898433d6cd53dc0a5c2e3637.tar forums-eafba554fd3bf5c6898433d6cd53dc0a5c2e3637.tar.gz forums-eafba554fd3bf5c6898433d6cd53dc0a5c2e3637.tar.bz2 forums-eafba554fd3bf5c6898433d6cd53dc0a5c2e3637.tar.xz forums-eafba554fd3bf5c6898433d6cd53dc0a5c2e3637.zip