cyborg, journal, readable: fix .dropdown.active.open on hover

diff --git a/cyborg/bootstrap.css b/cyborg/bootstrap.css
index a966bf5..40cf6f0 100644 (file)
--- a/cyborg/bootstrap.css
+++ b/cyborg/bootstrap.css
@@ -4215,7 +4215,7 @@ body {
 .page-header {
   border-bottom: 2px solid #33b5e5;
 }
-.navbar-inner {
+.navbar .navbar-inner {
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
   border-radius: 0;
@@ -4227,13 +4227,18 @@ body {
 .navbar .brand {
   padding: 12px 20px 8px;
 }
+.navbar .brand:hover {
+  border-bottom: 3px solid #33b5e5;
+}
 .navbar .nav li > a {
   padding: 13px 10px 8px;
   border-bottom: 3px solid rgba(0, 0, 0, 0);
+  border-left: 1px solid #222;
 }
-.navbar .nav .active > a,
-.navbar .nav li > a:hover,
-.navbar .brand:hover {
+.navbar .nav li > a:hover {
+  border-bottom: 3px solid #33b5e5;
+}
+.navbar .nav .active > a {
   border-bottom: 3px solid #33b5e5;
 }
 .navbar .search-query,
@@ -4256,9 +4261,20 @@ body {
 .navbar .search-query.focused ::-webkit-input-placeholder {
   color: #999999;
 }
-.navbar .nav > li > a {
+.navbar .nav li.dropdown.active.open .dropdown-toggle:hover {
+  border-bottom: 3px solid #33b5e5;
   border-left: 1px solid #222;
 }
+.navbar .dropdown-menu::before,
+.navbar .dropdown-menu::after {
+  display: none;
+}
+.navbar .nav-collapse.in .nav > li > a {
+  border-left: 0;
+}
+.navbar .nav-collapse.in .nav a:hover {
+  background-color: #33b5e5;
+}
 .dropdown-menu {
   background-color: #191A1A;
   border-left: solid 1px rgba(255, 255, 255, 0.1);
@@ -4274,16 +4290,6 @@ body {
   background-color: #222;
   border-bottom: 0px solid white;
 }
-.navbar .dropdown-menu::before,
-.navbar .dropdown-menu::after {
-  display: none;
-}
-.navbar .nav-collapse.in .nav > li > a {
-  border-left: 0;
-}
-.navbar .nav-collapse.in .nav a:hover {
-  background-color: #33b5e5;
-}
 div.subnav {
   position: static;
   background-color: #020202;
@@ -4305,9 +4311,9 @@ div.subnav .nav .active a {
 div.subnav .nav li.nav-header {
   text-shadow: none;
 }
-.subnav .nav > li > a:hover,
-.subnav .nav > li.active > a:hover,
-.subnav .nav > li:first-child > a:hover {
+div.subnav .nav > li > a:hover,
+div.subnav .nav > li.active > a:hover,
+div.subnav .nav > li:first-child > a:hover {
   background: transparent;
   border-bottom: 2px solid #33b5e5;
   border-left: 1px solid #222;

diff --git a/cyborg/bootstrap.min.css b/cyborg/bootstrap.min.css
index 9fbfbfb..69f2b7d 100644 (file)
--- a/cyborg/bootstrap.min.css
+++ b/cyborg/bootstrap.min.css
@@ -721,24 +721,23 @@ label,input,button,select,textarea,.navbar .search-query:-moz-placeholder,.navba
 html{min-height:100%;}
 body{min-height:100%;background-color:#121417;background-image:-moz-linear-gradient(top, #060606, #252a30);background-image:-ms-linear-gradient(top, #060606, #252a30);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#060606), to(#252a30));background-image:-webkit-linear-gradient(top, #060606, #252a30);background-image:-o-linear-gradient(top, #060606, #252a30);background-image:linear-gradient(top, #060606, #252a30);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#060606', endColorstr='#252a30', GradientType=0);}
 .page-header{border-bottom:2px solid #33b5e5;}
-.navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border-bottom:2px solid #33b5e5;}
-.navbar .brand{padding:12px 20px 8px;}
-.navbar .nav li>a{padding:13px 10px 8px;border-bottom:3px solid rgba(0, 0, 0, 0);}
-.navbar .nav .active>a,.navbar .nav li>a:hover,.navbar .brand:hover{border-bottom:3px solid #33b5e5;}
+.navbar .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border-bottom:2px solid #33b5e5;}
+.navbar .brand{padding:12px 20px 8px;}.navbar .brand:hover{border-bottom:3px solid #33b5e5;}
+.navbar .nav li>a{padding:13px 10px 8px;border-bottom:3px solid rgba(0, 0, 0, 0);border-left:1px solid #222;}.navbar .nav li>a:hover{border-bottom:3px solid #33b5e5;}
+.navbar .nav .active>a{border-bottom:3px solid #33b5e5;}
 .navbar .search-query,.navbar .search-query:focus,.navbar .search-query.focused{color:#adafae;text-shadow:none;background-color:#222;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;}.navbar .search-query :-moz-placeholder,.navbar .search-query:focus :-moz-placeholder,.navbar .search-query.focused :-moz-placeholder{color:#999999;}
 .navbar .search-query ::-webkit-input-placeholder,.navbar .search-query:focus ::-webkit-input-placeholder,.navbar .search-query.focused ::-webkit-input-placeholder{color:#999999;}
-.navbar .nav>li>a{border-left:1px solid #222;}
-.dropdown-menu{background-color:#191A1A;border-left:solid 1px rgba(255, 255, 255, 0.1);-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);}
-.dropdown-menu li>a:hover{background-color:#33b5e5;border-bottom:3px solid transparent;}
-.dropdown-menu .divider{background-color:#222;border-bottom:0px solid white;}
+.navbar .nav li.dropdown.active.open .dropdown-toggle:hover{border-bottom:3px solid #33b5e5;border-left:1px solid #222;}
 .navbar .dropdown-menu::before,.navbar .dropdown-menu::after{display:none;}
 .navbar .nav-collapse.in .nav>li>a{border-left:0;}
 .navbar .nav-collapse.in .nav a:hover{background-color:#33b5e5;}
-div.subnav{position:static;background-color:#020202;background-image:none;border:0;}
-div.subnav.subnav-fixed{position:relative;left:-1px;top:auto;}
+.dropdown-menu{background-color:#191A1A;border-left:solid 1px rgba(255, 255, 255, 0.1);-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);}
+.dropdown-menu li>a:hover{background-color:#33b5e5;border-bottom:3px solid transparent;}
+.dropdown-menu .divider{background-color:#222;border-bottom:0px solid white;}
+div.subnav{position:static;background-color:#020202;background-image:none;border:0;}div.subnav.subnav-fixed{position:relative;left:-1px;top:auto;}
 div.subnav .nav>li>a,div.subnav .nav .active a{background-color:#020202;border-left:1px solid #222;border-right:0;color:#eeeeee;}
 div.subnav .nav li.nav-header{text-shadow:none;}
-.subnav .nav>li>a:hover,.subnav .nav>li.active>a:hover,.subnav .nav>li:first-child>a:hover{background:transparent;border-bottom:2px solid #33b5e5;border-left:1px solid #222;color:#ffffff;}
+div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a:hover,div.subnav .nav>li:first-child>a:hover{background:transparent;border-bottom:2px solid #33b5e5;border-left:1px solid #222;color:#ffffff;}
 div.subnav .nav .open .dropdown-toggle{border:0;border-left:1px solid #222;border-bottom:2px solid #33b5e5;background-color:#060606;}
 div.subnav .nav .open .dropdown-menu{background-color:#020202;border-left:solid 1px rgba(255, 255, 255, 0.1);}div.subnav .nav .open .dropdown-menu li>a:hover{border-bottom:0;background:#33b5e5;}
 @media (max-width:768px){div.subnav .nav>li+li>a,div.subnav .nav>li:first-child>a{border-top:1px solid #222;border-left:1px solid #222;} .subnav .nav>li+li>a:hover,.subnav .nav>li:first-child>a:hover{border-bottom:0;background-color:#33b5e5;}}.nav-list li>a{text-shadow:none;}

diff --git a/cyborg/bootswatch.less b/cyborg/bootswatch.less
index 15de252..7f8726a 100755 (executable)
--- a/cyborg/bootswatch.less
+++ b/cyborg/bootswatch.less
@@ -49,39 +49,64 @@ body {
 // NAVBAR
 // -----------------------------------------------------
 
-.navbar-inner {
-  .border-radius(0);
-  .box-shadow(none);
-  border-bottom: 2px solid @blue
-}
-
-.navbar .brand {
-       padding: 12px 20px 8px;
-}
-
-.navbar .nav li > a {
-       padding: 13px 10px 8px;
-       border-bottom: 3px solid rgba(0, 0, 0, 0);
-}
+.navbar {
+       
+       .navbar-inner {
+         .border-radius(0);
+         .box-shadow(none);
+         border-bottom: 2px solid @blue
+       }
+       
+       .brand {
+               padding: 12px 20px 8px;
+               
+               &:hover {
+                               border-bottom: 3px solid @blue
+               }
+       }
+       
+       .nav li > a {
+               padding: 13px 10px 8px;
+               border-bottom: 3px solid rgba(0, 0, 0, 0);
+               border-left: 1px solid #222;
+               
+               &:hover {
+                       border-bottom: 3px solid @blue
+               }
+       }
+       
+       .nav .active > a {
+               border-bottom: 3px solid @blue
+       }
+       
+       .search-query,
+       .search-query:focus,
+       .search-query.focused {
+               color: @grayLight;
+               text-shadow: none;
+               background-color: #222;
+               .border-radius(1px);
+               .placeholder(@gray);
+       }       
+       
+       .nav li.dropdown.active.open .dropdown-toggle:hover {
+               border-bottom: 3px solid @blue;
+               border-left: 1px solid #222;
+       }
+       
+       .dropdown-menu::before,
+       .dropdown-menu::after {
+               display: none;
+       }
 
-.navbar .nav .active > a,
-.navbar .nav li > a:hover,
-.navbar .brand:hover {
-       border-bottom: 3px solid @blue
-}
+       .nav-collapse.in .nav > li > a {
+               border-left: 0;
+       }
 
-.navbar .search-query,
-.navbar .search-query:focus,
-.navbar .search-query.focused {
-       color: @grayLight;
-       text-shadow: none;
-       background-color: #222;
-       .border-radius(1px);
-       .placeholder(@gray);
-}
+       .nav-collapse.in .nav a:hover {
+               background-color: @blue;
+       }
 
-.navbar .nav > li > a {
-       border-left: 1px solid #222;
 }
 
 .dropdown-menu {
@@ -100,66 +125,51 @@ body {
        border-bottom: 0px solid white;
 }
 
-.navbar .dropdown-menu::before,
-.navbar .dropdown-menu::after {
-       display: none;
-}
-
-.navbar .nav-collapse.in .nav > li > a {
-       border-left: 0;
-}
-
-.navbar .nav-collapse.in .nav a:hover {
-       background-color: @blue;
-}
-
 div.subnav {
        position: static;
        background-color: @grayDarker;
        background-image: none;
        border: 0;
-}
-
-div.subnav.subnav-fixed {
-       position: relative;
-       left: -1px;
-       top: auto;
-}
-
-div.subnav .nav > li > a,
-div.subnav .nav .active a {
-       background-color: @grayDarker;
-       border-left: 1px solid #222;
-       border-right: 0;
-       color: @grayLighter;
-}
-
-div.subnav .nav li.nav-header {
-       text-shadow: none;
-}
+       
+       
+       &.subnav-fixed {
+               position: relative;
+               left: -1px;
+               top: auto;
+       }
 
-.subnav .nav > li > a:hover,
-.subnav .nav > li.active > a:hover,
-.subnav .nav > li:first-child > a:hover {
-       background: transparent;
-       border-bottom: 2px solid @blue;
-       border-left: 1px solid #222;
-       color: @white;
-}
+       .nav > li > a,
+       .nav .active a {
+               background-color: @grayDarker;
+               border-left: 1px solid #222;
+               border-right: 0;
+               color: @grayLighter;
+       }
 
-div.subnav .nav .open {
+       .nav li.nav-header {
+               text-shadow: none;
+       }
 
-       .dropdown-toggle {
+       .nav > li > a:hover,
+       .nav > li.active > a:hover,
+       .nav > li:first-child > a:hover {
+               background: transparent;
+               border-bottom: 2px solid @blue;
+               border-left: 1px solid #222;
+               color: @white;
+       }
+       
+       .nav .open .dropdown-toggle {
                border: 0;
                border-left: 1px solid #222;
            border-bottom: 2px solid @blue;
                background-color: #060606;
        }
-
-       .dropdown-menu {
+       
+       .nav .open .dropdown-menu {
                background-color: @grayDarker;
                border-left: solid 1px rgba(255, 255, 255, 0.1);
-               
+
                li > a:hover {
                        border-bottom: 0;
                        background: @blue;

diff --git a/journal/bootstrap.css b/journal/bootstrap.css
index 7acfe1c..e6b2be7 100644 (file)
--- a/journal/bootstrap.css
+++ b/journal/bootstrap.css
@@ -3156,7 +3156,7 @@ input[type="submit"].btn.btn-mini {
   padding: 5px 5px 6px;
 }
 .navbar .nav > li > a:hover {
-  background-color: transparent;
+  background-color: #eeeeee;
   color: #222222;
   text-decoration: none;
 }
@@ -3164,7 +3164,7 @@ input[type="submit"].btn.btn-mini {
 .navbar .nav .active > a:hover {
   color: #222222;
   text-decoration: none;
-  background-color: #fcfbfd;
+  background-color: #eeeeee;
 }
 .navbar .divider-vertical {
   height: 40px;
@@ -4212,21 +4212,22 @@ a.btn,
 .navbar .nav > li > a {
   text-shadow: none;
 }
-.navbar .nav .active > a,
-.navbar .nav .active > a:hover {
-  color: #222222;
-  background-color: rgba(0, 0, 0, 0);
-}
-.navbar .nav .active > a:hover,
-.navbar .nav > li > a:hover,
 .navbar .nav-collapse.in .nav li > a:hover {
-  background-color: #EEEEEE;
+  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 {
@@ -4348,3 +4349,18 @@ pre.prettyprint,
   -moz-border-radius: 0;
   border-radius: 0;
 }
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
+.invisible {
+  visibility: hidden;
+}

diff --git a/journal/bootstrap.min.css b/journal/bootstrap.min.css
index d332e48..8386b0b 100644 (file)
--- a/journal/bootstrap.min.css
+++ b/journal/bootstrap.min.css
@@ -573,8 +573,8 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-
 .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:hover{background-color:transparent;color:#222222;text-decoration:none;}
-.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#222222;text-decoration:none;background-color:#fcfbfd;}
+.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 .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;}
@@ -720,9 +720,9 @@ 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 .active>a,.navbar .nav .active>a:hover{color:#222222;background-color:rgba(0, 0, 0, 0);}
-.navbar .nav .active>a:hover,.navbar .nav>li>a:hover,.navbar .nav-collapse.in .nav li>a:hover{background-color:#EEEEEE;}
+.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 .nav li>a{color:#222222;text-decoration:none;font-weight:normal;}
 .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{border-color:transparent;}
@@ -739,3 +739,8 @@ div.subnav .nav>li:first-child>a,div.subnav .nav>li:first-child>a:hover{-webkit-
 code,pre,pre.prettyprint,.well{background-color:#eeeeee;}
 .hero-unit{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
 .table-bordered,.well,.prettyprint{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.pull-right{float:right;}
+.pull-left{float:left;}
+.hide{display:none;}
+.show{display:block;}
+.invisible{visibility:hidden;}

diff --git a/journal/bootswatch.less b/journal/bootswatch.less
index 65e6f68..3c422fb 100755 (executable)
--- a/journal/bootswatch.less
+++ b/journal/bootswatch.less
@@ -46,29 +46,30 @@ a {
        .nav > li > a {
                text-shadow: none;              
        }
-
-       .nav .active > a,
-       .nav .active > a:hover {
-               color: @navbarLinkColor;
-               background-color: rgba(0, 0, 0, 0);
-       }
-               
-       .nav .active > a:hover,
-       .nav > li > a:hover,
-       .nav-collapse.in .nav li > a:hover {
-               background-color: #EEEEEE;
-       }
-
+       
        .dropdown-menu {
                .border-radius(0);              
        }
 
+       .nav li.dropdown.active > .dropdown-toggle,
+       .nav li.dropdown.active > .dropdown-toggle:hover,
+       .nav li.dropdown.open > .dropdown-toggle,
+       .nav li.dropdown.active.open > .dropdown-toggle,
+       .nav li.dropdown.active.open > .dropdown-toggle:hover {
+               background-color: @grayLighter;
+               color: @linkColor;
+       }
+
        .nav li.dropdown .dropdown-toggle .caret,
        .nav .open .caret,
        .nav .open .dropdown-toggle:hover .caret {
                border-top-color: @black;
                opacity: 1;
        }
+       
+       .nav-collapse.in .nav li > a:hover {
+               background-color: @grayLighter;
+       }
                
        .nav-collapse .nav li > a {
                color: @textColor;

diff --git a/journal/variables.less b/journal/variables.less
index 11553e3..b5cf182 100755 (executable)
--- a/journal/variables.less
+++ b/journal/variables.less
@@ -152,8 +152,8 @@
 @navbarLinkColor:                 @linkColor;
 @navbarLinkColorHover:            @linkColor;
 @navbarLinkColorActive:           @navbarLinkColorHover;
-@navbarLinkBackgroundHover:       transparent;
-@navbarLinkBackgroundActive:      @navbarBackground;
+@navbarLinkBackgroundHover:       @grayLighter;
+@navbarLinkBackgroundActive:      @grayLighter;
 
 @navbarSearchBackground:          lighten(@navbarBackground, 25%);
 @navbarSearchBackgroundFocus:     @white;

diff --git a/readable/bootstrap.css b/readable/bootstrap.css
index 5df21e7..217b6ee 100644 (file)
--- a/readable/bootstrap.css
+++ b/readable/bootstrap.css
@@ -4240,10 +4240,27 @@ footer.footer {
   padding: 10px;
 }
 .navbar .nav > li.active > a,
-.navbar .nav > li:active > a,
 .navbar .open .dropdown-toggle {
   color: #9c0001;
 }
+.navbar .nav li.dropdown.active > .dropdown-toggle,
+.navbar .nav li.dropdown.open > .dropdown-toggle,
+.navbar .nav li.dropdown.active.open > .dropdown-toggle {
+  color: #9c0001;
+}
+.navbar .nav li.dropdown.active > .dropdown-toggle:hover,
+.navbar .nav li.dropdown.open > .dropdown-toggle:hover,
+.navbar .nav li.dropdown.active.open > .dropdown-toggle:hover {
+  color: #c50001;
+}
+.navbar .nav li.dropdown .dropdown-toggle .caret,
+.navbar .nav li.dropdown.open .caret {
+  border-top-color: #9c0001;
+  opacity: 1;
+}
+.navbar .nav li.dropdown.open .dropdown-toggle:hover .caret {
+  border-top-color: #c50001;
+}
 .navbar .search-query {
   border: 1px solid #D4D4D4;
   -webkit-border-radius: 0;
@@ -4252,11 +4269,6 @@ footer.footer {
   color: #090000;
   background-color: #ffffff;
 }
-.navbar .nav .dropdown-toggle .caret,
-.navbar .nav .open .caret {
-  border-top-color: #9c0001;
-  opacity: 1;
-}
 @media (max-width: 980px) {
   form.navbar-form,
   form.navbar-search {
@@ -4619,3 +4631,18 @@ pre {
   border-radius: 0;
   background-color: #ffffff;
 }
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
+.invisible {
+  visibility: hidden;
+}

diff --git a/readable/bootstrap.min.css b/readable/bootstrap.min.css
index a8f68d7..ef77687 100644 (file)
--- a/readable/bootstrap.min.css
+++ b/readable/bootstrap.min.css
@@ -725,9 +725,11 @@ footer.footer{padding-top:2em;padding-bottom:3em;border-top:2px solid #cdcdcd;}
 .navbar{margin-left:16px;}.navbar .navbar-inner{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .navbar .brand{font-size:19px;font-weight:bold;line-height:1em;padding:10px 10px 11px;}.navbar .brand:hover{color:#c50001;}
 .navbar .nav>li>a{text-shadow:none;padding:10px;}
-.navbar .nav>li.active>a,.navbar .nav>li:active>a,.navbar .open .dropdown-toggle{color:#9c0001;}
+.navbar .nav>li.active>a,.navbar .open .dropdown-toggle{color:#9c0001;}
+.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active.open>.dropdown-toggle{color:#9c0001;}.navbar .nav li.dropdown.active>.dropdown-toggle:hover,.navbar .nav li.dropdown.open>.dropdown-toggle:hover,.navbar .nav li.dropdown.active.open>.dropdown-toggle:hover{color:#c50001;}
+.navbar .nav li.dropdown .dropdown-toggle .caret,.navbar .nav li.dropdown.open .caret{border-top-color:#9c0001;opacity:1;}
+.navbar .nav li.dropdown.open .dropdown-toggle:hover .caret{border-top-color:#c50001;}
 .navbar .search-query{border:1px solid #D4D4D4;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;color:#090000;background-color:#ffffff;}
-.navbar .nav .dropdown-toggle .caret,.navbar .nav .open .caret{border-top-color:#9c0001;opacity:1;}
 @media (max-width:980px){form.navbar-form,form.navbar-search{border-top:1px solid #D4D4D4;border-bottom:1px solid #D4D4D4;}}.navbar-fixed-top{position:static;margin-bottom:1.6em;}
 div.subnav{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#ffffff;background-image:none;}div.subnav .nav{padding:0;}
 div.subnav .nav>li.active>a,div.subnav .nav>li:active>a{color:#9c0001;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:transparent;}
@@ -789,3 +791,8 @@ blockquote p{font-size:1em;line-height:1.2em;}
 .thumbnail{background-color:#ffffff;}
 .thumbnail,.thumbnail>img{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 code,pre{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#ffffff;}
+.pull-right{float:right;}
+.pull-left{float:left;}
+.hide{display:none;}
+.show{display:block;}
+.invisible{visibility:hidden;}

diff --git a/readable/bootswatch.less b/readable/bootswatch.less
index 88db457..413ad59 100755 (executable)
--- a/readable/bootswatch.less
+++ b/readable/bootswatch.less
@@ -78,23 +78,36 @@ footer.footer {
        }
 
        .nav > li.active > a,
-       .nav > li:active > a,
        .open .dropdown-toggle {
                color: @linkColor;
        }
        
+       .nav li.dropdown.active > .dropdown-toggle,
+       .nav li.dropdown.open > .dropdown-toggle,
+       .nav li.dropdown.active.open > .dropdown-toggle {
+               color: @linkColor;
+               
+               &:hover {
+                       color: @linkColorHover;
+               }
+       }
+       
+       .nav li.dropdown .dropdown-toggle .caret,
+       .nav li.dropdown.open .caret {
+               border-top-color: @linkColor;
+               opacity: 1;
+       }
+       
+       .nav li.dropdown.open .dropdown-toggle:hover .caret {
+               border-top-color: @linkColorHover;
+       }
+       
        .search-query {
                border: 1px solid #D4D4D4;
                .border-radius(0);
                color: @textColor;
                background-color: @white;
        }
-
-       .nav .dropdown-toggle .caret,
-       .nav .open .caret {
-               border-top-color: @linkColor;
-               opacity: 1;
-       }
 }
 
 @media (max-width: 980px) {