projects / bootswatch / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
v2.3.1 -> v2.3.2
[bootswatch] / amelia / bootswatch.less
diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less
index a844d2d..130db79 100755 (executable)
--- a/amelia/bootswatch.less
+++ b/amelia/bootswatch.less
@@ -1,4 +1,4 @@
-// Amelia 2.2.2
+// Amelia 2.3.2
 // Bootswatch
 // -----------------------------------------------------
 
@@ -6,8 +6,7 @@
 // TYPOGRAPHY
 // -----------------------------------------------------
 
-@import url('https://fonts.googleapis.com/css?family=Lobster');
-@import url('https://fonts.googleapis.com/css?family=Cabin:400,700');
+@import url('//fonts.googleapis.com/css?family=Lobster|Cabin:400,700');
 
 h6 {
        color: @textColor;
@@ -37,7 +36,7 @@ blockquote {
 }
 
 .muted {
-       color: rgba(255, 255, 255, 0.5);
+       color: rgba(255, 255, 255, 0.6);
 }
 
 // SCAFFOLDING
@@ -48,7 +47,7 @@ body {
 }
 
 hr {
-       border-bottom: 1px solid rgba(255, 255, 255, 0.3);
+       border-bottom: none;
 }
 
 .page-header {
@@ -152,6 +151,11 @@ hr {
 
        .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;
@@ -161,17 +165,12 @@ hr {
 
 div.subnav {
 
-       background-color: rgba(42, 99, 105, 0.9);
-       background-image: none;
-       border: 0px solid transparent;
+       margin: 0 1px;
+       background: rgba(42, 99, 105, 0.9) none;
+       border: none;
        .border-radius(0);
        .box-shadow(none);
 
-       .nav > li.open > a {
-               border-color: transparent;
-               background-color: rgba(255, 255, 255, 0.4);
-       }
-
        .nav > li > a {
                color: @textColor;
                border-color: transparent;
@@ -183,84 +182,103 @@ div.subnav {
        }
 
        .nav > .active > a {
-               background-color: transparent;
+               background-color: rgba(255, 255, 255, 0.4);
                border-color: transparent;
                color: @textColor;
                .box-shadow(none);
        }
 
-       .nav > .active > a:hover,
        .nav > li > a:hover,
-       .nav > .active > a,
        .nav > .active > a:hover, {
                border-right-color: transparent;
                background-color: rgba(255, 255, 255, 0.4);
                color: @textColor;
        }
 
-       .nav > li:first-child > a:hover {
-               border-left-color: rgba(255, 255, 255, 0.4);
-               border-left-width: 1px;
+       .nav > li.open > a {
+               border-color: transparent;
+               background-color: rgba(255, 255, 255, 0.4);
        }
 
        &-fixed {
-               top: 50px;
+               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 li.open > .dropdown-toggle,
-.nav-pills li.open > .dropdown-toggle {
-       background-color: #8AD5DC;
-       color: @linkColor;
-       border-color: transparent;
-}
+.nav-tabs,
+.nav-pills {
 
-.nav-tabs, .nav-pills {
        border-color: transparent;
 
-       li > a {
+
+       & > li > a {
                border-color: transparent;
                .border-radius(0);
                .box-shadow(0);
        }
 
-       li.active > a,
-       li.active > a:hover {
-               color: @textColor;
+       & > li > a:hover {
+               background-color: #8AD5DC;
+               border-color: transparent;
+               text-shadow: none;
        }
 
-       li.active > a,
-       li > a:hover,
-       li.active > a:hover {
+       & > .active > a,
+       & > .active > a:hover {
                background-color: #8AD5DC;
                border-color: transparent;
+               color: @textColor;
                text-shadow: none;
        }
-}
 
-.nav-tabs, .nav-tabs > li > a {
-       border-bottom: 1px solid rgba(255, 255, 255, 0.5);
-}
+       & > .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 > li > a {
-       background-color: #3CB9C6;
 }
 
-.nav-tabs.nav-stacked {
+.nav-tabs {
 
-       li > a:first-child,
-       li > a:last-child {
-               .border-radius(0);
+       border-bottom: 1px solid rgba(255, 255, 255, 0.5);
+
+       & > li > a  {
+               background-color: #3CB9C6;
        }
 
-       li > a,
-       li > a:hover,
-       li.active > a,
-       li.active > a:hover {
-               border-color: transparent;
+       &.nav-stacked {
+
+               li > a:first-child,
+               li > a:last-child {
+                       .border-radius(0);
+               }
+
+               li > a,
+               li > a:hover,
+               li.active > a,
+               li.active > a:hover {
+                       border-color: transparent;
+               }
        }
 }
 
@@ -296,6 +314,7 @@ div.subnav {
 }
 
 .breadcrumb {
+
        background-color: #3CB9C6;
        background-image: none;
 
@@ -307,8 +326,9 @@ div.subnav {
                color: @white;
        }
 
-       .divider {
-               color: @linkColor;
+       & > li > a.divider,
+       & > li > span.divider {
+               color: @grayLighter;
        }
 }
 
@@ -397,6 +417,18 @@ div.subnav {
        .buttonBackgroundCustom(@btnBackground)
 }
 
+.btn-large {
+       padding: @paddingLarge;
+}
+
+.btn-small {
+       padding: @paddingSmall;
+}
+
+.btn-mini {
+       padding: @paddingMini;
+}
+
 .btn-group .btn:first-child {
        margin-left: 0;
        .border-radius(0);
@@ -441,11 +473,6 @@ div.subnav {
        .buttonBackgroundCustom(@btnPrimaryBackground);
 }
 
-[class^="icon-"], [class*=" icon-"] {
-       margin-top: 2px;
-       margin-right: 8px;
-}
-
 .btn-small [class^="icon-"] {
        margin-top: 1px;
 }
@@ -489,8 +516,8 @@ legend {
 }
 
 legend, label, .help-block, .input-file {
-       color: @textColor;
        border: 0px solid transparent;
+       color: inherit;
 }
 
 input, textarea, .uneditable-input {
@@ -521,19 +548,55 @@ input, textarea, .search-query, .uneditable-input,
        border-top: 0px solid transparent;
 }
 
-.control-group.warning > label,
-.control-group.warning .help-inline {
-       color: lighten(@orange, 30%);
+.control-group.warning {
+  .formFieldState(@yellow, lighten(@yellow, 30%), @warningBackground);
 }
 
-.control-group.error > label,
-.control-group.error .help-inline {
-       color: lighten(@linkColor, 10%);
+.control-group.error {
+  .formFieldState(@orange, lighten(@orange, 30%), @errorBackground);
 }
 
-.control-group.success > label,
-.control-group.success .help-inline {
-       color: lighten(@green, 20%);
+.control-group.success {
+  .formFieldState(@green, lighten(@green, 20%), @successBackground);
+}
+
+.control-group.info {
+  .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%);
+       }
+}
+.control-group.info {
+
+       .control-label,
+       .help-block,
+       .help-inline {
+               color: lighten(@purple, 20%);
+       }
 }
 
 .input-prepend .add-on,
@@ -557,46 +620,45 @@ input, textarea, .search-query, .uneditable-input,
 
 .alert {
 
-       h1, h2, h3, h4, h5, h6 {
-               color: @textColor;
-       }
-}
-
-.alert, .label {
        border-color: transparent;
        .border-radius(0);
        .box-shadow(none);
        text-shadow: none;
-}
 
-.alert-heading {
-       color: @textColor;
-}
+       h1, h2, h3, h4, h5, h6 {
+               color: @textColor;
+       }
 
-.label, .label:hover {
-       background-color: @grayLighter;
-       text-shadow: none;
-       color: @grayDark;
+       &-heading {
+               color: @textColor;
+       }
 }
 
-.label-warning, .label-warning:hover, .alert {
-       background-color: @orange;
-       color: @textColor;
-}
+.label,
+.badge {
 
-.label-important, .label-important:hover, .alert-error {
-       background-color: darken(@yellow, 3%);
-       color: @textColor;
-}
+       background-color: @blue;
 
-.label-success, .label-success:hover, .alert-success {
-       background-color: @green;
-       color: @textColor;
-}
+       &-success {
+               background-color: @green;
+       }
+
+       &-important {
+               background-color: @red;
+       }
+
+       &-warning {
+               background-color: @orange;
+       }
+
+       &-info {
+               background-color: @purple;
+       }
+
+       &-inverse {
+               background-color: @btnInverseBackground;
+       }
 
-.label-info, .label-info:hover, .alert-info {
-       background-color: @purple;
-       color: @textColor;
 }
 
 // MISCELLANEOUS
Bootstrap watch themes