Final tweaks for notifications UI

ckan · Nov 7, 2012 · 1b0d24c · 1b0d24c
1 parent 6c18d71
commit 1b0d24c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/ckan/public/base/less/masthead.less b/ckan/public/base/less/masthead.less
@@ -1,6 +1,10 @@
 @mastheadPadding: 5px 10px 3px;
 @notificationsBg: #C9403A;
 
+@menuActiveBg: mix(@mastheadBackgroundColorStart, @mastheadLinkColor, 95%);
+@menuActiveHi: mix(@mastheadBackgroundColorStart, @mastheadLinkColor, 85%);
+@menuActiveLo: darken(@menuActiveBg, 10%);
+
 .masthead() {
 	.clearfix();
 	color: @mastheadTextColor;
@@ -67,6 +71,11 @@ header.masthead {
 					font-size: 12px;
 					font-weight: bold;
 					padding: 4px 10px;
+					.border-radius(3px);
+					&.active {
+						background-color: @menuActiveBg;
+						box-shadow: 0 -1px 0 @menuActiveLo, 0 1px 0 @menuActiveHi;
+					}
 				}
 			}
 		}
@@ -164,6 +173,10 @@ header.masthead {
 		&.authed {
 			margin: 0 0 0 30px;
 		}
+		&.not-authed {
+			padding-top: 2px;
+			padding-bottom: 2px;
+		}
 	}
 
 	.dropdown-menu {
@@ -178,10 +191,6 @@ header.masthead {
 			}
 		}
 	}
-	.notifications-dropdown-menu {
-		margin-right: 4px;
-		min-width: 300px;
-	}
 
 	.debug {
 		position: absolute;

diff --git a/ckan/templates/header.html b/ckan/templates/header.html
@@ -30,7 +30,7 @@ <h1>
       {% if c.userobj %}
         <div class="section account avatar authed" data-module="me" data-me="{{ c.userobj.id }}">
           <div class="dropdown">
-            <a href="{{ h.url_for(controller='user', action='dashboard') }}" class="button notifications{% if c.new_activities > 0 %} notifications-important{% endif %}">
+            <a href="{{ h.url_for(controller='user', action='dashboard') }}" class="button notifications{% if c.new_activities > 0 %} notifications-important{% endif %}" title="{{ c.new_activities }} {{ _('new notifications') }}">
               {{ c.new_activities }}
             </a>
           </div>