journal: styled navbar-form, hr, and links in headers

diff --git a/journal/bootstrap.css b/journal/bootstrap.css
index 2ef2938..8103677 100644 (file)
--- a/journal/bootstrap.css
+++ b/journal/bootstrap.css
@@ -4207,6 +4207,14 @@ h5,
 h6 {
   line-height: 1.5em;
 }
+h1 a,
+h2 a,
+h3 a,
+h4 a,
+h5 a,
+h6 a {
+  color: #000000;
+}
 h1 {
   font-size: 48px;
 }
@@ -4456,6 +4464,9 @@ pre.prettyprint {
   -moz-box-shadow: none;
   box-shadow: none;
 }
+hr {
+  border-bottom: 1px solid #eeeeee;
+}
 @media (max-width: 768px) {
   div.subnav {
     height: auto;
@@ -4476,6 +4487,14 @@ pre.prettyprint {
     border-color: #e5e5e5;
   }
 }
+@media (max-width: 979px) {
+  .nav-collapse .navbar-form,
+  .nav-collapse .navbar-search {
+    margin-bottom: 0;
+    border-top: 2px solid #eeeeee;
+    border-bottom: 2px solid #eeeeee;
+  }
+}
 .pull-right {
   float: right;
 }

diff --git a/journal/bootstrap.min.css b/journal/bootstrap.min.css
index 4ced2b0..7d66c8f 100644 (file)
--- a/journal/bootstrap.min.css
+++ b/journal/bootstrap.min.css
@@ -712,7 +712,7 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}
 .hide{display:none;}
 .show{display:block;}
 .invisible{visibility:hidden;}
-h1,h2,h3,h4,h5,h6{line-height:1.5em;}
+h1,h2,h3,h4,h5,h6{line-height:1.5em;}h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{color:#000000;}
 h1{font-size:48px;}
 h2{font-size:36px;}
 h3{font-size:28px;}
@@ -749,7 +749,8 @@ div.subnav li.dropdown.open .dropdown-toggle,div.subnav li.dropdown.open .dropdo
 legend{border-bottom:2px solid #eeeeee;font-family:"News Cycle","Arial Narrow Bold",sans-serif;font-weight:bold;color:#000000;}
 a.thumbnail:hover{-webkit-box-shadow:0 1px 3px 1px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 1px 3px 1px rgba(0, 0, 0, 0.3);box-shadow:0 1px 3px 1px rgba(0, 0, 0, 0.3);border-color:#ddd;}
 code,pre,pre.prettyprint{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#eeeeee;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-@media (max-width:768px){div.subnav{height:auto;}div.subnav .nav>li.active>a{border-top:none;} div.subnav .nav>li:hover>a,div.subnav .nav>li:first-child:hover>a,div.subnav .nav>li.active:hover>a,div.subnav .nav>li.dropdown.open .dropdown-toggle,div.subnav .nav>li.dropdown.open .dropdown-toggle:hover{background-color:#eeeeee;} .nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{border-color:#e5e5e5;}}.pull-right{float:right;}
+hr{border-bottom:1px solid #eeeeee;}
+@media (max-width:768px){div.subnav{height:auto;}div.subnav .nav>li.active>a{border-top:none;} div.subnav .nav>li:hover>a,div.subnav .nav>li:first-child:hover>a,div.subnav .nav>li.active:hover>a,div.subnav .nav>li.dropdown.open .dropdown-toggle,div.subnav .nav>li.dropdown.open .dropdown-toggle:hover{background-color:#eeeeee;} .nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{border-color:#e5e5e5;}}@media (max-width:979px){.nav-collapse .navbar-form,.nav-collapse .navbar-search{margin-bottom:0;border-top:2px solid #eeeeee;border-bottom:2px solid #eeeeee;}}.pull-right{float:right;}
 .pull-left{float:left;}
 .hide{display:none;}
 .show{display:block;}

diff --git a/journal/bootswatch.less b/journal/bootswatch.less
index 69d6bad..b1cdd41 100755 (executable)
--- a/journal/bootswatch.less
+++ b/journal/bootswatch.less
@@ -10,6 +10,10 @@
 
 h1, h2, h3, h4, h5, h6 {
        line-height: 1.5em;
+
+       a {
+               color: @headingsColor;
+       }
 }
 
 h1 {
@@ -270,6 +274,10 @@ code, pre, pre.prettyprint {
        .box-shadow(none);
 }
 
+hr {
+       border-bottom: 1px solid @grayLighter;
+}
+
 @media (max-width: 768px) {
 
        div.subnav {
@@ -293,4 +301,15 @@ code, pre, pre.prettyprint {
        .nav > li.dropdown.open.active > a:hover {
                border-color: #e5e5e5;
        }
-}
\ No newline at end of file
+}
+
+@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;
+       } 
+
+}