bootswatch-rails 0.5.0 → 3.1.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjQ4NTMwOTlhOTYxNDM4Y2U3YzlhMGIxMjllZmMzNGMyODQ4MDQ4Nw==
-  data.tar.gz: !binary |-
-    ZDNiYjgzNzZkOTJjZDFhZjA2NWUyYzc0OWVhNWUzNTQ5NTVmOTYwNQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    Zjc1ZjNhN2FlMTgzMDI3Y2E2Y2VlNjEzNDcxMmRlNzhiYmFiZDQ0ZmI0MDQw
-    MGMyNGRlNjA4MDJmNTA4OWQ1Nzg2MzAwZGYxMjlhYTQ0NjBkNjhiNjYyZmYz
-    NDEzZmM4ZGE4Mzk3N2NmZDUwMGY2NjVmODE2Y2Q0NGFjZjY3YWQ=
-  data.tar.gz: !binary |-
-    MzEzMTBkZjAwNDdlODk2OWEzZDJjMzRhNTQ3ZGJmMDUzNGE1ZTMyNjExZTMw
-    NjEyZmI4OGY3YzMxZjQ3MWMzYTMyMDJmNzY2MThkZTY1YmU2M2UzM2IwMjJm
-    YTQ3YzY2YWFmYTgwZTVhY2ExODBkZGNiMzJhODE5ZmU4ZTFiNWQ=
+SHA1:
+  metadata.gz: 9a68b136700cbc3f2de46679eb82073b74dc8271
+  data.tar.gz: 2e6ab33a047515935b04f13f84f533cbf4842eb8
+SHA512:
+  metadata.gz: 0919880066faa383d1e78215a1e4834429115a14b325b83c2c062b2d953307b6b4b4bfc7b0e43da6630b070c128a42092fc07712ff8db45543db290325e8d27f
+  data.tar.gz: 5d0fb8519c3e6e64dd01971d73194f00ae1d8c0fade717d2e2a8ac9b9273ac9899697d523c0fbfa6cc6868cc28b9703ab3bf2236463e783fbd8949751107283e

data/CONTRIBUTING.md

