From c064eef67b168e2f6c61e575f0e99988eceac6f9 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Fri, 14 Aug 2015 22:45:55 -0700
Subject: Massive cleanup

- Simpler main nav on all pages
- Back to purple masthead on homepage instead of dark graphite
- Active link styles on the main nav
- Cleaned up sidebar nav
- New docs layout name
- Homepage copy edits
- Updated bright purple docs color
---
 scss/_nav.scss | 65 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 50 insertions(+), 15 deletions(-)

(limited to 'scss/_nav.scss')

diff --git a/scss/_nav.scss b/scss/_nav.scss
index ebfb14b871..c5ccc93362 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -2,34 +2,20 @@
 // Navs
 // --------------------------------------------------
 
-
-//
-// Base styles
-//
-
 .nav {
   padding-left: 0;
   margin-bottom: 0;
   list-style: none;
-  @include clearfix();
-}
-
-.nav-item {
-  position: relative;
-  display: inline-block;
 }
 
 .nav-link {
   display: inline-block;
-  padding: $nav-link-padding;
-  line-height: 1;
 
   @include hover-focus {
     text-decoration: none;
-    background-color: $nav-link-hover-bg;
   }
 
-  // Disabled state sets text to gray and nukes hover/tab effects
+  // Disabled state lightens text and removes hover/tab effects
   .disabled > &,
   &.disabled {
     color: $nav-disabled-link-color;
@@ -43,6 +29,53 @@
 }
 
 
+// Nav inline
+
+.nav-inline {
+  .nav-link + .nav-link {
+    margin-left: 1rem;
+  }
+}
+
+
+//
+// Base styles
+//
+
+// .nav {
+//   padding-left: 0;
+//   margin-bottom: 0;
+//   list-style: none;
+//   @include clearfix();
+// }
+//
+// .nav-item {
+//   position: relative;
+//   display: inline-block;
+// }
+//
+// .nav-link {
+//   display: inline-block;
+//
+//   @include hover-focus {
+//     text-decoration: none;
+//     background-color: $nav-link-hover-bg;
+//   }
+//
+//   // Disabled state sets text to gray and nukes hover/tab effects
+//   .disabled > &,
+//   &.disabled {
+//     color: $nav-disabled-link-color;
+//
+//     @include plain-hover-focus {
+//       color: $nav-disabled-link-hover-color;
+//       cursor: $cursor-disabled;
+//       background-color: transparent;
+//     }
+//   }
+// }
+
+
 //
 // Tabs
 //
@@ -62,6 +95,7 @@
 
   .nav-link {
     display: block;
+    padding: $nav-link-padding;
     border: 1px solid transparent;
     @include border-radius($border-radius $border-radius 0 0);
 
@@ -107,6 +141,7 @@
 
   .nav-link {
     display: block;
+    padding: $nav-link-padding;
     @include border-radius($nav-pills-border-radius);
   }
 
-- 
cgit v1.2.3