From e9b46a94bc720ef109bbcf9a21222410f680cba9 Mon Sep 17 00:00:00 2001 From: Thomas Park Date: Thu, 27 Dec 2012 23:06:49 -0500 Subject: [PATCH] amelia, cosmo: fixes #53 --- amelia/bootstrap.css | 31 ++++++++++++++----------------- amelia/bootstrap.min.css | 11 ++++++----- amelia/bootswatch.less | 27 ++++++++++++++------------- cosmo/bootstrap.css | 13 +++++-------- cosmo/bootstrap.min.css | 4 ++-- cosmo/bootswatch.less | 14 +++++--------- 6 files changed, 46 insertions(+), 54 deletions(-) diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css index 38e3a13..9231e8b 100644 --- a/amelia/bootstrap.css +++ b/amelia/bootstrap.css @@ -5277,7 +5277,8 @@ div.subnav .nav > .active > a { } div.subnav .nav > .active > a:hover, div.subnav .nav > li > a:hover, -div.subnav .nav > li.active > a:hover { +div.subnav .nav > .active > a, +div.subnav .nav > .active > a:hover { border-right-color: transparent; background-color: rgba(255, 255, 255, 0.4); color: rgba(255, 255, 255, 0.9); @@ -5311,24 +5312,16 @@ div.subnav-fixed { } .nav-tabs li.active > a, .nav-pills li.active > a, -.nav-tabs li:active > a, -.nav-pills li:active > a, .nav-tabs li.active > a:hover, -.nav-pills li.active > a:hover, -.nav-tabs li:active > a:hover, -.nav-pills li:active > a:hover { +.nav-pills li.active > a:hover { color: rgba(255, 255, 255, 0.9); } .nav-tabs li.active > a, .nav-pills li.active > a, -.nav-tabs li:active > a, -.nav-pills li:active > a, .nav-tabs li > a:hover, .nav-pills li > a:hover, .nav-tabs li.active > a:hover, -.nav-pills li.active > a:hover, -.nav-tabs li:active > a:hover, -.nav-pills li:active > a:hover { +.nav-pills li.active > a:hover { background-color: #8AD5DC; border-color: transparent; text-shadow: none; @@ -5349,9 +5342,7 @@ div.subnav-fixed { .nav-tabs.nav-stacked li > a, .nav-tabs.nav-stacked li > a:hover, .nav-tabs.nav-stacked li.active > a, -.nav-tabs.nav-stacked li:active > a, -.nav-tabs.nav-stacked li.active > a:hover, -.nav-tabs.nav-stacked li:active > a:hover { +.nav-tabs.nav-stacked li.active > a:hover { border-color: transparent; } .nav-list .nav-header { @@ -5362,10 +5353,8 @@ div.subnav-fixed { text-shadow: none; } .nav-list li.active > a, -.nav-list li:active > a, .nav-list li > a:hover, -.nav-list li.active > a:hover, -.nav-list li:active > a:hover { +.nav-list li.active > a:hover { background-color: #8AD5DC; text-shadow: none; } @@ -5749,6 +5738,14 @@ textarea, .input-prepend .btn { padding: 4px 10px; } +.alert h1, +.alert h2, +.alert h3, +.alert h4, +.alert h5, +.alert h6 { + color: rgba(255, 255, 255, 0.9); +} .alert, .label { border-color: transparent; diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css index 7f94e9d..47b90f4 100644 --- a/amelia/bootstrap.min.css +++ b/amelia/bootstrap.min.css @@ -875,20 +875,20 @@ hr{border-bottom:1px solid rgba(255, 255, 255, 0.3);} div.subnav .nav>li>a{color:rgba(255, 255, 255, 0.9);border-color:transparent;} 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;} div.subnav .nav>.active>a{background-color:transparent;border-color:transparent;color:rgba(255, 255, 255, 0.9);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -div.subnav .nav>.active>a:hover,div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a:hover{border-right-color:transparent;background-color:rgba(255, 255, 255, 0.4);color:rgba(255, 255, 255, 0.9);} +div.subnav .nav>.active>a:hover,div.subnav .nav>li>a:hover,div.subnav .nav>.active>a,div.subnav .nav>.active>a:hover{border-right-color:transparent;background-color:rgba(255, 255, 255, 0.4);color:rgba(255, 255, 255, 0.9);} div.subnav .nav>li:first-child>a:hover{border-left-color:rgba(255, 255, 255, 0.4);border-left-width:1px;} div.subnav-fixed{top:50px;} .nav-tabs li.open>.dropdown-toggle,.nav-pills li.open>.dropdown-toggle{background-color:#8AD5DC;color:#e8d069;border-color:transparent;} .nav-tabs,.nav-pills{border-color:transparent;}.nav-tabs li>a,.nav-pills li>a{border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:0;-moz-box-shadow:0;box-shadow:0;} -.nav-tabs li.active>a,.nav-pills li.active>a,.nav-tabs li:active>a,.nav-pills li:active>a,.nav-tabs li.active>a:hover,.nav-pills li.active>a:hover,.nav-tabs li:active>a:hover,.nav-pills li:active>a:hover{color:rgba(255, 255, 255, 0.9);} -.nav-tabs li.active>a,.nav-pills li.active>a,.nav-tabs li:active>a,.nav-pills li:active>a,.nav-tabs li>a:hover,.nav-pills li>a:hover,.nav-tabs li.active>a:hover,.nav-pills li.active>a:hover,.nav-tabs li:active>a:hover,.nav-pills li:active>a:hover{background-color:#8AD5DC;border-color:transparent;text-shadow:none;} +.nav-tabs li.active>a,.nav-pills li.active>a,.nav-tabs li.active>a:hover,.nav-pills li.active>a:hover{color:rgba(255, 255, 255, 0.9);} +.nav-tabs li.active>a,.nav-pills li.active>a,.nav-tabs li>a:hover,.nav-pills li>a:hover,.nav-tabs li.active>a:hover,.nav-pills li.active>a:hover{background-color:#8AD5DC;border-color:transparent;text-shadow:none;} .nav-tabs,.nav-tabs>li>a{border-bottom:1px solid rgba(255, 255, 255, 0.5);} .nav-tabs>li>a{background-color:#3CB9C6;} .nav-tabs.nav-stacked li>a:first-child,.nav-tabs.nav-stacked li>a:last-child{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.nav-tabs.nav-stacked li>a,.nav-tabs.nav-stacked li>a:hover,.nav-tabs.nav-stacked li.active>a,.nav-tabs.nav-stacked li:active>a,.nav-tabs.nav-stacked li.active>a:hover,.nav-tabs.nav-stacked li:active>a:hover{border-color:transparent;} +.nav-tabs.nav-stacked li>a,.nav-tabs.nav-stacked li>a:hover,.nav-tabs.nav-stacked li.active>a,.nav-tabs.nav-stacked li.active>a:hover{border-color:transparent;} .nav-list .nav-header{text-shadow:none;color:rgba(255, 255, 255, 0.9);} .nav-list li>a{text-shadow:none;} -.nav-list li.active>a,.nav-list li:active>a,.nav-list li>a:hover,.nav-list li.active>a:hover,.nav-list li:active>a:hover{background-color:#8AD5DC;text-shadow:none;} +.nav-list li.active>a,.nav-list li>a:hover,.nav-list li.active>a:hover{background-color:#8AD5DC;text-shadow:none;} .nav-list .divider{background-color:rgba(255, 255, 255, 0.3);border-bottom:none;} .breadcrumb,.pager>li>a{border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;text-shadow:none;} .breadcrumb{background-color:#3CB9C6;background-image:none;}.breadcrumb li{text-shadow:none;} @@ -949,6 +949,7 @@ input,textarea,.search-query,.uneditable-input,.input-append input,.input-append .control-group.success>label,.control-group.success .help-inline{color:#93e08b;} .input-prepend .add-on,.input-append .add-on{height:20px;padding-top:4px;background-color:#dddddd;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;color:#555555;text-shadow:none;} .input-append .btn,.input-prepend .btn{padding:4px 10px;} +.alert h1,.alert h2,.alert h3,.alert h4,.alert h5,.alert h6{color:rgba(255, 255, 255, 0.9);} .alert,.label{border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;text-shadow:none;} .alert-heading{color:rgba(255, 255, 255, 0.9);} .label,.label:hover{background-color:#dddddd;text-shadow:none;color:#444444;} diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less index 4aac729..a844d2d 100755 --- a/amelia/bootswatch.less +++ b/amelia/bootswatch.less @@ -191,7 +191,8 @@ div.subnav { .nav > .active > a:hover, .nav > li > a:hover, - .nav > li.active > a:hover, { + .nav > .active > a, + .nav > .active > a:hover, { border-right-color: transparent; background-color: rgba(255, 255, 255, 0.4); color: @textColor; @@ -227,17 +228,13 @@ div.subnav { } li.active > a, - li:active > a, - li.active > a:hover, - li:active > a:hover { + li.active > a:hover { color: @textColor; } li.active > a, - li:active > a, li > a:hover, - li.active > a:hover, - li:active > a:hover { + li.active > a:hover { background-color: #8AD5DC; border-color: transparent; text-shadow: none; @@ -262,14 +259,13 @@ div.subnav { li > a, li > a:hover, li.active > a, - li:active > a, - li.active > a:hover, - li:active > a:hover { + li.active > a:hover { border-color: transparent; } } .nav-list { + .nav-header { text-shadow: none; color: @textColor; @@ -280,10 +276,8 @@ div.subnav { } li.active > a, - li:active > a, li > a:hover, - li.active > a:hover, - li:active > a:hover { + li.active > a:hover { background-color: #8AD5DC; text-shadow: none; } @@ -561,6 +555,13 @@ input, textarea, .search-query, .uneditable-input, // ALERTS, LABELS, BADGES // ----------------------------------------------------- +.alert { + + h1, h2, h3, h4, h5, h6 { + color: @textColor; + } +} + .alert, .label { border-color: transparent; .border-radius(0); diff --git a/cosmo/bootstrap.css b/cosmo/bootstrap.css index 544a5d5..7464ea3 100644 --- a/cosmo/bootstrap.css +++ b/cosmo/bootstrap.css @@ -5204,7 +5204,7 @@ div.subnav { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; - border-color: transparent; + border: none; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; @@ -5215,17 +5215,14 @@ div.subnav .nav { div.subnav .nav > li > a { border-color: transparent; } -div.subnav .nav > .active > a { +div.subnav .nav > .active > a, +div.subnav .nav > .active > a:hover { border-color: transparent; - background-color: transparent; + background-color: #000000; + color: #ffffff; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; - color: #080808; -} -div.subnav .nav > .active > a:hover { - background-color: #000000; - color: #ffffff; } div.subnav-fixed { top: 50px; diff --git a/cosmo/bootstrap.min.css b/cosmo/bootstrap.min.css index 08962ee..7135cc0 100644 --- a/cosmo/bootstrap.min.css +++ b/cosmo/bootstrap.min.css @@ -868,9 +868,9 @@ blockquote small{color:#bbbbbb;} .navbar-inverse .brand,.navbar-inverse .nav>li>a{text-shadow:none;} .navbar-inverse .brand:hover,.navbar-inverse .nav>.active>a,.navbar-inverse .nav>.active>a:hover,.navbar-inverse .nav>.active>a:focus{background-color:rgba(0, 0, 0, 0.05);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;color:#ffffff;} .navbar-inverse .navbar-search .search-query{color:#080808;} -div.subnav{background-color:#dfdfdf;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}div.subnav .nav{background-color:transparent;} +div.subnav{background-color:#dfdfdf;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}div.subnav .nav{background-color:transparent;} div.subnav .nav>li>a{border-color:transparent;} -div.subnav .nav>.active>a{border-color:transparent;background-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;color:#080808;}div.subnav .nav>.active>a:hover{background-color:#000000;color:#ffffff;} +div.subnav .nav>.active>a,div.subnav .nav>.active>a:hover{border-color:transparent;background-color:#000000;color:#ffffff;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} div.subnav-fixed{top:50px;} .nav .open .dropdown-toggle,.nav >li.dropdown.open.active>a:hover{color:#007fff;} .nav-tabs >li>a{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} diff --git a/cosmo/bootswatch.less b/cosmo/bootswatch.less index ae85b13..5f9756c 100644 --- a/cosmo/bootswatch.less +++ b/cosmo/bootswatch.less @@ -117,7 +117,7 @@ div.subnav { background-color: @grayLight; background-image: none; .box-shadow(none); - border-color: transparent; + border: none; .border-radius(0); .nav { @@ -128,17 +128,13 @@ div.subnav { border-color: transparent; } - .nav > .active > a { + .nav > .active > a, + .nav > .active > a:hover { border-color: transparent; - background-color: transparent; + background-color: @black; + color: @white; // border-left-width: 2px; .box-shadow(none); - color: @grayDarker; - - &:hover { - background-color: @black; - color: @white; - } } &-fixed { -- 2.39.2