From f885cd85b6a1f5e44b754975215d4451b3dd7443 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Thu, 1 Mar 2012 12:45:17 -0500
Subject: [PATCH] Fix styles for topbar

---
 sass/_textbook.scss                |  2 +-
 sass/base/_extends.scss            |  2 +-
 sass/courseware/_sequence-nav.scss |  2 +-
 sass/wiki/_wiki.scss               | 24 +++++++++++-------------
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/sass/_textbook.scss b/sass/_textbook.scss
index 8943eb1064..f0e43cd523 100644
--- a/sass/_textbook.scss
+++ b/sass/_textbook.scss
@@ -54,7 +54,7 @@ div.book-wrapper {
 
       a {
         @extend .block-link;
-        padding: 14px;
+        padding: 0 lh();
       }
 
       ul {
diff --git a/sass/base/_extends.scss b/sass/base/_extends.scss
index ad2716ee2f..2ac93d731e 100644
--- a/sass/base/_extends.scss
+++ b/sass/base/_extends.scss
@@ -172,6 +172,7 @@ h1.top-header {
   font-size: 12px;
   margin: (-$body-line-height) (-$body-line-height) $body-line-height;
   text-shadow: 0 1px 0 #fff;
+  line-height: 46px;
   height:46px;
 
   @media print {
@@ -191,7 +192,6 @@ h1.top-header {
       border-left: 1px solid darken(#f6efd4, 20%);
       @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
       display: block;
-      padding: lh(.75);
       text-transform: uppercase;
 
       &:hover {
diff --git a/sass/courseware/_sequence-nav.scss b/sass/courseware/_sequence-nav.scss
index 9270bf3a99..47b23adbc9 100644
--- a/sass/courseware/_sequence-nav.scss
+++ b/sass/courseware/_sequence-nav.scss
@@ -172,7 +172,7 @@ nav.sequence-nav {
         border-left: 1px solid darken(#f6efd4, 20%);
         cursor: pointer;
         display: table-cell;
-        padding: 14px 4px;
+        padding: 0 4px;
         text-indent: -9999px;
         width: 82px;
 
diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss
index 2677ca34f2..5de3851cd0 100644
--- a/sass/wiki/_wiki.scss
+++ b/sass/wiki/_wiki.scss
@@ -24,7 +24,6 @@ div.wiki-wrapper {
         padding: lh(.75) lh();
         margin-bottom: 0;
         color: darken(#F6EFD4, 55%);
-        line-height: lh();
       }
 
       ul {
@@ -36,24 +35,23 @@ div.wiki-wrapper {
 
           input[type="button"] {
             @extend .block-link;
-            @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
-            @include border-radius(0);
-            @include transition();
+            background-color: darken(#F6EFD4, 5%);
+            background-position: 12px center;
+            background-repeat: no-repeat;
             border: 0;
             border-left: 1px solid darken(#f6efd4, 20%);
+            @include border-radius(0);
+            @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
             color: darken(#F6EFD4, 80%);
-            text-shadow: none;
             font-weight: normal;
-            // font-size: 12px;
-            // text-transform: uppercase;
+            font-size: 12px;
             letter-spacing: 1px;
-            // padding: 14.9px;
-            padding: lh(.60) lh();
-            padding-left: 38px;
+            line-height: 46px;
             margin: 0;
-            background-position: 12px center;
-            background-color: darken(#F6EFD4, 5%);
-            background-repeat: no-repeat;
+            padding: 0 lh() 0 38px;
+            text-shadow: none;
+            text-transform: uppercase;
+            @include transition();
 
             &.view {
               background-image: url('/static/images/sequence-nav/view.png');