[2375] Header style updates

ckan · Jun 12, 2012 · 2fe997e · 2fe997e
1 parent 9da30a4
commit 2fe997e
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 13 deletions.
diff --git a/ckan/public/base/less/masthead.less b/ckan/public/base/less/masthead.less
@@ -20,6 +20,10 @@
   .clearfix;
 }
 
+.masthead hgroup:before {
+  content: attr(data-image-replacement);
+}
+
 .masthead hgroup h1,
 .masthead hgroup p {
   font-size: 34px;
@@ -32,20 +36,27 @@
   font-style: italic;
 }
 
+.masthead .ir {
+  text-indent: -900em;
+  min-height: 50px;
+  background-position: top left;
+  background-repeat: no-repeat;
+}
+
 .masthead .logo {
-  float: left;
   margin-right: 10px;
+  float: left;
 }
 
 .masthead .logo img {
-  display: block;
+  display: inline-block;
   max-height: 34px;
   width: auto;
 }
 
 .masthead .content {
   position: absolute;
-  top: 0;
+  top: 8px;
   right: 0;
   bottom: 0;
 }
@@ -86,12 +97,13 @@
   position: relative;
   padding-top: 7px;
   margin-left: 15px;
-  padding-left: 40px;
+  padding-left: 50px;
 }
 
 .masthead nav.account {
   padding-top: 0;
   padding-left: 10px;
+  margin-right: -10px;
 }
 
 .masthead .section {
@@ -103,38 +115,45 @@
   content: "";
   display: block;
   position: absolute;
-  top: -@masthead-padding;
+  top: -@masthead-padding - 10;
   left: 0;
-  bottom: -@masthead-padding;
+  bottom: -@masthead-padding - 10;
   width: 1px;
   background-color: lighten(@masthead-background-color-start, 5);
+  #gradient > .radial(rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0));
   #gradient > .vertical-three-colors(rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1), 0.5, rgba(255, 255, 255, 0));
   background-color: rgba(255, 255, 255, 0);
 }
 
-
 .masthead .section:before {
 }
 
 .masthead .section:after {
   left: -1px;
   background-color: darken(@masthead-background-color-start, 5);
+  #gradient > .radial(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0));
   #gradient > .vertical-three-colors(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.2), 0.5, rgba(0, 0, 0, 0));
   background-color: rgba(0, 0, 0, 0);
 }
 
 .masthead .account .image {
   position: absolute;
-  left: 10px;
+  left: 20px;
   top: 6px;
 }
 
 .masthead .account .image img {
   display: block;
 }
 
+.masthead .links {
+  display: block;
+  position: relative;
+  top: -2px;
+}
+
 .masthead .account .links a {
-  line-height: 11px;
+  line-height: 13px;
   float: left;
 }
 
@@ -147,8 +166,8 @@
 .masthead .site-search {
   position: relative;
   margin: 0;
-  margin-left: 10px;
-  padding: 0 0 0 10px;
+  margin-left: 20px;
+  padding: 0 0 0 20px;
 }
 
 .masthead .site-search .field {
@@ -165,3 +184,10 @@
 .masthead .site-search button {
 
 }
+
+.masthead .debug {
+  position: absolute;
+  top: 10px;
+  left: 10px;
+  color: rgba(255, 255, 255, 0.5);
+}
diff --git a/ckan/templates/header.html b/ckan/templates/header.html
@@ -1,9 +1,9 @@
 <header class="masthead">
   {% if config.debug %}
-    <div style="float:left;width:150px;">Controller : {{ c.controller }}<br/>Action : {{ c.action }}</div>
+    <div class="debug">Controller : {{ c.controller }}<br/>Action : {{ c.action }}</div>
   {% endif %}
   <div class="container">
-    <hgroup class="logo-wrapper">
+    <hgroup class="ir" style="background-image: url({{ '/base/images/ckan-logo.png' }})">
       <a class="logo" href="{{ h.url('home') }}"><img width="64" src="{{ h.url_for_static(g.site_logo) }}" alt="{{ g.site_title }} Logo" title="{{ g.site_title }} Logo" /></a>
       <h1><a href="{{ h.url('home') }}">{{ g.site_title }}</a></h1>
       <p>{{ g.site_description }}</p>