projects / bootswatch / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
amelia, slate, spruce: closes #75, hrBorder color
[bootswatch] / amelia / bootswatch.less
diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less
index f0db988..a33d40e 100755 (executable)
--- a/amelia/bootswatch.less
+++ b/amelia/bootswatch.less
@@ -1,13 +1,12 @@
-// Bootswatch.less
-// Swatch: Amelia
-// Version: 2.1.0
+// Amelia 2.3.0
+// Bootswatch
 // -----------------------------------------------------
 
+
 // 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;
@@ -48,7 +47,7 @@ body {
 }
 
 hr {
-       border-bottom: 1px solid rgba(255, 255, 255, 0.3);
+       border-bottom: none;
 }
 
 .page-header {
@@ -104,9 +103,23 @@ hr {
                padding: 4px;
        }
 
-       .nav-collapse.collapse {
+       &-inverse {
+
+               .dropdown-menu li > a:hover,
+               .dropdown-menu li > a:focus,
+               .dropdown-submenu:hover > a {
+                       background-image: none;
+                       background-color: @yellow;
+               }
+       }
+}
+
+@media (max-width: @navbarCollapseWidth) {
+
+       .navbar .nav-collapse {
 
                .nav li > a {
+
                        color: @textColor;
                        .border-radius(0);
 
@@ -136,37 +149,28 @@ hr {
                }
        }
 
-       &-inverse {
+       .navbar-inverse .nav-collapse {
 
-               .dropdown-menu li > a:hover,
-               .dropdown-menu li > a:focus,
-               .dropdown-submenu:hover > a {
-                       background-image: none;
-                       background-color: @yellow;
+               .nav > li > a,
+               .dropdown-menu a {
+                       color: @navbarInverseLinkColor !important;
                }
 
-               .nav-collapse.collapse {
-
-                       .nav li > a:hover {
-                               background-color: lighten(@navbarInverseBackground, 10%);
-                       }
+               .nav li > a:hover,
+               .dropdown-menu a:hover {
+                       background-color: lighten(@navbarInverseBackground, 10%) !important;
                }
        }
 }
 
 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;
@@ -178,27 +182,27 @@ 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 > li.active > a:hover, {
+       .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;
        }
 }
 
@@ -222,17 +226,13 @@ div.subnav {
        }
 
        li.active > a,
-       li:active > a,
-       li.active > a:hover,
-       li:active > a:hover {
+       li.active > a:hover {
                color: @textColor;
        }
 
        li.active > a,
-       li:active > a,
        li > a:hover,
-       li.active > a:hover,
-       li:active > a:hover {
+       li.active > a:hover {
                background-color: #8AD5DC;
                border-color: transparent;
                text-shadow: none;
@@ -257,14 +257,13 @@ div.subnav {
        li > a,
        li > a:hover,
        li.active > a,
-       li:active > a,
-       li.active > a:hover,
-       li:active > a:hover {
+       li.active > a:hover {
                border-color: transparent;
        }
 }
 
 .nav-list {
+
        .nav-header {
                text-shadow: none;
                color: @textColor;
@@ -275,10 +274,8 @@ div.subnav {
        }
 
        li.active > a,
-       li:active > a,
        li > a:hover,
-       li.active > a:hover,
-       li:active > a:hover {
+       li.active > a:hover {
                background-color: #8AD5DC;
                text-shadow: none;
        }
@@ -318,26 +315,32 @@ div.subnav {
        ul  {
                background-color: @paginationBackground;
                background-image: none;
+               .border-radius(0);
        }
 
-       .disabled a, .disabled a:hover {
-               color: @textColor;
-       }
-
-       li a:hover {
+       ul > li > a:hover {
                background-color: rgba(255, 255, 255, 0.4);
                color: @linkColor;
        }
 
-       .active a, .active a:hover {
-               background-color: rgba(255, 255, 255, 0.4);
+       ul > li:first-child > a,
+       ul > li:last-child > a {
+               .border-radius(0);
+       }
+
+       ul > .disabled > a,
+       ul > .disabled > a:hover,
+       ul > .disabled > span,
+       ul > .disabled > span:hover {
                color: @textColor;
        }
 
-       ul,
-       li:first-child a,
-       li:last-child a {
-               .border-radius(0);
+       ul > .active > a,
+       ul > .active > a:hover,
+       ul > .active > span,
+       ul > .active > span:hover {
+               background-color: rgba(255, 255, 255, 0.4);
+               color: @textColor;
        }
 }
 
@@ -392,6 +395,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);
@@ -436,15 +451,6 @@ div.subnav {
        .buttonBackgroundCustom(@btnPrimaryBackground);
 }
 
-.btn-small {
-       padding: 13px 16px 12px;
-}
-
-[class^="icon-"], [class*=" icon-"] {
-       margin-top: 2px;
-       margin-right: 8px;
-}
-
 .btn-small [class^="icon-"] {
        margin-top: 1px;
 }
@@ -520,19 +526,31 @@ 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 {
+
+       .control-label,
+       .help-block,
+       .help-inline {
+               color: lighten(@orange, 30%);
+       }
 }
 
-.control-group.error > label,
-.control-group.error .help-inline {
-       color: lighten(@linkColor, 10%);
+.control-group.error {
+
+       .control-label,
+       .help-block,
+       .help-inline {
+               color: lighten(@linkColor, 10%);
+       }
 }
 
-.control-group.success > label,
-.control-group.success .help-inline {
-       color: lighten(@green, 20%);
+.control-group.success {
+
+       .control-label,
+       .help-block,
+       .help-inline {
+               color: lighten(@green, 20%);
+       }
 }
 
 .input-prepend .add-on,
@@ -554,41 +572,47 @@ input, textarea, .search-query, .uneditable-input,
 // ALERTS, LABELS, BADGES
 // -----------------------------------------------------
 
-.alert, .label {
+.alert {
+
        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
@@ -616,10 +640,12 @@ input, textarea, .search-query, .uneditable-input,
 }
 
 .progress {
+
        background-image: none;
        background-color: #27666D;
 
        .bar {
+
                .box-shadow(none);
                background-image: none;
                background-color: @yellow;
@@ -644,7 +670,7 @@ input, textarea, .search-query, .uneditable-input,
 }
 
 .progress-danger.progress-striped .bar {
-  #gradient > .striped(#AD1D28);
+       #gradient > .striped(#AD1D28);
 }
 
 .progress-success .bar {
@@ -653,7 +679,7 @@ input, textarea, .search-query, .uneditable-input,
 }
 
 .progress-success.progress-striped .bar {
-  #gradient > .striped(@green);
+       #gradient > .striped(@green);
 }
 
 .progress-info .bar {
@@ -662,45 +688,47 @@ input, textarea, .search-query, .uneditable-input,
 }
 
 .progress-info.progress-striped .bar {
-  #gradient > .striped(@blue);
+       #gradient > .striped(@blue);
 }
 
 .modal {
-       .border-radius(0);
-}
-
-.modal-header {
-       background-color: @navbarBackground;
-       color: @white;
-}
 
-.modal-body {
-       
-       color: @grayDark;
+       .border-radius(0);
 
-       h1, h2, h3, h4, h5, h6,
-       legend {
-               color: @red;
+       &-header {
+               background-color: @navbarBackground;
+               color: @white;
        }
 
-       label,
-       .input-file {
+       &-body {
+               
                color: @grayDark;
-       }
 
-       .help-block,
-       .help-inline {
-               color: @grayLight;
-       }
+               h1, h2, h3, h4, h5, h6,
+               legend {
+                       color: @red;
+               }
+
+               label,
+               .input-file {
+                       color: @grayDark;
+               }
 
-       textarea,
-       input,
-       .uneditable-input {
-               border: 1px solid @grayLight;
+               .help-block,
+               .help-inline {
+                       color: @grayLight;
+               }
+
+               textarea,
+               input,
+               .uneditable-input {
+                       border: 1px solid @grayLight;
+               }
        }
 }
 
 .popover {
+       
        padding: 0;
        .border-radius(0);
        color: @grayDark;
@@ -709,4 +737,7 @@ input, textarea, .search-query, .uneditable-input,
                .border-radius(0);
                color: @white;
        }
-}
\ No newline at end of file
+}
+
+// MEDIA QUERIES
+// -----------------------------------------------------
Bootstrap watch themes