v2.3.1 -> v2.3.2
[bootswatch] / journal / bootswatch.less
index 2e35a2e..29ee2dc 100755 (executable)
@@ -1,48 +1,32 @@
-// Bootswatch.less
-// Swatch: Journal
-// Version: 2.1.0
+// Journal 2.3.2
+// Bootswatch
 // -----------------------------------------------------
 
+
 // TYPOGRAPHY
 // -----------------------------------------------------
 
-@import url('https://fonts.googleapis.com/css?family=News+Cycle:400,700');
+@import url('//fonts.googleapis.com/css?family=News+Cycle:400,700');
 
 h1, h2, h3, h4, h5, h6 {
-       line-height: 1.5em;
+
+       margin: 0 0 10px;
+       line-height: 1.2;
 
        a {
                color: @headingsColor;
        }
 }
 
-h1 {
-       font-size: 48px;
-}
+h1 { font-size: 48px; }
 
-h2 {
-       font-size: 36px;
-}
+h2 { font-size: 36px; }
 
-h3 {
-       font-size: 28px;
-}
-
-h4 {
-       font-size: 20px;
-}
-
-h5 {
-       font-size: 13px;
-}
+h3 { font-size: 28px; }
 
-h6 {
-       color: @black;
-       font-weight: bold;
-}
+h4 { font-size: 20px; }
 
-// SCAFFOLDING
-// -----------------------------------------------------
+h5 { font-size: 13px; }
 
 p > a,
 address > a,
@@ -57,10 +41,23 @@ abbr[title] {
        }
 }
 
+code, pre {
+       .border-radius(0);
+       background-color: @grayLighter;
+       .box-shadow(none);
+}
+
+// SCAFFOLDING
+// -----------------------------------------------------
+
 .page-header {
        border-bottom: 2px solid @grayLighter;
 }
 
+hr {
+       border-bottom: 1px solid @grayLighter;
+}
+
 // NAVBAR
 // -----------------------------------------------------
 
