1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 08:39:56 +02:00

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
This commit is contained in:
Mark Otto
2015-08-14 22:45:55 -07:00
parent b388778f1f
commit c064eef67b
78 changed files with 484 additions and 602 deletions

View File

@@ -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);
}

View File

@@ -115,7 +115,7 @@ $container-max-widths: (
// Set the number of columns and specify the width of the gutters.
$grid-columns: 12 !default;
$grid-gutter-width: 1.5rem !default;
$grid-gutter-width: 1.875rem !default; // 30px
// Typography