bootswatch-rails 0.2.0 → 0.3.0

data/vendor/assets/stylesheets/bootswatch/spacelab/_variables.scss

@@ -1,8 +1,8 @@
+// Spacelab 2.2.2
 // Variables
-// Swatch: Spacelab
-// Version: 2.1.1
 // --------------------------------------------------
 
+
 // Global values
 // --------------------------------------------------
 
@@ -11,8 +11,8 @@
 // -------------------------
 $black:                 #000;
 $grayDarker:            #2D2D2D;
-$grayDark:              #333;
-$gray:                  #777;
+$grayDark:              #434848;
+$gray:                  #666;
 $grayLight:             #bbb;
 $grayLighter:           #eee;
 $white:                 #fff;
@@ -22,7 +22,7 @@ $white:                 #fff;
 // -------------------------
 $blue:                  #3399F3;
 $blueDark:              #405A6A;
-$green:                 #819E37;
+$green:                 #3CB521;
 $red:                   #CD0200;
 $yellow:                #F4CA00;
 $orange:                #D47500;
@@ -33,29 +33,46 @@ $purple:                #405A6A;
 // Scaffolding
 // -------------------------
 $bodyBackground:        $white;
-$textColor:             $grayDarker;
+$textColor:             $gray;
 
 
 // Links
 // -------------------------
-$linkColor:             #558BC4;
+$linkColor:             #09d;
 $linkColorHover:        $linkColor;
 
 
 // Typography
 // -------------------------
-$sansFontFamily:        "Muli", "Helvetica Neue", Helvetica, Arial, sans-serif;
+$sansFontFamily:        "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
 $serifFontFamily:       Georgia, "Times New Roman", Times, serif;
 $monoFontFamily:        Menlo, Monaco, Consolas, "Courier New", monospace;
 
-$baseFontSize:          14px;
+$baseFontSize:          15px;
 $baseFontFamily:        $sansFontFamily;
 $baseLineHeight:        21px;
 $altFontFamily:         $serifFontFamily;
 
 $headingsFontFamily:    inherit; // empty to use BS default, $baseFontFamily
 $headingsFontWeight:    normal;    // instead of browser default, bold
-$headingsColor:         inherit; // empty to use BS default, $textColor
+$headingsColor:         $grayDarker; // empty to use BS default, $textColor
+
+
+// Component sizing
+// -------------------------
+// Based on 14px font-size and 20px line-height
+
+$fontSizeLarge:         $baseFontSize * 1.25; // ~18px
+$fontSizeSmall:         $baseFontSize * 0.85; // ~12px
+$fontSizeMini:          $baseFontSize * 0.75; // ~11px
+
+$paddingLarge:          11px 19px; // 44px
+$paddingSmall:          2px 10px;  // 26px
+$paddingMini:           0px 6px;   // 22px
+
+$baseBorderRadius:      4px;
+$borderRadiusLarge:     6px;
+$borderRadiusSmall:     3px;
 
 
 // Tables
@@ -66,31 +83,67 @@ $tableBackgroundHover:              #f5f5f5; // for hover
 $tableBorder:                       #ddd; // table and cell border
 
 
+// Navbar
+// -------------------------
+$navbarCollapseWidth:             979px;
+$navbarCollapseDesktopWidth:      $navbarCollapseWidth + 1;
+
+$navbarHeight:                    40px;
+$navbarBackgroundHighlight:       $grayLighter;
+$navbarBackground:                lighten($grayLight, 5%);
+$navbarBorder:                    $grayLight;
+
+$navbarText:                      $textColor;
+$navbarLinkColor:                 $textColor;
+$navbarLinkColorHover:            $black;
+$navbarLinkColorActive:           $black;
+$navbarLinkBackgroundHover:       transparent;
+$navbarLinkBackgroundActive:      transparent;
+
+$navbarBrandColor:                $navbarLinkColor;
+
+// Inverted navbar
+$navbarInverseBackground:                #6C737E;
+$navbarInverseBackgroundHighlight:       lighten($navbarInverseBackground, 25%);
+$navbarInverseBorder:                    darken($navbarInverseBackground, 5%);
+
+$navbarInverseText:                      $grayLighter;
+$navbarInverseLinkColor:                 $grayLighter;
+$navbarInverseLinkColorHover:            $white;
+$navbarInverseLinkColorActive:           $white;
+$navbarInverseLinkBackgroundHover:       transparent;
+$navbarInverseLinkBackgroundActive:      $navbarInverseBackground;
+
+$navbarInverseSearchBackground:          lighten($navbarInverseBackground, 25%);
+$navbarInverseSearchBackgroundFocus:     $white;
+$navbarInverseSearchBorder:              $navbarInverseBackground;
+$navbarInverseSearchPlaceholderColor:    $grayLighter;
+
+$navbarInverseBrandColor:                $navbarInverseLinkColor;
+
+
 // Buttons
 // -------------------------
 $btnBackground:                     $white;
 $btnBackgroundHighlight:            $grayLighter;