@@ -70,14 +67,13 @@ abbr[title] {
        font-weight: bold;
 
        .navbar-inner {
-               border-top: 2px solid @grayLighter;
                border-bottom: 2px solid @grayLighter;
                .border-radius(0);
                .box-shadow(none);
        }
 
        .brand {
-               padding: 16px 20px 20px;
+               padding: 19px 20px 21px;
                font-size: 24px;
                font-weight: bold;
                text-shadow: none;
@@ -85,23 +81,22 @@ abbr[title] {
        }
 
        .nav > li > a {
-               padding: 20px 10px 21px;
+               padding: 20px 10px 20px;
                font-size: 18px;
                text-shadow: none;
                text-transform: uppercase;
        }
 
-       .nav > li.active > a {
+       .nav > .active > a {
                background-color: transparent;
-               color: @headingsColor;
        }
 
        .navbar-text {
-               margin-top: 21px;
+               margin-top: 20px;
                padding-left: 10px;
                padding-right: 10px;
                font-size: 18px;
-               line-height: 18px;
+               line-height: 20px;
        }
 
        .nav > .active > a,
@@ -110,15 +105,9 @@ abbr[title] {
                .box-shadow(none);
        }
 
-       .nav li.dropdown > .dropdown-toggle:hover,
-       .nav li.dropdown.active > .dropdown-toggle:hover {
-               color: @black;
-       }
-
-       .nav li.dropdown > .dropdown-toggle .caret,
-       .nav li.dropdown.open > .dropdown-toggle:hover .caret {
-               border-top-color: @headingsColor;
-               border-bottom-color: @headingsColor;
+       .divider-vertical {
+               border-left-color: @grayLighter;
+               border-right-color: @grayLighter;
        }
 
        .dropdown-menu {
@@ -132,10 +121,29 @@ abbr[title] {
                }
        }
 
-       .nav-collapse.collapse {
+       .navbar-search .search-query,
+       .navbar-search .search-query:hover {
+               border: 2px solid @grayLighter;
+               color: @textColor;
+               .placeholder(@gray);
+       }
+}
+
+@media (max-width: @navbarCollapseWidth) {
+
+       .nav-collapse .navbar-form,
+       .nav-collapse .navbar-search {
+               margin-bottom: 0;
+               border-top: 2px solid @grayLighter;
+               border-bottom: 2px solid @grayLighter;
+       } 
+
+
+
+       .navbar .nav-collapse {
 
                .nav li > a {
-                       color: @headingsColor;
+                       color: @navbarLinkColor;
 
                        &:hover {
                                background-color: @dropdownLinkBackgroundHover;
@@ -147,19 +155,25 @@ abbr[title] {
                }
        }
 
-       .navbar-search .search-query,
-       .navbar-search .search-query:hover {
-               border: 2px solid @grayLighter;
-               color: @textColor;
-               .placeholder(@gray);
+       .navbar-inverse .nav-collapse {
+
+               .nav li > a {
+                       color: @navbarInverseLinkColor;
+
+                       &:hover {
+                               background-color: #111;
+                               background-image: none;
+                       }
+               }
+
        }
 }
 
 div.subnav {
 
+       margin: 0 1px;
        height: 54px;
-       background-color: @bodyBackground;
-       background-image: none;
+       background: @bodyBackground none;
        .box-shadow(none);
        border: 2px solid @grayLighter;
        border-left: none;
@@ -167,7 +181,9 @@ div.subnav {
        .border-radius(0);
 
        &.subnav-fixed {
-               top: @navbarHeight;
+               top: @navbarHeight + 1;
+               margin: 0;
+               border-top: none;
        }
 
        .nav > li > a,
@@ -206,6 +222,9 @@ div.subnav {
        }
 }
 
+// NAV
+// -----------------------------------------------------
+
 // BUTTONS
 // -----------------------------------------------------
 
@@ -217,79 +236,79 @@ div.subnav {
        .buttonBackground(@grayDarker, @black);
 }
 
-// MODALS
+// TABLES
 // -----------------------------------------------------
 
-.modal {
-       .border-radius(0px);
-       background: @bodyBackground;
+.table-bordered {
+       .border-radius(0);
+       .box-shadow(none);
 }
 
-.modal-header {
-       border-bottom: none;
-}
+// FORMS
+// -----------------------------------------------------
 
-.modal-footer {
-       background: transparent;
-       .box-shadow(none);
-       border-top: none;
+legend {
+       border-bottom: 2px solid @grayLighter;
+       font-family: @headingsFontFamily;
+       font-weight: @headingsFontWeight;
+       color: @headingsColor;
 }
 
-.close,
-.close:hover {
-       border-bottom: none;
-}
+// DROPDOWNS
+// -----------------------------------------------------
 
 // MISC
 // -----------------------------------------------------
 
-.hero-unit {
-       .box-shadow(none);
-       border: 1px solid rgba(0,0,0,.05);
-       .border-radius(0);
-
-       h1 {
-               line-height: 1.5em;
-       }
-}
-
 .well {
        .border-radius(0);
        .box-shadow(none);
-
 }
 
-.table-bordered {
+.hero-unit {
+       padding: 30px 60px;
+       border: 1px solid rgba(0,0,0,.05);
        .border-radius(0);
        .box-shadow(none);
+
+       h1 {
+               margin: 0 0 10px;
+               line-height: 1.2;
+       }
 }
 
+// a.thumbnail:hover {
+//     .box-shadow(0 1px 3px 1px rgba(0, 0, 0, 0.3));
+//     border-color: #ddd;
+// }
 
-legend {
-       border-bottom: 2px solid @grayLighter;
-       font-family: @headingsFontFamily;
-       font-weight: @headingsFontWeight;
-       color: @headingsColor;
+.modal {
+       .border-radius(0px);
+       background: @bodyBackground;
 }
 
-a.thumbnail:hover {
-       .box-shadow(0 1px 3px 1px rgba(0, 0, 0, 0.3));
-       border-color: #ddd;
+.modal-header {
+       border-bottom: none;
 }
 
-code, pre, pre.prettyprint {
-       .border-radius(0);
-       background-color: @grayLighter;
+.modal-footer {
+       border-top: none;
+       background: transparent;
        .box-shadow(none);
 }
 
-hr {
-       border-bottom: 1px solid @grayLighter;
+.close,
+.close:hover {
+       border-bottom: none;
 }
 
+// MEDIA QUERIES
+// -----------------------------------------------------
+
 @media (max-width: 768px) {
 
        div.subnav {
+
                height: auto;
 
                .nav > li.active > a {
@@ -311,14 +330,3 @@ hr {
                border-color: #e5e5e5;
        }
 }
-
-@media (max-width: 979px) {
-
-       .nav-collapse .navbar-form,
-       .nav-collapse .navbar-search {
-               margin-bottom: 0;
-               border-top: 2px solid @grayLighter;
-               border-bottom: 2px solid @grayLighter;
-       } 
-
-}