Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <markdotto@gmail.com>2015-08-15 08:45:55 +0300
committerMark Otto <markdotto@gmail.com>2015-08-15 08:45:55 +0300
commitc064eef67b168e2f6c61e575f0e99988eceac6f9 (patch)
treec8dccd538370f75f7c257f377196f4b375122237 /scss/_nav.scss
parentb388778f1ff7b9d15305caa9a29805ae9a64c505 (diff)
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
Diffstat (limited to 'scss/_nav.scss')
-rw-r--r--scss/_nav.scss65
1 files changed, 50 insertions, 15 deletions
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);
}