-$btnBorder:                         darken($btnBackground, .2);
+$btnBorder:                         darken($btnBackground, 20%);
 
-$btnPrimaryBackground:              lighten($linkColor, .15);
+$btnPrimaryBackground:              lighten($linkColor, 10%);
 $btnPrimaryBackgroundHighlight:     $linkColor;
 
-$btnInfoBackground:                 lighten($grayLight, .15);
-$btnInfoBackgroundHighlight:        $grayLight;
+$btnInfoBackground:                 lighten(#3A5D83, 10%);
+$btnInfoBackgroundHighlight:        #3A5D83;
 
-$btnSuccessBackground:              lighten($green, .15);
+$btnSuccessBackground:              lighten($green, 10%);
 $btnSuccessBackgroundHighlight:     $green;
 
-$btnWarningBackground:              lighten($orange, .15);
+$btnWarningBackground:              lighten($orange, 10%);
 $btnWarningBackgroundHighlight:     $orange;
 
-$btnDangerBackground:               lighten($red, .15);
+$btnDangerBackground:               lighten($red, 10%);
 $btnDangerBackgroundHighlight:      $red;
 
-// To avoid use variable not defined yet
-$navbarInverseBackground:           #6C737E;
-
-$btnInverseBackground:              lighten($navbarInverseBackground, .15);
+$btnInverseBackground:              lighten($navbarInverseBackground, 15%);
 $btnInverseBackgroundHighlight:     $navbarInverseBackground;
 
 
@@ -98,9 +151,11 @@ $btnInverseBackgroundHighlight:     $navbarInverseBackground;
 // -------------------------
 $inputBackground:               $white;
 $inputBorder:                   #ccc;
-$inputBorderRadius:             3px;
+$inputBorderRadius:             $baseBorderRadius;
 $inputDisabledBackground:       $grayLighter;
 $formActionsBackground:         #f5f5f5;
+$inputHeight:                   $baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
+
 
 // Dropdowns
 // -------------------------
@@ -111,17 +166,17 @@ $dropdownDividerBottom:         $white;
 
 $dropdownLinkColor:             $textColor;
 $dropdownLinkColorHover:        $white;
-$dropdownLinkColorActive:       $dropdownLinkColor;
+$dropdownLinkColorActive:       $white;
 
 $dropdownLinkBackgroundActive:  $linkColor;
 $dropdownLinkBackgroundHover:   $dropdownLinkBackgroundActive;
 
 
 
-
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
+
 // Z-index master list
 // -------------------------
 // Used for a bird's eye view of components dependent on the z-axis
@@ -134,6 +189,12 @@ $zindexModalBackdrop:     1040;
 $zindexModal:             1050;
 
 
+// Sprite icons path
+// -------------------------
+$iconSpritePath:          "../img/glyphicons-halflings.png";
+$iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png";
+
+
 // Input placeholder text color
 // -------------------------
 $placeholderText:         $grayLight;
@@ -151,45 +212,7 @@ $horizontalComponentOffset:       180px;
 
 // Wells
 // -------------------------
-$wellBackground:                  #f5f5f5;
-
-
-// Navbar
-// -------------------------
-$navbarCollapseWidth:             979px;
-
-$navbarHeight:                    40px;
-$navbarBackgroundHighlight:       #eee;
-$navbarBackground:                $grayLight;
-$navbarBorder:                    darken($navbarBackground, .05);
-
-$navbarText:                      $textColor;
-$navbarLinkColor:                 $textColor;
-$navbarLinkColorHover:            $linkColor;
-$navbarLinkColorActive:           $textColor;
-$navbarLinkBackgroundHover:       transparent;
-$navbarLinkBackgroundActive:      transparent;
-
-$navbarBrandColor:                $grayDark;
-
-// Inverted navbar
-$navbarInverseBackground:                #6C737E;
-$navbarInverseBackgroundHighlight:       lighten($navbarInverseBackground, .25);
-$navbarInverseBorder:                    darken($navbarInverseBackground, .05);
-
-$navbarInverseText:                      $grayLighter;
-$navbarInverseLinkColor:                 $grayLighter;
-$navbarInverseLinkColorHover:            $white;
-$navbarInverseLinkColorActive:           $white;
-$navbarInverseLinkBackgroundHover:       transparent;
-$navbarInverseLinkBackgroundActive:      $navbarInverseBackground;
-
-$navbarInverseSearchBackground:          lighten($navbarInverseBackground, .25);
-$navbarInverseSearchBackgroundFocus:     $white;
-$navbarInverseSearchBorder:              $navbarInverseBackground;
-$navbarInverseSearchPlaceholderColor:    $grayLighter;
-
-$navbarInverseBrandColor:                $navbarInverseLinkColor;
+$wellBackground:                  $grayLighter;
 
 
 // Pagination
@@ -202,7 +225,7 @@ $paginationActiveBackground:          #f5f5f5;
 // Hero unit
 // -------------------------
 $heroUnitBackground:              $grayLighter;
-$heroUnitHeadingColor:            inherit;
+$heroUnitHeadingColor:            $headingsColor;
 $heroUnitLeadColor:               inherit;
 
 
@@ -210,19 +233,20 @@ $heroUnitLeadColor:               inherit;
 // -------------------------
 $warningText:             $white;
 $warningBackground:       $orange;
-$warningBorder:           darken(adjust-hue($warningBackground, -10), .03);
+$warningBorder:           darken(adjust-hue($warningBackground, -10), 3%);
 
 $errorText:               $white;
 $errorBackground:         $red;
-$errorBorder:             darken(adjust-hue($errorBackground, -10), .03);
+$errorBorder:             darken(adjust-hue($errorBackground, -10), 3%);
 
 $successText:             $white;
 $successBackground:       $green;
-$successBorder:           darken(adjust-hue($successBackground, -10), .05);
+$successBorder:           darken(adjust-hue($successBackground, -10), 5%);
 
 $infoText:                $white;
 $infoBackground:          $blue;
-$infoBorder:              darken(adjust-hue($infoBackground, -10), .07);
+$infoBorder:              darken(adjust-hue($infoBackground, -10), 7%);
+
 
 // Tooltips and popovers
 // -------------------------
@@ -234,7 +258,7 @@ $tooltipArrowColor:       $tooltipBackground;
 $popoverBackground:       #fff;
 $popoverArrowWidth:       10px;
 $popoverArrowColor:       #fff;
-$popoverTitleBackground:  darken($popoverBackground, .03);
+$popoverTitleBackground:  darken($popoverBackground, 3%);
 
 // Special enhancement for popovers
 $popoverArrowOuterWidth:  $popoverArrowWidth + 1;
@@ -275,4 +299,4 @@ $fluidGridGutterWidth1200:     percentage($gridGutterWidth1200/$gridRowWidth1200
 
 // 768px-979px
 $fluidGridColumnWidth768:      percentage($gridColumnWidth768/$gridRowWidth768);
-$fluidGridGutterWidth768:      percentage($gridGutterWidth768/$gridRowWidth768);
+$fluidGridGutterWidth768:      percentage($gridGutterWidth768/$gridRowWidth768);

data/vendor/assets/stylesheets/bootswatch/spruce/_bootswatch.scss

@@ -1,50 +1,50 @@
-// Swatch: Spruce
-// Version: 2.0.2
+// Spruce 2.2.2
+// Bootswatch
 // -----------------------------------------------------
 
+
 // TYPOGRAPHY
 // --------------------------------------------------
 
-@import url("https://fonts.googleapis.com/css?family=Josefin+Slab:400,700");
-
-.navbar .brand, legend, .btn,
-.navbar .nav > li > a,
-div.subnav li > a  {
-	font-family: $headingsFontFamily;
-	font-weight: $headingsFontWeight;
-}
-
-h3 { font-size: 20px; }
-h4 { font-size: 16px; }
-h5 { font-size: 14px; }
-
-h1, h2, h3, h4, h5, h6 {
-	color: $yellow;
-}
+@import url(//fonts.googleapis.com/css?family=Crete+Round);
 
-h1 > small, h2 > small, h3 > small, h4 > small, h5 > small, h6 > small, .muted {
-	color: $linkColor;
+h1 > small,
+h2 > small,
+h3 > small,
+h4 > small,
+h5 > small,
+h6 > small,
+.muted {
+	color: $headingsColor;
 	font-family: $baseFontFamily;
 }
 
-.alert-heading {
-	font-family: $baseFontFamily;
+.jumbotron h1 {
+	font-weight: normal !important;
 }
 
 // SCAFFOLDING
 // --------------------------------------------------
 
-body {
-	@include gradient-vertical-three-colors (#90A38F, #AEAD8E, .6, #90A38F);
-	background-size: 100% 1400px;
-	background-repeat: repeat-y !important;
+.page-header {
+	border-bottom: none;
+	padding-bottom: 5px;
+
+	h1 {
+		margin-bottom: 0;
+	}
+}
+
+hr {
+	border-top: none;
+	border-bottom: 2px solid $headingsColor;
 }
 
 blockquote {
-	border-left: 2px solid $linkColor;
+	border-left: 2px solid $headingsColor;
 
 	&.pull-right {
-		border-right: 2px solid $linkColor;
+		border-right: 2px solid $headingsColor;
 	}
 
 	small {
@@ -52,350 +52,423 @@ blockquote {
 	}
 }
 
-code, pre {
-	color: lighten($blueDark, .1);
-	background-color: $linkColor;
-}
-
 // NAVBAR
 // --------------------------------------------------
 
-.navbar-inner {
-	background-image: none;
-	@include box-shadow(none);
-}
+.navbar {
 
-.navbar .brand {
-	font-size: 26px;
-	padding: 18px 20px 12px;
-	color: $linkColor;
-}
+	.navbar-inner {
+		background-image: none;
+		@include box-shadow(none);
+	}
 
-.navbar .nav > li > a, {
-	font-size: 20px;
-	padding: 22px 10px 11px;
-	color: $linkColor;
+	.brand {
+		padding: 18px 20px 16px;
+		font-size: 26px;
+		font-family: $headingsFontFamily;
+		font-weight: $headingsFontWeight;
 
-	&:hover {
-		color: $yellow;
+		&:hover {
+			background-color: $navbarLinkBackgroundHover;
+		}
 	}
-}
 
-.navbar .nav .active > a,
-.navbar .nav .active > a:hover {
-	color: $yellow;
-}
+	.nav > li > a {
+		padding: 20px 20px 14px;
+		font-size: 20px;
+		font-family: $headingsFontFamily;
+		font-weight: $headingsFontWeight;
+		text-shadow: none;
+	}
 
-.navbar-search {
-	margin-top: 12px;
-}
+	.nav > .active > a,
+	.nav > .active > a:hover,
+	.nav > .active > a:focus {
+		@include box-shadow(none);
+	}
 
-.navbar-search .search-query {
-	border-color: transparent;
-	padding: 6px 9px 2px 9px;
-	background-color: rgba(255, 255, 255, 0.4);
-}
+	.navbar-text {
+		margin: 19px 20px 0;
+		font-size: 20px;
+		font-family: $headingsFontFamily;
+		font-weight: $headingsFontWeight;
+		line-height: inherit;
+	}
 
-.navbar .nav > .dropdown.open > a {
-	color: $yellow;
-}
+	.divider-vertical {
+		border-color: rgba(0, 0, 0, 0.2);
+	}
 
-.navbar .nav > .dropdown.open > .dropdown-menu {
-	background-color: $linkColor;
-	color: $textColor;
-	border-color: transparent;
-}
+	.btn-navbar {
+		margin-top: 14px;
+	}
 
-.navbar .nav > .dropdown.open > .dropdown-menu a:hover {
-	background-color: darken(#90A38F, .1);
-	color: $linkColor;
-}
+	.navbar-form, .navbar-search {
+		border-color: transparent;
+		margin-top: 12px;
+		@include box-shadow(none);
+		line-height: normal;
+	}
 
-.dropdown-menu .divider {
-	background-color: transparent;
-	border-bottom: 1px solid #AEAD8E;
-}
+	.navbar-search .search-query {
+		border-color: transparent;
+		background-color: rgba(255, 255, 255, 0.4);
+		line-height: normal;
+		color: $white;
+	}
 
-div.subnav {
-	background-color: $green;
-	background-image: none;
-	border-color: transparent;
-	@include box-shadow(0 1px 5px rgba(0,0,0,.1));
-	font-size: 18px;
-}
+	.dropdown-menu li > a {
+		font-family: $headingsFontFamily;
+		font-weight: $headingsFontWeight;
+	}
 
-div.subnav .nav > li > a {
-	color: $linkColor;
-	border-color: transparent;
-	background-color: transparent;
-}
+	.nav > li > .dropdown-menu::before,
+	.nav > li > .dropdown-menu::after {
+		border-bottom: none;
+	}
 
-div.subnav .nav > li.active > a,
-div.subnav .nav > li > a:hover,
-div.subnav .nav > li.active > a:hover,
-div.subnav .dropdown.open .dropdown-toggle {
-	background-color: transparent;
-	border-color: transparent;
-	color: $yellow;
-}
+	.navbar-inverse {
 
-div.subnav .nav > li + li > a {
-	border-color: transparent;
-}
+		.dropdown-menu {
+			background-color: $navbarInverseLinkBackgroundHover;
 
-div.subnav .dropdown.open > .dropdown-menu {
-	background-color: $linkColor;
-	color: $textColor;
-	border-color: transparent;
-}
+			li > a {
+				color: $headingsColor;
 
-div.subnav .dropdown.open > .dropdown-menu a:hover {
-	background-color: darken(#90A38F, .1);
-	color: $linkColor;
-}
+				&:hover {
+					background-color: $navbarInverseBackground;
+				}
+			}
 
-div.subnav-fixed {
-	top: 54px;
-}
+			.divider {
+				border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+			}
+
+			.nav-header {
+				color: $headingsColor;
+			}
+		}
+
+	}
 
-.navbar .btn-navbar {
-	margin-top: 14px;
 }
 
-.navbar .nav-collapse.in .nav li > a {
-	color: $linkColor;
+@media (max-width: $navbarCollapseWidth) {
+
+	.navbar .nav-collapse {
 
-	&:hover {
-		color: $yellow;
-		background-color: $blue;
+		.nav li > a {
+			color: $navbarLinkColor;
+
+			&:hover {
+				background-color: $navbarLinkBackgroundHover;
+			}
+		}
 	}
-}
 
-.navbar .navbar-form, .navbar .navbar-search {
-	border-color: transparent;
-	@include box-shadow(none);
-}
+	.navbar-inverse .nav-collapse {
 
-// TABLES
-// --------------------------------------------------
+		.nav li > a:hover {
+			background-color: rgba(0, 0, 0, 0.06) !important;
+		}
+	}
 
-.table,
-.table.table-bordered,
-.table.table-striped {
-	@include border-radius(0 0 8px 8px);
+	.nav-collapse .navbar-form,
+	.nav-collapse .navbar-search {
+		border: none !important;
+		@include box-shadow(none !important);
+	}
 }
 
-.table-bordered thead:first-child tr:first-child th:first-child,
-.table-bordered tbody:first-child tr:first-child td:first-child,
-.table-bordered thead:first-child tr:first-child th:last-child,
-.table-bordered tbody:first-child tr:first-child td:last-child {
+div.subnav {
+
+	background-color: $green;
+	background-image: none;
+	border-color: transparent;
 	@include border-radius(0);
-}
 
-.table-striped tbody:last-child tr:last-child td:first-child {
-	@include border-radius(0 0 0 8px);
-}
+	.nav > li > a {
+		padding: 12px 12px 10px;
+		border-color: transparent;
+		background-color: transparent;
+		font-family: $headingsFontFamily;
+		font-weight: $headingsFontWeight;
+		color: $navbarLinkColor;
+	}
 
-.table-striped tbody:last-child tr:last-child td:last-child {
-	@include border-radius(0 0 8px 0);
-}
+	.nav > li > a:hover,
+	.nav > .active > a,
+	.nav > .active > a:hover,
+	.dropdown.open .dropdown-toggle,
+	.dropdown.open.active .dropdown-toggle:hover {
+		background-color: $navbarLinkBackgroundHover;
+		@include box-shadow(none);
+		border-color: transparent;
+		color: $white;
+	}
 
-.table-bordered {
-	border: none;
+	&.subnav-fixed {
+		top: $navbarHeight;
+	}
 }
 
-.table thead tr th:first-child,
-.table tbody tr td:first-child {
-	border-left: none;
-}
+// NAV
+// --------------------------------------------------
 
-.table th,
-.table-striped tbody tr:nth-child(odd) th {
-	background-color: darken(#90A38F, .1);
-	color: $linkColor;
+.nav {
+
+	.nav-header {
+		color: $headingsColor;
+	}
+
+	.disabled > a,
+	.disabled > a:hover {
+		background-color: lighten($green, 10%);
+		color: $white;
+	}
 }
 
-// BUTTONS
-// --------------------------------------------------
+.nav-tabs {
 
-.btn {
-  @include buttonBackground(lighten($blueDark, .05), $blueDark);
-    text-shadow: none;
-    color: $white;
 	border-color: transparent;
-	@include box-shadow(none);
 
-	&:hover {
-		color: $grayLighter;
+	& > li > a {
+		background-color: $green;
+		color: $white;
+
+		&:hover {
+			background-color: $navbarBackground;
+			border-color: transparent;
+		}
 	}
-}
 
-.btn-large {
-	font-size: 18px;
-}
+	.active > a,
+	.active > a:hover {
+		background-color: $navbarBackground;
+		border-color: transparent;
+		color: $white;
+	}
 
-.btn-primary {
-	@include buttonBackground(lighten($blue, .1), lighten($blue, .05));
-}
+	&.nav-stacked > li > a {
+		border-color: transparent;
 
-.btn-warning {
-  @include buttonBackground($orange, darken($orange, .05));
-}
+		&:hover {
+			border-color: transparent;
+		}
+	}
 
-.btn-danger {
-  @include buttonBackground(lighten($red, .05), $red);
+	.open .dropdown-toggle,
+	.active.open .dropdown-toggle {
+		background-color: $navbarBackground;
+	}
 }
 
-.btn-success {
-  @include buttonBackground(#62c462, #51a351);
-}
+.nav-pills {
 
-.btn-info {
-  @include buttonBackground(#5bc0de, #2f96b4);
-}
+	& > li > a {
+		background-color: $green;
+		color: $white;
 
-.btn-inverse {
-  @include buttonBackground($yellow, darken($yellow, .05));
-}
+		&:hover {
+			background-color: $navbarBackground;
+			border-color: transparent;
+		}
+	}
 
-.btn-group .dropdown-toggle {
-	@include box-shadow(none);
-}
+	.active > a,
+	.active > a:hover {
+		background-color: $navbarBackground;
+		border-color: transparent;
+		color: $white;
+	}
 
-// NAVIGATION
-// --------------------------------------------------
+	.open .dropdown-toggle,
+	.active.open .dropdown-toggle {
+		background-color: $navbarBackground;
+	}
+}
 
-.breadcrumb, .pagination > ul {
-	background-color: darken(#90A38F, .1);
-	background-image: none;
-	border-color: transparent;
-	@include box-shadow(none);
+.tabbable {
+	.nav-tabs,
+	.nav-tabs > li > a,
+	.nav-tabs > li > a:hover,
+	.nav-tabs > li.active > a,
+	.nav-tabs > li.active > a:hover  {
+		border-color: transparent;
+	}
 }
 
-.breadcrumb li {
-	color: $yellow;
-	text-shadow: none;
+.nav-list {
 
-	a {
-		color: $linkColor;
+	.nav-header,
+	li > a {
+		text-shadow: none;
 	}
 
-	a:hover {
-		color: $yellow;
+	li > a:hover {
+		background-color: $green;
+		color: $white;
+	}
+
+	li.active > a,
+	li.active > a:hover {
+		background-color: $navbarBackground;
+		text-shadow: none;
 	}
 
 	.divider {
-		color: $blue;
+		background-color: transparent;
+		border-bottom: 1px solid $headingsColor;
 	}
 }
 
-.pagination a {
-	color: $linkColor;
+.breadcrumb {
+
+	background-color: $green;
+	background-image: none;
+	@include box-shadow(none);
 	border-color: transparent;
+	@include border-radius(0);
 
-	&:hover {
-		color: $yellow;
-		background-color: #748C73;
-	}
-}
+	li {
+		color: $white;
+		text-shadow: none;
 
-.pagination .active a {
-	color: $blue;
-	background-color: #A2CDB5;
-}
+		a {
+			color: $white;
+			text-decoration: underline;
+		}
 
-.pagination .disabled a,
-.pagination .disabled a:hover {
-	color: $blue;
-}
+		a:hover {
+			color: $white;
+		}
 
-.nav-list > li > a, .nav-list .nav-header {
-	text-shadow: none;
-}
+		.divider {
+			color: $white;
+		}
+	}
 
-.nav-list .active > a, .nav-list .active > a:hover {
-	background-color: #A2CDB5;
-	text-shadow: none;
+	.active {
+		color: $white;
+	}
 }
 
-.nav-list li > a:hover {
-	background-color: transparent;
-}
+.pagination {
 
-.nav-tabs {
-	border-color: transparent;
-}
+	ul {
+		background-color: $green;
+		background-image: none;
+		@include box-shadow(none);
+		border-color: transparent;
+		@include border-radius(0);
+	}
 
-.nav-tabs > li > a,
-.nav-pills > li > a {
-	background-color: #748C73;
 
-	&:hover {
-		background-color: #748C73;
+	ul > li > a,
+	ul > li > span {
+		background-color: $green;
 		border-color: transparent;
+		color: $white;
+
+		&:hover {
+			background-color: $navbarBackground;
+			color: $white;
+		}
 	}
-}
 
-.nav-tabs > .active > a,
-.nav-tabs > .active > a:hover,
-.nav-pills .active > a,
-.nav-pills .active > a:hover {
-	background-color: #A2CDB5;
-	border-color: transparent;
-	color: $blue;
+	ul > .active > a,
+	ul > .active > span {
+		background-color: $navbarBackground;
+		color: $white;
+	}
+
+	ul > .disabled > a,
+	ul > .disabled > a:hover,
+	ul > .disabled > span,
+	ul > .disabled > span:hover {
+		background-color: lighten($green, 10%);
+		color: $white;
+	}
 }
 
-.nav-tabs.nav-stacked > li > a {
-	border-color: transparent;
+.pager {
 
-	&:hover {
-		border-color: transparent;
+	li > a,
+	li > span {
+		border: none;
+		background-color: $green;
+		color: $white;
+
+		&:hover {
+			background-color: $navbarBackground;
+		}
+	}
+
+	.disabled a,
+	.disabled a:hover {
+		background-color: lighten($green, 10%);
+		color: $white;
 	}
 }
 
-.nav-tabs .open .dropdown-toggle,
-.nav-pills .open .dropdown-toggle  {
-	background-color: #748C73;
-	border-color: transparent;
-	color: $yellow;
+// BUTTONS
+// --------------------------------------------------
+
+.btn {
+	@include border-radius(0);
+	font-family: $headingsFontFamily;
+	font-weight: $headingsFontWeight;
+    text-shadow: none;
 }
 
-.nav-tabs .active.open .dropdown-toggle,
-.nav-pills .active.open .dropdown-toggle {
-	background-color: #A2CDB5;
+.btn-large {
+	font-size: 18px;
 }
 
-.nav-tabs .dropdown-menu,
-.nav-pills .dropdown-menu {
-	background-color: $linkColor;
-	color: $textColor;
-	border-color: transparent;
+.btn-group .dropdown-toggle {
+	@include box-shadow(none);
+}
 
-	a:hover {
-		background-color: #A2CDB5;
-		color: $linkColor;
-	}
+// TABLES
+// --------------------------------------------------
+
+.table,
+.table.table-bordered,
+.table.table-striped {
+	@include border-radius(0);
 }
 
-.nav .nav-header {
-	color: $blue;
+.table-bordered thead:first-child tr:first-child th:first-child,
+.table-bordered tbody:first-child tr:first-child td:first-child,
+.table-bordered thead:first-child tr:first-child th:last-child,
+.table-bordered tbody:first-child tr:first-child td:last-child,
+.table-bordered tbody:last-child tr:last-child td:first-child, {
+	@include border-radius(0);
 }
 
-.tabbable > .nav-tabs,
-.tabbable > .nav-tabs > li > a,
-.tabbable > .nav-tabs > li > a:hover,
-.tabbable > .nav-tabs > li.active > a,
-.tabbable > .nav-tabs > li.active > a:hover  {
-	border-color: transparent;
+.table thead tr th:first-child,
+.table tbody tr td:first-child {
+	// border-left: none;
 }
 
-.pager a {
-	border: none;
-	background-color: #748C73;
+.table th,
+.table-striped tbody tr:nth-child(odd) th {
+	background-color: $green;
+	color: $white;
+}
 
-	&:hover {
-		background-color: transparent;
-		background-color: #748C73;
+.table {
+
+	tbody tr.success td {
+		background-color: #B5EEAA;
+	}
+
+	tbody tr.error td {
+		background-color: #EEB8B8;
+	}
+
+	tbody tr.info td {
+		background-color: #AEE2EE;
 	}
 }
 
@@ -403,11 +476,14 @@ div.subnav-fixed {
 // --------------------------------------------------
 
 legend {
-	color: $yellow;
+	border-bottom: none;
+	font-family: $headingsFontFamily;
+	font-weight: $headingsFontWeight;
+	color: $headingsColor;
 }
 
 label, .help-block, input[type="file"] {
-	color: $linkColor;
+	color: $headingsColor;
 }
 
 input, textarea, select {
@@ -418,47 +494,106 @@ input, textarea, select {
 	color: $gray;
 }
 
-legend {
-	border-bottom: 2px solid $white;
-}
-
 .form-actions {
-	background-color: transparent;
 	border-top: none;
 	@include border-radius(4px);
 }
 
-// MISCELLANEOUS
+.control-group.error {
+
+	label, .help-block, .help-inline {
+		color: $red;
+	}
+
+	input, select, textarea {
+		border: 1px solid $red;
+		color: $textColor;
+	}
+}
+
+.control-group.success {
+
+	label, .help-block, .help-inline {
+		color: $green;
+	}
+
+	input, select, textarea {
+		border: 1px solid $green;
+		color: $textColor;
+	}
+}
+
+.control-group.warning {
+
+	label, .help-block, .help-inline {
+		color: $orange;
+	}
+
+	input, select, textarea {
+		border: 1px solid $orange;
+		color: $textColor;
+	}
+}
+
+// ALERTS, LABELS, BADGES
 // --------------------------------------------------
 
 .alert {
 	text-shadow: none;
 	border: none;
+
+	h1, h2, h3, h4, h5, h6 {
+		font-weight: bold;
+		color: $white;
+	}
+}
+
+.alert-heading {
+	font-family: $baseFontFamily;
+	color: inherit;
 }
 
+.badge,
 .label {
-	color: $linkColor;
-	opacity: 1;
+
+	background-color: $green;
 	text-shadow: none;
-}
 
-.progress {
-	background-color: darken(#90A38F, .1);
-	background-image: none;
-	@include box-shadow(none);
+	.label-success {
+		background-color: $btnSuccessBackground;
+	}
 
-	.bar {
-		background-image: none;
-		background-color: #A2CDB5;
+	.label-warning {
+		background-color: $btnWarningBackground;
+	}
+
+	.label-important {
+		background-color: $btnDangerBackground;
+	}
+
+	.label-info {
+		background-color: $btnInfoBackground;
+	}
+
+	.label-inverse {
+		background-color: $btnInverseBackground;
 	}
 }
 
+// MISC
+// --------------------------------------------------
+
 .well {
-	background-color: darken(#90A38F, .1);
 	border: none;
+	@include border-radius(0);
 	@include box-shadow(none);
 }
 
+.hero-unit {
+	border: none;
+	@include border-radius(0);
+}
+
 .thumbnail {
 	border: none;
 	@include box-shadow(none);
@@ -468,16 +603,56 @@ legend {
 	}
 }
 
-hr {
-	border-top: none;
-	border-bottom: 2px solid $linkColor;
+.dropdown-menu .nav-header {
+	color: $white;
+	text-shadow: none;
 }
 
-.page-header {
-	border-bottom: 2px solid $linkColor;
-	padding-bottom: 5px;
+.dropdown-menu li > a:hover,
+.dropdown-menu li > a:focus,
+.dropdown-submenu:hover > a {
+	background-image: none;
 }
 
-footer.footer {
-	border-top: 2px solid $linkColor;
+.progress {
+	background-color: darken($grayLighter, 10%);
+	background-image: none;
+}
+
+[class^="icon-"],
+[class*=" icon-"] {
+	vertical-align: baseline;
+}
+
+.modal {
+
+	.modal-header {
+		padding: 12px 15px 6px;
+		background-color: $green;
+	}
+
+	.modal-body,
+	.modal-footer {
+		background-color: $headingsColor;
+		border: none;
+		@include box-shadow(none);
+
+		label {
+			color: $textColor;
+		}
+	}
+
+	.modal-footer {
+		@include border-radius(0 0 4px 4px);
+	}
 }
+
+.popover {
+
+	.popover-title {
+		color: $white;
+	}
+}
+
+// MEDIA QUERIES
+// --------------------------------------------------