diff options
author | Thomas Park <thomas@thomaspark.me> | 2012-05-01 01:51:46 -0400 |
---|---|---|
committer | Thomas Park <thomas@thomaspark.me> | 2012-05-01 01:51:46 -0400 |
commit | f6bc5bee91809d50d1082743d9efc90ab25b81fb (patch) | |
tree | 3f458aa951ea9220974834c42e62509750b5c69b /cyborg/bootswatch.less | |
parent | f92ce0f8e3bf510ce012aa744f7e45263503812a (diff) |
Revert "all: update to 2.0.3"
This reverts commit f92ce0f8e3bf510ce012aa744f7e45263503812a.
Diffstat (limited to 'cyborg/bootswatch.less')
-rwxr-xr-x | cyborg/bootswatch.less | 154 |
1 files changed, 71 insertions, 83 deletions
diff --git a/cyborg/bootswatch.less b/cyborg/bootswatch.less index f856175f..8920e7eb 100755 --- a/cyborg/bootswatch.less +++ b/cyborg/bootswatch.less @@ -1,6 +1,6 @@ // Bootswatch.less // Swatch: Cyborg -// Version: 2.0.3 +// Version: 2.0.2 // ----------------------------------------------------- // TYPOGRAPHY @@ -30,6 +30,14 @@ label, input, button, select, textarea, font-weight: normal !important; } +blockquote { + border-left: 5px solid @blue; + + &.pull-right { + border-right: 5px solid @blue; + } +} + // SCAFFOLDING // ----------------------------------------------------- @@ -46,7 +54,8 @@ body { .navbar-inner { .border-radius(0); - .box-shadow(none); + @shadow: none; + .box-shadow(@shadow); border-bottom: 2px solid @blue } @@ -142,7 +151,7 @@ div.subnav .nav li.nav-header { color: @white; } -div.subnav .nav .open { +div.subnav .nav .dropdown.open { .dropdown-toggle { border: 0; @@ -179,83 +188,49 @@ div.subnav .nav .open { // NAVIGATION // ----------------------------------------------------- -.nav-list { - - li > a { - text-shadow: none; - } - - li > a:hover { - background-color: @blue; - color: @white; - } - - .nav-header { - text-shadow: none; - } - - .divider { - background-color: transparent; - border-bottom: 1px solid #222; - } +.nav-list > li > a, .nav-list .nav-header { + text-shadow: none; +} + +.nav-list li > a:hover, +.nav-tabs li > a:hover, +.nav-tabs li.active > a, +.nav-pills li > a:hover, +.nav-stacked li > a:hover, +.nav-stacked li.active > a { + background-color: @blue; + color: @white; } .nav-tabs { - border-bottom: 1px solid #222; - - li > a:hover, - li.active > a, - li.active > a:hover { - border: 1px solid #222; - background-color: @blue; - color: @white; - } - - .open .dropdown-toggle { - background-color: #060606 !important; - border: 1px solid #222; - } - - .dropdown-menu li > a:hover { - border: none; - } } -.nav-pills { +.nav-stacked > li > a, +.nav-tabs > li > a:hover, +.nav-tabs > .active > a, +.nav-tabs > .active > a:hover { + border: 1px solid #222 !important; +} - li > a:hover { - background-color: @blue; - color: @white; - } - - .open .dropdown-toggle { - background-color: #060606; - } - - .dropdown-menu li > a:hover { - border: none; - } +.nav.nav-tabs .active a:hover { + background-color: @blue; + color: @white; } -.nav-stacked { - - li > a { - border: 1px solid #222 !important; +.nav.nav-tabs .dropdown.open, +.nav.nav-pills .dropdown.open { + .dropdown-toggle { + background-color: #060606 !important; + border-top: 0; + border: 1px solid #222; } - li > a:hover, - li.active > a { - background-color: @blue; - color: @white; - } + .dropdown-menu li > a:hover { border-bottom: 0; } } -.tabbable { - .nav-tabs, - .nav-tabs li.active > a { - border-color: #222; - } +.tabbable .nav-tabs, .thumbnail { + border-color: #222; } .breadcrumb { @@ -295,6 +270,7 @@ div.subnav .nav .open { // ----------------------------------------------------- .btn { + .border-radius(3px); .box-shadow(1px 1px 2px #111); .buttonBackground(darken(@gray, 20%), darken(@gray, 30%)); color: @white; @@ -330,6 +306,27 @@ div.subnav .nav .open { .buttonBackground(lighten(@purple, 5%), @purple); } +.btn-group .btn:first-child { + -webkit-border-top-left-radius: 3px; + -moz-border-top-left-radius: 3px; + border-top-left-radius: 3px; + + -webkit-border-bottom-left-radius: 3px; + -moz-border-bottom-left-radius: 3px; + border-bottom-left-radius: 3px; +} + +.btn-group .btn:last-child, .btn-group .dropdown-toggle { + -webkit-border-top-right-radius: 3px; + -moz-border-top-right-radius: 3px; + border-top-right-radius: 3px; + + -webkit-border-bottom-right-radius: 3px; + -moz-border-bottom-right-radius: 3px; + border-bottom-right-radius: 3px; + +} + .btn .caret { border-top: 4px solid black; opacity: 0.3; @@ -382,6 +379,10 @@ select:focus { } .form-actions { + background: transparent; +} + +.form-actions, footer.footer { border-top: 1px solid #222; } @@ -412,7 +413,7 @@ select:focus { .border-radius(1px); } -code, pre { +code, pre, pre.prettyprint { background-color: @grayLighter; } @@ -422,18 +423,6 @@ code, pre { .box-shadow(0 2px 4px rgba(0,0,0,.8)); } -blockquote { - border-left: 5px solid @blue; - - &.pull-right { - border-right: 5px solid @blue; - } -} - -.thumbnail { - border-color: #222; -} - .progress { background-color: #060606; background-image: none; @@ -448,6 +437,7 @@ blockquote { .label:hover { background-color: darken(@gray, 30%); } + .label-important, .alert-danger, .alert-error { background-color: @red; } @@ -480,6 +470,4 @@ blockquote { border: none; } -footer.footer { - border-top: 1px solid #222; -} + |