From 21c836cbf5c6a4413055bbf8d440fb0d0e73e21d Mon Sep 17 00:00:00 2001
From: Esteban Arango Medina <marranoparael31@gmail.com>
Date: Sat, 12 Jul 2014 17:21:35 -0500
Subject: [PATCH] [WIP #64] Support bootstrap 3.2.9 / Amelia

---
 .../bootswatch/amelia/_bootswatch.scss        | 19 +++---
 .../bootswatch/amelia/_variables.scss         | 60 +++++++++----------
 2 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/vendor/assets/stylesheets/bootswatch/amelia/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/amelia/_bootswatch.scss
index c3d7e74..80cdd8b 100644
--- a/vendor/assets/stylesheets/bootswatch/amelia/_bootswatch.scss
+++ b/vendor/assets/stylesheets/bootswatch/amelia/_bootswatch.scss
@@ -6,24 +6,21 @@
 
 // Navbar =====================================================================
 
-.navbar {
-
-  .navbar-brand {
-    font-family: 'Lobster', cursive;
-  }
+.navbar-brand {
+  font-family: 'Lobster', cursive;
+}
 
-  .navbar-default {
-    .badge {
-      background-color: #fff;
-      color: $navbar-default-bg;
-    }
+.navbar-default {
+  .badge {
+    background-color: #fff;
+    color: $navbar-default-bg;
   }
 }
 
 // Buttons ====================================================================
 
 .btn {
-  
+
   .caret {
     border-top-color: #fff;
   }
diff --git a/vendor/assets/stylesheets/bootswatch/amelia/_variables.scss b/vendor/assets/stylesheets/bootswatch/amelia/_variables.scss
index e7d0e31..b00c4e8 100644
--- a/vendor/assets/stylesheets/bootswatch/amelia/_variables.scss
+++ b/vendor/assets/stylesheets/bootswatch/amelia/_variables.scss
@@ -78,6 +78,32 @@ $icon-font-name:          "glyphicons-halflings-regular" !default;
 //** Element ID within SVG icon file.
 $icon-font-svg-id:        "glyphicons_halflingsregular" !default;
 
+//== Type
+//
+//##
+
+//** Horizontal offset for forms and lists.
+$component-offset-horizontal: 180px !default;
+//** Text muted color
+$text-muted:                  rgba(255, 255, 255, 0.6) !default;
+//** Abbreviations and acronyms border color
+$abbr-border-color:           $gray-light !default;
+//** Headings small color
+$headings-small-color:        $gray-light !default;
+//** Blockquote small color
+$blockquote-small-color:      rgba(255, 255, 255, 0.6) !default;
+//** Blockquote font size
+$blockquote-font-size:        ($font-size-base * 1.25) !default;
+//** Blockquote border color
+$blockquote-border-color:     rgba(255, 255, 255, 0.6) !default;
+//** Page header border color
+$page-header-border-color:    darken($body-bg, 5%) !default;
+//** Width of horizontal description list titles
+$dl-horizontal-offset:        $component-offset-horizontal !default;
+//** Horizontal line color.
+$hr-border:                   darken($body-bg, 5%) !default;
+
+
 
 //== Components
 //
@@ -221,13 +247,13 @@ $dropdown-divider-bg:            #e5e5e5 !default;
 $dropdown-link-color:            $gray-dark !default;
 //** Hover color for dropdown links.
 $dropdown-link-hover-color:      #fff !default;
+//** Active dropdown menu item background color.
+$dropdown-link-active-bg:        $component-active-bg !default;
 //** Hover background for dropdown links.
 $dropdown-link-hover-bg:         $dropdown-link-active-bg !default;
 
 //** Active dropdown menu item text color.
 $dropdown-link-active-color:     #fff !default;
-//** Active dropdown menu item background color.
-$dropdown-link-active-bg:        $component-active-bg !default;
 
 //** Disabled dropdown menu item background color.
 $dropdown-link-disabled-color:   $gray-lighter !default;
@@ -683,6 +709,7 @@ $panel-body-padding:          15px !default;
 $panel-heading-padding:       10px 15px !default;
 $panel-footer-padding:        $panel-heading-padding !default;
 $panel-border-radius:         $border-radius-base !default;
+$panel-default-heading-bg:    lighten($body-bg, 15%) !default;
 
 //** Border color for elements within panels
 $panel-inner-border:          darken($body-bg, 5%) !default;
@@ -690,7 +717,6 @@ $panel-footer-bg:             $panel-default-heading-bg !default;
 
 $panel-default-text:          #fff !default;
 $panel-default-border:        darken($body-bg, 5%) !default;
-$panel-default-heading-bg:    lighten($body-bg, 15%) !default;
 
 $panel-primary-text:          #fff !default;
 $panel-primary-border:        $brand-primary !default;
@@ -815,31 +841,3 @@ $pre-bg:                      #f5f5f5 !default;
 $pre-color:                   $gray-dark !default;
 $pre-border-color:            #ccc !default;
 $pre-scrollable-max-height:   340px !default;
-
-
-//== Type
-//
-//##
-
-//** Horizontal offset for forms and lists.
-$component-offset-horizontal: 180px !default;
-//** Text muted color
-$text-muted:                  rgba(255, 255, 255, 0.6) !default;
-//** Abbreviations and acronyms border color
-$abbr-border-color:           $gray-light !default;
-//** Headings small color
-$headings-small-color:        $gray-light !default;
-//** Blockquote small color
-$blockquote-small-color:      rgba(255, 255, 255, 0.6) !default;
-//** Blockquote font size
-$blockquote-font-size:        ($font-size-base * 1.25) !default;
-//** Blockquote border color
-$blockquote-border-color:     rgba(255, 255, 255, 0.6) !default;
-//** Page header border color
-$page-header-border-color:    darken($body-bg, 5%) !default;
-//** Width of horizontal description list titles
-$dl-horizontal-offset:        $component-offset-horizontal !default;
-//** Horizontal line color.
-$hr-border:                   darken($body-bg, 5%) !default;
-
-