journal: widened navbar

diff --git a/journal/bootstrap.css b/journal/bootstrap.css
index e6b2be7..f99bdbc 100644 (file)
--- a/journal/bootstrap.css
+++ b/journal/bootstrap.css
@@ -2265,15 +2265,15 @@ button.close {
   background-color: #080808 \9;
 }
 .btn-warning {
-  background-color: #ff962e;
-  background-image: -moz-linear-gradient(top, #ffa54d, #ff7f00);
-  background-image: -ms-linear-gradient(top, #ffa54d, #ff7f00);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffa54d), to(#ff7f00));
-  background-image: -webkit-linear-gradient(top, #ffa54d, #ff7f00);
-  background-image: -o-linear-gradient(top, #ffa54d, #ff7f00);
-  background-image: linear-gradient(top, #ffa54d, #ff7f00);
+  background-color: #ff8e1f;
+  background-image: -moz-linear-gradient(top, #ff9933, #ff7f00);
+  background-image: -ms-linear-gradient(top, #ff9933, #ff7f00);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ff9933), to(#ff7f00));
+  background-image: -webkit-linear-gradient(top, #ff9933, #ff7f00);
+  background-image: -o-linear-gradient(top, #ff9933, #ff7f00);
+  background-image: linear-gradient(top, #ff9933, #ff7f00);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa54d', endColorstr='#ff7f00', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff9933', endColorstr='#ff7f00', GradientType=0);
   border-color: #ff7f00 #ff7f00 #b35900;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   *background-color: #ff7f00;
@@ -2381,18 +2381,18 @@ button.close {
   background-color: #24748c \9;
 }
 .btn-inverse {
-  background-color: #5f5f5f;
-  background-image: -moz-linear-gradient(top, #888888, #222222);
-  background-image: -ms-linear-gradient(top, #888888, #222222);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#888888), to(#222222));
-  background-image: -webkit-linear-gradient(top, #888888, #222222);
-  background-image: -o-linear-gradient(top, #888888, #222222);
-  background-image: linear-gradient(top, #888888, #222222);
+  background-color: #1d1d1d;
+  background-image: -moz-linear-gradient(top, #222222, #151515);
+  background-image: -ms-linear-gradient(top, #222222, #151515);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#151515));
+  background-image: -webkit-linear-gradient(top, #222222, #151515);
+  background-image: -o-linear-gradient(top, #222222, #151515);
+  background-image: linear-gradient(top, #222222, #151515);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#888888', endColorstr='#222222', GradientType=0);
-  border-color: #222222 #222222 #000000;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#222222', endColorstr='#151515', GradientType=0);
+  border-color: #151515 #151515 #000000;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  *background-color: #222222;
+  *background-color: #151515;
   /* Darken IE7 buttons by default so they stand out more given they won't have borders */
 
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
@@ -2402,12 +2402,12 @@ button.close {
 .btn-inverse.active,
 .btn-inverse.disabled,
 .btn-inverse[disabled] {
-  background-color: #222222;
-  *background-color: #151515;
+  background-color: #151515;
+  *background-color: #080808;
 }
 .btn-inverse:active,
 .btn-inverse.active {
-  background-color: #080808 \9;
+  background-color: #000000 \9;
 }
 button.btn,
 input[type="submit"].btn {
@@ -2564,7 +2564,7 @@ input[type="submit"].btn.btn-mini {
   background-color: #2f96b4;
 }
 .btn-group.open .btn-inverse.dropdown-toggle {
-  background-color: #222222;
+  background-color: #151515;
 }
 .btn .caret {
   margin-top: 7px;
@@ -2960,7 +2960,7 @@ input[type="submit"].btn.btn-mini {
   margin-bottom: 18px;
 }
 .navbar-inner {
-  min-height: 40px;
+  min-height: 70px;
   padding-left: 20px;
   padding-right: 20px;
   background-color: #fcfbfd;
@@ -2994,7 +2994,7 @@ input[type="submit"].btn.btn-mini {
 .navbar .brand {
   float: left;
   display: block;
-  padding: 8px 20px 12px;
+  padding: 23px 20px 27px;
   margin-left: -20px;
   font-size: 20px;
   font-weight: 200;
@@ -3003,7 +3003,7 @@ input[type="submit"].btn.btn-mini {
 }
 .navbar .navbar-text {
   margin-bottom: 0;
-  line-height: 40px;
+  line-height: 70px;
 }
 .navbar .navbar-link {
   color: #222222;
@@ -3013,7 +3013,7 @@ input[type="submit"].btn.btn-mini {
 }
 .navbar .btn,
 .navbar .btn-group {
-  margin-top: 5px;
+  margin-top: 20px;
 }
 .navbar .btn-group .btn {
   margin: 0;
@@ -3034,7 +3034,7 @@ input[type="submit"].btn.btn-mini {
 .navbar-form select,
 .navbar-form .radio,
 .navbar-form .checkbox {
-  margin-top: 5px;
+  margin-top: 20px;
 }
 .navbar-form input,
 .navbar-form select {
@@ -3058,7 +3058,7 @@ input[type="submit"].btn.btn-mini {
 .navbar-search {
   position: relative;
   float: left;
-  margin-top: 6px;
+  margin-top: 21px;
   margin-bottom: 0;
 }
 .navbar-search .search-query {
@@ -3139,7 +3139,7 @@ input[type="submit"].btn.btn-mini {
 }
 .navbar .nav > li > a {
   float: none;
-  padding: 9px 10px 11px;
+  padding: 24px 10px 26px;
   line-height: 19px;
   color: #222222;
   text-decoration: none;
@@ -3148,12 +3148,12 @@ input[type="submit"].btn.btn-mini {
 .navbar .btn {
   display: inline-block;
   padding: 4px 10px 4px;
-  margin: 5px 5px 6px;
+  margin: 20px 5px 21px;
   line-height: 18px;
 }
 .navbar .btn-group {
   margin: 0;
-  padding: 5px 5px 6px;
+  padding: 20px 5px 21px;
 }
 .navbar .nav > li > a:hover {
   background-color: #eeeeee;
@@ -3167,7 +3167,7 @@ input[type="submit"].btn.btn-mini {
   background-color: #eeeeee;
 }
 .navbar .divider-vertical {
-  height: 40px;
+  height: 70px;
   width: 1px;
   margin: 0 9px;
   overflow: hidden;
@@ -4212,9 +4212,6 @@ a.btn,
 .navbar .nav > li > a {
   text-shadow: none;
 }
-.navbar .nav-collapse.in .nav li > a:hover {
-  background-color: #eeeeee;
-}
 .navbar .dropdown-menu {
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
@@ -4234,6 +4231,9 @@ a.btn,
   border-top-color: #000000;
   opacity: 1;
 }
+.navbar .nav-collapse.in .nav li > a:hover {
+  background-color: #eeeeee;
+}
 .navbar .nav-collapse .nav li > a {
   color: #222222;
   text-decoration: none;
@@ -4266,6 +4266,9 @@ div.subnav {
   -moz-border-radius: 0;
   border-radius: 0;
 }
+div.subnav.subnav-fixed {
+  top: 70px;
+}
 div.subnav .nav > li > a:hover,
 div.subnav .nav > .active > a,
 div.subnav .nav > .active > a:hover {
@@ -4308,6 +4311,10 @@ div.subnav .nav > li:first-child > a:hover {
 .btn-primary.active {
   background-color: #080808 \9;
 }
+[class^="icon-"],
+[class*=" icon-"] {
+  vertical-align: -2px;
+}
 .modal {
   -webkit-border-radius: 0px;
   -moz-border-radius: 0px;

diff --git a/journal/bootstrap.min.css b/journal/bootstrap.min.css
index 8386b0b..af72b3a 100644 (file)
--- a/journal/bootstrap.min.css
+++ b/journal/bootstrap.min.css
@@ -429,7 +429,7 @@ button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-ap
 .btn{border-color:#ccc;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
 .btn-primary{background-color:#222222;background-image:-moz-linear-gradient(top, #222222, #222222);background-image:-ms-linear-gradient(top, #222222, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#222222));background-image:-webkit-linear-gradient(top, #222222, #222222);background-image:-o-linear-gradient(top, #222222, #222222);background-image:linear-gradient(top, #222222, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#222222', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#222222;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#222222;*background-color:#151515;}
 .btn-primary:active,.btn-primary.active{background-color:#080808 \9;}
-.btn-warning{background-color:#ff962e;background-image:-moz-linear-gradient(top, #ffa54d, #ff7f00);background-image:-ms-linear-gradient(top, #ffa54d, #ff7f00);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffa54d), to(#ff7f00));background-image:-webkit-linear-gradient(top, #ffa54d, #ff7f00);background-image:-o-linear-gradient(top, #ffa54d, #ff7f00);background-image:linear-gradient(top, #ffa54d, #ff7f00);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa54d', endColorstr='#ff7f00', GradientType=0);border-color:#ff7f00 #ff7f00 #b35900;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#ff7f00;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#ff7f00;*background-color:#e67200;}
+.btn-warning{background-color:#ff8e1f;background-image:-moz-linear-gradient(top, #ff9933, #ff7f00);background-image:-ms-linear-gradient(top, #ff9933, #ff7f00);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ff9933), to(#ff7f00));background-image:-webkit-linear-gradient(top, #ff9933, #ff7f00);background-image:-o-linear-gradient(top, #ff9933, #ff7f00);background-image:linear-gradient(top, #ff9933, #ff7f00);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff9933', endColorstr='#ff7f00', GradientType=0);border-color:#ff7f00 #ff7f00 #b35900;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#ff7f00;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#ff7f00;*background-color:#e67200;}
 .btn-warning:active,.btn-warning.active{background-color:#cc6600 \9;}
 .btn-danger{background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-ms-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(top, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#bd362f;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#bd362f;*background-color:#a9302a;}
 .btn-danger:active,.btn-danger.active{background-color:#942a25 \9;}
@@ -437,8 +437,8 @@ button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-ap
 .btn-success:active,.btn-success.active{background-color:#408140 \9;}
 .btn-info{background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-ms-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(top, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#2f96b4;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#2f96b4;*background-color:#2a85a0;}
 .btn-info:active,.btn-info.active{background-color:#24748c \9;}
-.btn-inverse{background-color:#5f5f5f;background-image:-moz-linear-gradient(top, #888888, #222222);background-image:-ms-linear-gradient(top, #888888, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#888888), to(#222222));background-image:-webkit-linear-gradient(top, #888888, #222222);background-image:-o-linear-gradient(top, #888888, #222222);background-image:linear-gradient(top, #888888, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#888888', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#222222;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{background-color:#222222;*background-color:#151515;}
-.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9;}
+.btn-inverse{background-color:#1d1d1d;background-image:-moz-linear-gradient(top, #222222, #151515);background-image:-ms-linear-gradient(top, #222222, #151515);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#151515));background-image:-webkit-linear-gradient(top, #222222, #151515);background-image:-o-linear-gradient(top, #222222, #151515);background-image:linear-gradient(top, #222222, #151515);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#222222', endColorstr='#151515', GradientType=0);border-color:#151515 #151515 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#151515;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{background-color:#151515;*background-color:#080808;}
+.btn-inverse:active,.btn-inverse.active{background-color:#000000 \9;}
 button.btn,input[type="submit"].btn{*padding-top:2px;*padding-bottom:2px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;}
 button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px;}
 button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px;}
@@ -466,7 +466,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-
 .btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f;}
 .btn-group.open .btn-success.dropdown-toggle{background-color:#51a351;}
 .btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4;}
-.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222222;}
+.btn-group.open .btn-inverse.dropdown-toggle{background-color:#151515;}
 .btn .caret{margin-top:7px;margin-left:0;}
 .btn:hover .caret,.open.btn-group .caret{opacity:1;filter:alpha(opacity=100);}
 .btn-mini .caret{margin-top:5px;}
@@ -544,22 +544,22 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-
 .tabs-right>.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;}
 .tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;}
 .navbar{*position:relative;*z-index:2;overflow:visible;margin-bottom:18px;}
-.navbar-inner{min-height:40px;padding-left:20px;padding-right:20px;background-color:#fcfbfd;background-image:-moz-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:-ms-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fcfbfd), to(#fcfbfd));background-image:-webkit-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:-o-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:linear-gradient(top, #fcfbfd, #fcfbfd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfbfd', endColorstr='#fcfbfd', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);}
+.navbar-inner{min-height:70px;padding-left:20px;padding-right:20px;background-color:#fcfbfd;background-image:-moz-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:-ms-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fcfbfd), to(#fcfbfd));background-image:-webkit-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:-o-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:linear-gradient(top, #fcfbfd, #fcfbfd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfbfd', endColorstr='#fcfbfd', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);}
 .navbar .container{width:auto;}
 .nav-collapse.collapse{height:auto;}
 .navbar{color:#222222;}.navbar .brand:hover{text-decoration:none;}
-.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#222222;}
-.navbar .navbar-text{margin-bottom:0;line-height:40px;}
+.navbar .brand{float:left;display:block;padding:23px 20px 27px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#222222;}
+.navbar .navbar-text{margin-bottom:0;line-height:70px;}
 .navbar .navbar-link{color:#222222;}.navbar .navbar-link:hover{color:#222222;}
-.navbar .btn,.navbar .btn-group{margin-top:5px;}
+.navbar .btn,.navbar .btn-group{margin-top:20px;}
 .navbar .btn-group .btn{margin:0;}
 .navbar-form{margin-bottom:0;*zoom:1;}.navbar-form:before,.navbar-form:after{display:table;content:"";}
 .navbar-form:after{clear:both;}
-.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px;}
+.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:20px;}
 .navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
 .navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;}
 .navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap;}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0;}
-.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:'Open Sans',"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;background-color:#ffffff;border:1px solid #b3b3b3;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#cccccc;}
+.navbar-search{position:relative;float:left;margin-top:21px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:'Open Sans',"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;background-color:#ffffff;border:1px solid #b3b3b3;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#cccccc;}
 .navbar-search .search-query::-webkit-input-placeholder{color:#cccccc;}
 .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
 .navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0;}
@@ -570,12 +570,12 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-
 .navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}
 .navbar .nav.pull-right{float:right;}
 .navbar .nav>li{display:block;float:left;}
-.navbar .nav>li>a{float:none;padding:9px 10px 11px;line-height:19px;color:#222222;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
-.navbar .btn{display:inline-block;padding:4px 10px 4px;margin:5px 5px 6px;line-height:18px;}
-.navbar .btn-group{margin:0;padding:5px 5px 6px;}
+.navbar .nav>li>a{float:none;padding:24px 10px 26px;line-height:19px;color:#222222;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
+.navbar .btn{display:inline-block;padding:4px 10px 4px;margin:20px 5px 21px;line-height:18px;}
+.navbar .btn-group{margin:0;padding:20px 5px 21px;}
 .navbar .nav>li>a:hover{background-color:#eeeeee;color:#222222;text-decoration:none;}
 .navbar .nav .active>a,.navbar .nav .active>a:hover{color:#222222;text-decoration:none;background-color:#eeeeee;}
-.navbar .divider-vertical{height:40px;width:1px;margin:0 9px;overflow:hidden;background-color:#fcfbfd;border-right:1px solid #fcfbfd;}
+.navbar .divider-vertical{height:70px;width:1px;margin:0 9px;overflow:hidden;background-color:#fcfbfd;border-right:1px solid #fcfbfd;}
 .navbar .nav.pull-right{margin-left:10px;margin-right:0;}
 .navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;background-color:#fcfbfd;background-image:-moz-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:-ms-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fcfbfd), to(#fcfbfd));background-image:-webkit-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:-o-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:linear-gradient(top, #fcfbfd, #fcfbfd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfbfd', endColorstr='#fcfbfd', GradientType=0);border-color:#fcfbfd #fcfbfd #d6c8e4;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#fcfbfd;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);}.navbar .btn-navbar:hover,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{background-color:#fcfbfd;*background-color:#efeaf5;}
 .navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#e3d9ec \9;}
@@ -720,18 +720,20 @@ a{text-decoration:underline;}
 .navbar .navbar-inner{-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 2px 4px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);border-top:1px solid #E5E5E5;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
 .navbar .brand{text-shadow:none;}.navbar .brand:hover{background-color:#EEEEEE;}
 .navbar .nav>li>a{text-shadow:none;}
-.navbar .nav-collapse.in .nav li>a:hover{background-color:#eeeeee;}
 .navbar .dropdown-menu{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
 .navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle:hover,.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active.open>.dropdown-toggle,.navbar .nav li.dropdown.active.open>.dropdown-toggle:hover{background-color:#eeeeee;color:#222222;}
 .navbar .nav li.dropdown .dropdown-toggle .caret,.navbar .nav .open .caret,.navbar .nav .open .dropdown-toggle:hover .caret{border-top-color:#000000;opacity:1;}
+.navbar .nav-collapse.in .nav li>a:hover{background-color:#eeeeee;}
 .navbar .nav-collapse .nav li>a{color:#222222;text-decoration:none;font-weight:normal;}
 .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{border-color:transparent;}
 .navbar .navbar-search .search-query,.navbar .navbar-search .search-query:hover{border:1px solid #eeeeee;color:#222222;}.navbar .navbar-search .search-query :-moz-placeholder,.navbar .navbar-search .search-query:hover :-moz-placeholder{color:#888888;}
 .navbar .navbar-search .search-query ::-webkit-input-placeholder,.navbar .navbar-search .search-query:hover ::-webkit-input-placeholder{color:#888888;}
-div.subnav{background-color:#fcfbfd;background-image:none;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.25);box-shadow:0 1px 2px rgba(0, 0, 0, 0.25);-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}div.subnav .nav>li>a:hover,div.subnav .nav>.active>a,div.subnav .nav>.active>a:hover{color:#222222;text-decoration:none;font-weight:normal;}
+div.subnav{background-color:#fcfbfd;background-image:none;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.25);box-shadow:0 1px 2px rgba(0, 0, 0, 0.25);-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}div.subnav.subnav-fixed{top:70px;}
+div.subnav .nav>li>a:hover,div.subnav .nav>.active>a,div.subnav .nav>.active>a:hover{color:#222222;text-decoration:none;font-weight:normal;}
 div.subnav .nav>li:first-child>a,div.subnav .nav>li:first-child>a:hover{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
 .btn-primary{background-color:#2a2a2a;background-image:-moz-linear-gradient(top, #2f2f2f, #222222);background-image:-ms-linear-gradient(top, #2f2f2f, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#2f2f2f), to(#222222));background-image:-webkit-linear-gradient(top, #2f2f2f, #222222);background-image:-o-linear-gradient(top, #2f2f2f, #222222);background-image:linear-gradient(top, #2f2f2f, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#2f2f2f', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#222222;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#222222;*background-color:#151515;}
 .btn-primary:active,.btn-primary.active{background-color:#080808 \9;}
+[class^="icon-"],[class*=" icon-"]{vertical-align:-2px;}
 .modal{-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;background:#fcfbfd;}
 .modal-header{border-bottom:none;}
 .modal-header .close{text-decoration:none;}

diff --git a/journal/bootswatch.less b/journal/bootswatch.less
index 3c422fb..7307cd7 100755 (executable)
--- a/journal/bootswatch.less
+++ b/journal/bootswatch.less
@@ -27,14 +27,14 @@ a {
 // -----------------------------------------------------
 
 .navbar {
-       
+
        .navbar-inner {
                @shadow: 0 2px 4px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
                .box-shadow(@shadow);
                border-top: 1px solid #E5E5E5;
                .border-radius(0);
        }
-               
+
        .brand {
                text-shadow: none;
 
@@ -42,13 +42,13 @@ a {
                        background-color: #EEEEEE;
                }
        }
-       
+
        .nav > li > a {
-               text-shadow: none;              
+               text-shadow: none;
        }
-       
+
        .dropdown-menu {
-               .border-radius(0);              
+               .border-radius(0);
        }
 
        .nav li.dropdown.active > .dropdown-toggle,
@@ -66,22 +66,22 @@ a {
                border-top-color: @black;
                opacity: 1;
        }
-       
+
        .nav-collapse.in .nav li > a:hover {
                background-color: @grayLighter;
        }
-               
+
        .nav-collapse .nav li > a {
                color: @textColor;
                text-decoration: none;
-               font-weight: normal;    
+               font-weight: normal;
        }
-       
+
        .nav-collapse .navbar-form,
        .nav-collapse .navbar-search {
                border-color: transparent;
-       }       
-       
+       }
+
        .navbar-search .search-query,
        .navbar-search .search-query:hover {
                border: 1px solid @grayLighter;
@@ -96,7 +96,11 @@ div.subnav {
        @shadow: 0 1px 2px rgba(0,0,0,.25);
        .box-shadow(@shadow);
        .border-radius(0);
-       
+
+       &.subnav-fixed {
+               top: @navbarHeight;
+       }
+
        .nav > li > a:hover,
        .nav > .active > a,
        .nav > .active > a:hover {
@@ -108,7 +112,7 @@ div.subnav {
        .nav > li:first-child > a,
        .nav > li:first-child > a:hover {
                .border-radius(0);
-       }       
+       }
 }
 
 // BUTTONS
@@ -118,6 +122,10 @@ div.subnav {
   .buttonBackground(lighten(@linkColor, 5%), @linkColor);
 }
 
+[class^="icon-"], [class*=" icon-"] {
+       vertical-align: -2px;
+}
+
 // MODALS
 // -----------------------------------------------------
 

diff --git a/journal/thumbnail.png b/journal/thumbnail.png
index 176894e..7253f7c 100644 (file)
Binary files a/journal/thumbnail.png and b/journal/thumbnail.png differ

diff --git a/journal/variables.less b/journal/variables.less
index b5cf182..c84e351 100755 (executable)
--- a/journal/variables.less
+++ b/journal/variables.less
@@ -82,14 +82,14 @@
 @btnSuccessBackground:              #62c462;
 @btnSuccessBackgroundHighlight:     #51a351;
 
-@btnWarningBackground:              lighten(@orange, 15%);
+@btnWarningBackground:              lighten(@orange, 10%);
 @btnWarningBackgroundHighlight:     @orange;
 
 @btnDangerBackground:               #ee5f5b;
 @btnDangerBackgroundHighlight:      #bd362f;
 
-@btnInverseBackground:              @gray;
-@btnInverseBackgroundHighlight:     @grayDarker;
+@btnInverseBackground:              @linkColor;
+@btnInverseBackgroundHighlight:     darken(@linkColor, 5%);
 
 
 // Forms
@@ -144,7 +144,7 @@
 
 // Navbar
 // -------------------------
-@navbarHeight:                    40px;
+@navbarHeight:                    70px;
 @navbarBackground:                @bodyBackground;
 @navbarBackgroundHighlight:       @bodyBackground;