2.2.2 -> 2.3.0

[bootswatch] / journal / bootswatch.less

diff --git a/journal/bootswatch.less b/journal/bootswatch.less
index 3793d70..c5bfc6a 100755 (executable)
--- a/journal/bootswatch.less
+++ b/journal/bootswatch.less
@@ -1,16 +1,17 @@
-// Bootswatch.less
-// Swatch: Journal
-// Version: 2.1.0
+// Journal 2.3.0
+// 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;
@@ -72,7 +73,7 @@ hr {
        }
 
        .brand {
-               padding: 16px 20px 20px;
+               padding: 19px 20px 21px;
                font-size: 24px;
                font-weight: bold;
                text-shadow: none;
@@ -80,23 +81,22 @@ hr {
        }
 
        .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,
@@ -105,15 +105,9 @@ hr {
                .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 {
@@ -127,10 +121,29 @@ hr {
                }
        }
 
-       .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;
@@ -142,19 +155,25 @@ hr {
                }
        }
 
-       .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;
@@ -162,7 +181,9 @@ div.subnav {
        .border-radius(0);
 
        &.subnav-fixed {
-               top: @navbarHeight;
+               top: @navbarHeight + 1;
+               margin: 0;
+               border-top: none;
        }
 
        .nav > li > a,
@@ -245,12 +266,14 @@ legend {
 }
 
 .hero-unit {
+       padding: 30px 60px;
        border: 1px solid rgba(0,0,0,.05);
        .border-radius(0);
        .box-shadow(none);
 
        h1 {
-               line-height: 1.5em;
+               margin: 0 0 10px;
+               line-height: 1.2;
        }
 }
 
@@ -307,14 +330,3 @@ legend {
                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;
-       } 
-
-}