@@ -0,0 +1,52 @@
+This project hasn't been kept up to date very well for the usual reason: I
+haven't needed it myself in a while. Here are my thoughts on how to keep it
+going.
+
+## Keeping up with upstream bootswatches
+
+![One does not simply edit SCSS files](http://i.imgur.com/0N8Tf0U.jpg)
+
+As it stands, this project is not popular enough to be maintained entirely by
+hand. That's why I wrote ruby scripts to convert most of LESS to SCSS. This
+automation means that you can't simply edit some scss file and submit a pull
+request. The next time we run the converter, your fix will disappear. So here's
+how to contribute in a way that avoids this problem.
+
+## I want to fix SCSS issue
+
+#### I know ruby
+
+1. Checkout your fork
+2. Checkout current bootswatch submodule
+3. Edit converter script such that it fixes the problem you found
+4. Run `rake convert`
+5. Run `./rearranges` and fix variable declaration orders
+6. Follow instructions in `CONVERSION.md` and make manual fixes
+7. Submit a pull request
+
+#### I don't know ruby
+
+1. Checkout your fork
+2. Fix the SCSS issue that you found
+3. In `CONVERSION.md` explain the exact steps to fix the issue
+4. Submit a pull request
+
+## I want to update all bootswatches to latest versions
+
+1. Checkout your fork
+2. Checkout current bootswatch submodule
+3. Pull in latest bootswatch submodule
+4. Run `rake convert`
+5. Run `./rearranges` and fix variable declaration orders
+6. Follow instructions in `CONVERSION.md` and make manual fixes 
+7. Try all the bootswatches and make sure (as best you can) that they work
+8. If any additional fixes are required, refer to "I want to fix SCSS issue"
+9. Submit a pull request
+
+## I want to help automate this stuff better
+
+You have to know ruby for this one.
+
+1. Checkout your fork
+2. Work on converter and rearranges scripts, etc
+3. Submit pull requests

data/CONVERSION.md

@@ -1,10 +1,8 @@
-## Notes on conversion
+## Manual conversion steps
 
-TODO: Automate these
+Do this after you ran `rake convert` and rearranged variables according to
+`./rearranges` script.
 
-1. Update bootswatch submodule
-2. Run rake convert
-3. Run ./rearranges and fix variable declaration orders
-4. Search *.scss for this regexp: \We\( and remove occurrences of e function
-5. Search *.scss for this regexp: @include.+!important and move !important into parentheses
-6. Search *.scss for this regexp: &- and prepend parent selector instead
+1. Search *.scss for this regexp: \We\( and remove occurrences of e function
+2. Search *.scss for this regexp: @include.+!important and move !important into parentheses
+3. Search *.scss for this regexp: &- and prepend parent selector instead

data/HISTORY.md

@@ -1,4 +1,12 @@
-## 0.5.0 (2013-02-22)
+## 3.0.0 (2013-10-17)
+
+* Update all themes to current bootswatch versions (3.0.0)
+* Remove Spruce theme
+* Remove Superhero theme
+* Add Custom base theme for creating your own swatch
+* Change version scheme to match bootstrap versioning
+
+## 0.5.0 (2013-05-21)
 
 * Update all themes to current bootswatch versions (2.3.2)
 * Add Flatly theme

data/README.md

@@ -35,6 +35,7 @@ considering that you're using
 
     // Then bootstrap itself
     @import "bootstrap";
+    @import "bootstrap/mixins";
 
     // Bootstrap body padding for fixed navbar
     body { padding-top: 60px; }
@@ -68,15 +69,17 @@ Included bootswatches
 * [Cerulean](http://bootswatch.com/cerulean/)
 * [Cosmo](http://bootswatch.com/cosmo/)
 * [Cyborg](http://bootswatch.com/cyborg/)
+* [Darkly](http://bootswatch.com/darkly/)
 * [Flatly](http://bootswatch.com/flatly/)
 * [Journal](http://bootswatch.com/journal/)
+* [Lumen](http://bootswatch.com/lumen/)
 * [Readable](http://bootswatch.com/readable/)
 * [Simplex](http://bootswatch.com/simplex/)
 * [Slate](http://bootswatch.com/slate/)
 * [Spacelab](http://bootswatch.com/spacelab/)
-* [Spruce](http://bootswatch.com/spruce/)
 * [Superhero](http://bootswatch.com/superhero/)
 * [United](http://bootswatch.com/united/)
+* [Yeti](http://bootswatch.com/yeti/)
 
 ## Contributing
 
@@ -92,6 +95,8 @@ that does most of the work converting less to scss. If you want to contribute a
 fix that's easily automatable and you know ruby, please add a processor to the
 converter.
 
+Note on 3.0.0 conversion: This was converted using a simple grunt task in the [bootswatch-scss](https://github.com/log0ymxm/bootswatch-scss) repo.
+
 ## Credits
 
 Big thanks to these guys.

data/Rakefile

@@ -6,8 +6,10 @@ THEMES = %w(
   cerulean
   cosmo
   cyborg
+  darkly
   flatly
   journal
+  lumen
   readable
   simplex
   slate
@@ -15,6 +17,7 @@ THEMES = %w(
   spruce
   superhero
   united
+  yeti
 ).freeze
 
 

data/lib/bootswatch-rails/version.rb

@@ -1,5 +1,5 @@
 module Bootswatch
   module Rails
-    VERSION = "0.5.0"
+    VERSION = '3.1.1'
   end
 end

data/rearranges

@@ -98,16 +98,18 @@ end
 moves = []
 unassigned.each do |variable|
   assignment = assigned.find{|v| v == variable}
-  moves << [
-    [ variable.section_name,
-      variable.section_header,
-      variable.section,
-      variable ],
-    [ assignment.section_name,
-      assignment.section_header,
-      assignment.section,
-      assignment ]
-  ]
+  if assignment
+    moves << [
+      [ variable.section_name,
+        variable.section_header,
+        variable.section,
+        variable ],
+      [ assignment.section_name,
+        assignment.section_header,
+        assignment.section,
+        assignment ]
+    ]
+  end
 end
 
 moves.uniq!

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

@@ -1,789 +1,180 @@
-// Amelia 2.3.2
+// Amelia 3.1.1
 // Bootswatch
 // -----------------------------------------------------
 
+@import url("//fonts.googleapis.com/css?family=Lobster|Cabin:400,700");
 
-// TYPOGRAPHY
-// -----------------------------------------------------
-
-@import url('//fonts.googleapis.com/css?family=Lobster|Cabin:400,700');
-
-h6 {
-	color: $textColor;
-}
-
-h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
-	font-family: $baseFontFamily;
-	color: $textColor;
-}
-
-code, pre {
-	background-color: rgba(255, 255, 255, 0.3);
-	padding: 2px;
-}
-
-blockquote {
-
-	border-left-color: lighten(#147E88, 12%);
-
-	&.pull-right {
-		border-right-color: lighten(#147E88, 12%);
-	}
-
-	small {
-		color: rgba(255, 255, 255, 0.6);
-	}
-}
-
-.muted {
-	color: rgba(255, 255, 255, 0.6);
-}
-
-// SCAFFOLDING
-// -----------------------------------------------------
-
-body {
-	@include gradient-radial(lighten(#0F8790, 7%), #0F8790);
-}
-
-hr {
-	border-bottom: none;
-}
-
-.page-header {
-	margin: 30px 0 15px;
-	border-bottom: 0px solid transparent;
-}
-
-// NAVBAR
-// -----------------------------------------------------
+// Navbar =====================================================================
 
-.navbar {
-
-	.navbar-inner {
-		@include border-radius(0);
-	}
-
-	.brand {
-		padding: 15px 20px 14px;
-		font-family: $headingsFontFamily;
-		font-size: 24px;
-		font-weight: normal;
-	}
-
-	.nav > li > a {
-		padding-top: 17px;
-		padding-bottom: 14px;
-		text-shadow: none;
-	}
-
-	.nav > .active > a,
-	.nav > .active > a:hover,
-	.navbar .nav > .active > a:focus {
-		@include box-shadow(none);
-	}
-
-	.navbar-search {
-		margin-top: 10px;
-	}
-
-	.navbar-search .search-query {
-		@include border-radius(0);
-		padding-top: 5px;
-		padding-bottom: 5px;
-	}
-
-	.navbar-text {
-		margin: 17px 15px 14px;
-		line-height: 20px;
-	}
-
-	.btn,
-	.btn-group {
-		padding: 4px;
-	}
-
-	.navbar-inverse {
-
-		.dropdown-menu li > a:hover,
-		.dropdown-menu li > a:focus,
-		.dropdown-submenu:hover > a {
-			background-image: none;
-			background-color: $yellow;
-		}
-	}
+.navbar-brand {
+  font-family: 'Lobster', cursive;
 }
 
-@media (max-width: $navbarCollapseWidth) {
-
-	.navbar .nav-collapse {
-
-		.nav li > a {
-
-			color: $textColor;
-			@include border-radius(0);
-
-			&:hover {
-				background-color: lighten($navbarBackground, 10%);
-			}
-		}
-
-		.dropdown-menu li > a:hover,
-		.dropdown-menu li > a:focus,
-		.dropdown-submenu:hover > a {
-			background-image: none;
-		}
-
-		.navbar-form,
-		.navbar-search {
-			@include box-shadow(none);
-			border: none;
-		}
-
-		.navbar-search .search-query {
-			border: 2px solid $textColor;
-		}
-
-		.nav-header {
-			color: rgba(255, 255, 255, 0.5);
-		}
-	}
-
-	.navbar-inverse .nav-collapse {
-
-		.nav > li > a,
-		.dropdown-menu a {
-			color: $navbarInverseLinkColor !important;
-		}
-
-		.nav li > a:hover,
-		.dropdown-menu a:hover {
-			background-color: lighten($navbarInverseBackground, 10%) !important;
-		}
-	}
-}
-
-div.subnav {
-
-	margin: 0 1px;
-	background: rgba(42, 99, 105, 0.9) none;
-	border: none;
-	@include border-radius(0);
-	@include box-shadow(none);
-
-	.nav > li > a {
-		color: $textColor;
-		border-color: transparent;
-	}
-
-	.nav > li:first-child > a,
-	.nav > li:first-child > a:hover {
-		@include border-radius(0);
-	}
-
-	.nav > .active > a {
-		background-color: rgba(255, 255, 255, 0.4);
-		border-color: transparent;
-		color: $textColor;
-		@include box-shadow(none);
-	}
-
-	.nav > li > a:hover,
-	.nav > .active > a:hover, {
-		border-right-color: transparent;
-		background-color: rgba(255, 255, 255, 0.4);
-		color: $textColor;
-	}
-
-	.nav > li.open > a {
-		border-color: transparent;
-		background-color: rgba(255, 255, 255, 0.4);
-	}
-
-	div.subnav-fixed {
-		top: $navbarHeight + 1;
-		margin: 0;
-	}
-}
-
-@media (max-width: 767px) {
-	
-	div.subnav .nav > li + li > a {
-		border-top: 1px solid rgba(255, 255, 255, 0.4);
-	}
-}
-
-// NAV
-// -----------------------------------------------------
-
-.nav-tabs,
-.nav-pills {
-
-	border-color: transparent;
-
-
-	& > li > a {
-		border-color: transparent;
-		@include border-radius(0);
-		@include box-shadow(0);
-	}
-
-	& > li > a:hover {
-		background-color: #8AD5DC;
-		border-color: transparent;
-		text-shadow: none;
-	}
-
-	& > .active > a,
-	& > .active > a:hover {
-		background-color: #8AD5DC;
-		border-color: transparent;
-		color: $textColor;
-		text-shadow: none;
-	}
-
-	& > .disabled > a,
-	& > .disabled > a:hover {
-		background: none;
-		color: $grayLighter;
-	}
-
-	& > .open > .dropdown-toggle,
-	& > .open > .dropdown-toggle {
-		background-color: #8AD5DC;
-		color: $linkColor;
-		border-color: transparent;
-	}
-
-
-}
-
-.nav-tabs {
-
-	border-bottom: 1px solid rgba(255, 255, 255, 0.5);
-
-	& > li > a  {
-		background-color: #3CB9C6;
-	}
-
-	&.nav-stacked {
-
-		li > a:first-child,
-		li > a:last-child {
-			@include border-radius(0);
-		}
-
-		li > a,
-		li > a:hover,
-		li.active > a,
-		li.active > a:hover {
-			border-color: transparent;
-		}
-	}
-}
-
-.nav-list {
-
-	.nav-header {
-		text-shadow: none;
-		color: $textColor;
-	}
-
-	li > a {
-		text-shadow: none;
-	}
-
-	li.active > a,
-	li > a:hover,
-	li.active > a:hover {
-		background-color: #8AD5DC;
-		text-shadow: none;
-	}
-
-	.divider {
-		background-color: rgba(255, 255, 255, 0.3);
-		border-bottom: none;
-	}
-}
-
-.breadcrumb, .pager > li > a {
-	border-color: transparent;
-	@include border-radius(0);
-	@include box-shadow(none);
-	text-shadow: none;
-}
-
-.breadcrumb {
-
-	background-color: #3CB9C6;
-	background-image: none;
-
-	li {
-		text-shadow: none;
-	}
-
-	.active {
-		color: $white;
-	}
-
-	& > li > a.divider,
-	& > li > span.divider {
-		color: $grayLighter;
-	}
-}
-
-.pagination {
-
-	ul  {
-		background-color: $paginationBackground;
-		background-image: none;
-		@include border-radius(0);
-	}
-
-	ul > li > a:hover {
-		background-color: rgba(255, 255, 255, 0.4);
-		color: $linkColor;
-	}
-
-	ul > li:first-child > a,
-	ul > li:last-child > a {
-		@include border-radius(0);
-	}
-
-	ul > .disabled > a,
-	ul > .disabled > a:hover,
-	ul > .disabled > span,
-	ul > .disabled > span:hover {
-		color: $textColor;
-	}
-
-	ul > .active > a,
-	ul > .active > a:hover,
-	ul > .active > span,
-	ul > .active > span:hover {
-		background-color: rgba(255, 255, 255, 0.4);
-		color: $textColor;
-	}
+.navbar-default {
+  .badge {
+    background-color: #fff;
+    color: $navbar-default-bg;
+  }
 }
 
-.pager {
-
-	li > a {
-		background-color: #3CB9C6;
+// Buttons ====================================================================
 
-		&:hover {
-			background-color: #8AD5DC;
-		}
-	}
+.btn {
 
-	.disabled a,
-	.disabled a:hover {
-		background-color: #3CB9C6;
-		color: $white;
-	}
+  .caret {
+    border-top-color: #fff;
+  }
 }
 
-// BUTTONS
-// -----------------------------------------------------
-
-@mixin buttonBackgroundCustom($color) {
+.btn-default {
 
-  background-color: $color;
-  border-color: transparent;
-
-  &:hover, &:active, &.active, &.disabled, &[disabled] {
-    background-color: darken($color, 5%);
-	text-shadow: none;
-  }
-
-  &:active, &.active {
-    background-color: darken($color, 15%);
-	@include box-shadow(none);
+  &:hover {
+    color: $btn-default-color;
   }
 
-  // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
-  &:active,
-  &.active {
-    background-color: darken($color, 15%);
+  .caret {
+    border-top-color: $btn-default-color;
   }
 }
 
-.btn {
- 	padding: 12px 16px;
-	@include border-radius(0);
-	background-image: none;
-	text-shadow: none;
-	@include box-shadow(none);
-	@include buttonBackgroundCustom($btnBackground)
-}
-
-.btn-large {
-	padding: $paddingLarge;
-}
-
-.btn-small {
-	padding: $paddingSmall;
-}
-
-.btn-mini {
-	padding: $paddingMini;
-}
-
-.btn-group .btn:first-child {
-	margin-left: 0;
-	@include border-radius(0);
-}
-
-.btn-group .btn:last-child,
-.btn-group .dropdown-toggle {
-     @include border-radius(0);
-}
+// Typography =================================================================
 
-.btn-group .dropdown-toggle,
-.btn-group.open .dropdown-toggle,
-.btn.open .dropdown-toggle {
-	@include box-shadow(none);
+.text-primary,
+.text-primary:hover {
+  color: lighten($brand-primary, 40%);
 }
 
-.btn-primary {
-  @include buttonBackgroundCustom($btnPrimaryBackground);
+.text-success,
+.text-success:hover {
+  color: lighten($brand-success, 20%);
 }
 
-.btn-info {
-  @include buttonBackgroundCustom($btnInfoBackground);
+.text-danger,
+.text-danger:hover {
+  color: lighten($brand-danger, 20%);
 }
 
-.btn-success {
-  @include buttonBackgroundCustom($btnSuccessBackground);
+.text-warning,
+.text-warning:hover {
+  color: lighten($brand-warning, 20%);
 }
 
-.btn-warning {
-  @include buttonBackgroundCustom($btnWarningBackground);
+.text-info,
+.text-info:hover {
+  color: lighten($brand-info, 40%);
 }
 
-.btn-danger {
-  @include buttonBackgroundCustom($btnDangerBackground);
-}
+// Tables =====================================================================
 
-.btn-inverse {
-  @include buttonBackgroundCustom($btnInverseBackground);
+.table-responsive > .table {
+  background-color: $table-bg;
 }
 
-.btn-link {
-	@include buttonBackgroundCustom($btnPrimaryBackground);
-}
-
-.btn-small [class^="icon-"] {
-	margin-top: 1px;
-}
+table,
+.table {
 
-.add-on [class^="icon-"] {
-	margin-left: 5px;
-}
-
-// TABLES
-// -----------------------------------------------------
-
-.table th, .table td,
-.table tbody + tbody {
-	border-top: 0px solid transparent;
-}
+  a {
+    color: #fff;
+    text-decoration: underline;
+  }
 
-.table-bordered {
-	@include border-radius(0);
+  .text-muted {
+    color: $text-muted;
+  }
 }
 
-.table tbody {
-
-	tr.success td {
-		background-color: $green;
-	}
-
-	tr.error td {
-		background-color: $red;
-	}
+// Forms ======================================================================
 
-	tr.info td {
-		background-color: $blue;
-	}
+input,
+textarea {
+  color: $input-color;
 }
 
-// FORMS
-// -----------------------------------------------------
-
 legend {
-	font-family: $headingsFontFamily;
-}
-
-legend, label, .help-block, .input-file {
-	border: 0px solid transparent;
-	color: inherit;
-}
-
-input, textarea, .uneditable-input {
-	border: 0px solid transparent;
-	padding: 10px;
-}
-
-.uneditable-input {
-	padding-bottom: 30px;
-}
-
-select {
-	border: 0px solid transparent;
-}
-
-button {
-	margin-left: 12px;
-}
-
-input, textarea, .search-query, .uneditable-input,
-.input-append input, .input-append .uneditable-input,
-.input-prepend input, .input-prepend .uneditable-input {
-	border-color: transparent;
-	@include box-shadow(none);
-}
-
-.form-actions {
-	border-top: 0px solid transparent;
-}
-
-.control-group.warning {
-  @include formFieldState($yellow, lighten($yellow, 30%), $warningBackground);
-}
-
-.control-group.error {
-  @include formFieldState($orange, lighten($orange, 30%), $errorBackground);
-}
-
-.control-group.success {
-  @include formFieldState($green, lighten($green, 20%), $successBackground);
-}
-
-.control-group.info {
-  @include formFieldState($purple, lighten($purple, 20%), $infoBackground);
-}
-
-.control-group.warning {
-
-	.control-label,
-	.help-block,
-	.help-inline {
-		color: lighten($yellow, 30%);
-	}
-}
-
-.control-group.error {
-
-	.control-label,
-	.help-block,
-	.help-inline {
-		color: lighten($orange, 30%);
-	}
-}
-
-.control-group.success {
-
-	.control-label,
-	.help-block,
-	.help-inline {
-		color: lighten($green, 20%);
-	}
+  font-family: 'Lobster', cursive;
+  color: #fff;
 }
-.control-group.info {
 
-	.control-label,
-	.help-block,
-	.help-inline {
-		color: lighten($purple, 20%);
-	}
-}
-
-.input-prepend .add-on,
-.input-append .add-on {
-	height: 20px;
-	padding-top: 4px;
-	background-color: $grayLighter;
-	border-color: transparent;
-	@include border-radius(0);
-	color: $gray;
-	text-shadow: none;
-}
-
-.input-append .btn,
-.input-prepend .btn {
-	padding: 4px 10px;
-}
-
-// ALERTS, LABELS, BADGES
-// -----------------------------------------------------
-
-.alert {
-
-	border-color: transparent;
-	@include border-radius(0);
-	@include box-shadow(none);
-	text-shadow: none;
-
-	h1, h2, h3, h4, h5, h6 {
-		color: $textColor;
-	}
-
-	.alert-heading {
-		color: $textColor;
-	}
-}
-
-.label,
-.badge {
-
-	background-color: $blue;
-
-	.badge-success {
-		background-color: $green;
-	}
-
-	.badge-important {
-		background-color: $red;
-	}
-
-	.badge-warning {
-		background-color: $orange;
-	}
-
-	.badge-info {
-		background-color: $purple;
-	}
-
-	.badge-inverse {
-		background-color: $btnInverseBackground;
-	}
+.has-warning {
+  .help-block,
+  .control-label,
+  .form-control-feedback {
+    color: lighten($brand-warning, 20%);
+  }
 
+  .form-control,
+  .form-control:focus {
+    border-color: lighten($brand-warning, 20%);
+  }
 }
 
-// MISCELLANEOUS
-// -----------------------------------------------------
+.has-error {
+  .help-block,
+  .control-label,
+  .form-control-feedback {
+    color: lighten($brand-primary, 40%);
+  }
 
-.progress, .well, pre, code {
-	border-color: transparent;
-	@include border-radius(0);
-	@include box-shadow(none);
-	text-shadow: none;
+  .form-control,
+  .form-control:focus {
+    border-color: lighten($brand-primary, 40%);
+  }
 }
 
-.well {
-	background-image: none;
-}
+.has-success {
+  .help-block,
+  .control-label,
+  .form-control-feedback {
+    color: lighten($brand-success, 20%);
+  }
 
-.hero-unit {
-	@include border-radius(0);
+  .form-control,
+  .form-control:focus {
+    border-color: lighten($brand-success, 20%);
+  }
 }
 
-.thumbnail {
-	border: 0 solid transparent;
-	@include border-radius(0);
-	@include box-shadow(none);
+.input-group-addon {
+  color: $btn-default-color;
 }
 
-.progress {
-
-	background-image: none;
-	background-color: #27666D;
-
-	.bar {
-
-		@include box-shadow(none);
-		background-image: none;
-		background-color: $yellow;
+// Navs =======================================================================
 
-		.bar-success {
-			background-color: $green;
-		}
-
-		.bar-warning {
-			background-color: $orange;
-		}
-
-		.bar-error {
-			background-color: $red;
-		}
-	}
-}
+.pagination {
 
-.progress-danger .bar {
-	background-image: none;
-	background-color: #AD1D28;
+  a:hover {
+    color: #fff;
+  }
 }
 
-.progress-danger.progress-striped .bar {
-	@include gradient-striped(#AD1D28);
-}
+.pager {
 
-.progress-success .bar {
-	background-image: none;
-	background-color: $green;
+  a:hover {
+    color: #fff;
+  }
 }
 
-.progress-success.progress-striped .bar {
-	@include gradient-striped($green);
-}
+// Indicators =================================================================
 
-.progress-info .bar {
-	background-image: none;
-	background-color: $blue;
-}
+.close {
+  opacity: 0.4;
 
-.progress-info.progress-striped .bar {
-	@include gradient-striped($blue);
+  &:hover,
+  &:focus {
+    opacity: 1;
+  }
 }
 
-.modal {
-
-	@include border-radius(0);
+// Progress bars ==============================================================
 
-	.modal-header {
-		background-color: $navbarBackground;
-		color: $white;
-	}
+// Containers =================================================================
 
-	.modal-body {
-		
-		color: $grayDark;
-
-		h1, h2, h3, h4, h5, h6,
-		legend {
-			color: $red;
-		}
-
-		label,
-		.input-file {
-			color: $grayDark;
-		}
-
-		.help-block,
-		.help-inline {
-			color: $grayLight;
-		}
-
-		textarea,
-		input,
-		.uneditable-input {
-			border: 1px solid $grayLight;
-		}
-	}
+a.thumbnail:hover,
+a.thumbnail:focus,
+a.thumbnail.active {
+  border-color: $thumbnail-border;
 }
 
 .popover {
-	
-	padding: 0;
-	@include border-radius(0);
-	color: $grayDark;
-
-	.popover-title {
-		@include border-radius(0);
-		color: $white;
-	}
+  color: $gray-dark;
 }
-
-// MEDIA QUERIES
-// -----------------------------------------------------