diff options
author | Thomas Park <thomas@thomaspark.me> | 2012-08-21 23:40:47 -0400 |
---|---|---|
committer | Thomas Park <thomas@thomaspark.me> | 2012-08-21 23:40:47 -0400 |
commit | 406630031a5f8c7b44c26f70534ead455fa69f7f (patch) | |
tree | b734071327a0c7b71d82e75bbeecabefc1e53e98 /readable/bootswatch.less | |
parent | 3a09fbc1f8933a47beadc9f56718f4eec58cc89e (diff) |
update to bootstrap 2.1.0
Diffstat (limited to 'readable/bootswatch.less')
-rwxr-xr-x | readable/bootswatch.less | 161 |
1 files changed, 70 insertions, 91 deletions
diff --git a/readable/bootswatch.less b/readable/bootswatch.less index 9ad0570d..98fe31b4 100755 --- a/readable/bootswatch.less +++ b/readable/bootswatch.less @@ -1,6 +1,6 @@ // Bootswatch.less // Swatch: Readable -// Version: 2.0.4 +// Version: 2.1.0 // ----------------------------------------------------- // TYPOGRAPHY @@ -39,37 +39,19 @@ small { // SCAFFOLDING // ----------------------------------------------------- -body { - padding-top: 20px !important; -} - .page-header { - padding-bottom: 1em; border-bottom: 2px solid @grayLighter; } -footer.footer { - padding-top: 2em; - padding-bottom: 3em; - border-top: 2px solid @grayLighter; -} - // NAVBAR // ----------------------------------------------------- .navbar { - margin-left: 16px; - - .navbar-inner { - .box-shadow(none); - } - .brand { - font-size: @baseFontSize; font-weight: bold; line-height: 1em; - padding: 11px 10px; + padding: 10px 15px; &:hover { color: @linkColorHover; @@ -78,52 +60,83 @@ footer.footer { .nav > li > a { text-shadow: none; - padding: 10px; + padding: 10px 15px 7px; } - .nav > li.active > a, - .open .dropdown-toggle { - color: @linkColor; + .nav > .active > a, + .nav > .active > a:hover, + .nav > .active > a:focus { + .box-shadow(none); } - .nav li.dropdown.active > .dropdown-toggle, - .nav li.dropdown.open > .dropdown-toggle, - .nav li.dropdown.active.open > .dropdown-toggle { - color: @linkColor; - - &:hover { - color: @linkColorHover; - } + .search-query { + border: 1px solid #D4D4D4; + .border-radius(0); + color: @textColor; + background-color: @white; } - .nav li.dropdown .dropdown-toggle .caret, - .nav li.dropdown.open .caret { - border-top-color: @linkColor; - opacity: 1; + .navbar-text { + margin: 10px 15px 0; + line-height: @baseLineHeight; } - .nav li.dropdown.open .dropdown-toggle:hover .caret { - border-top-color: @linkColorHover; + .divider-vertical { + border-right: 1px solid rgba(128, 128, 128, 0.3); + border-left: none; } - .search-query { - border: 1px solid #D4D4D4; - .border-radius(0); - color: @textColor; - background-color: @white; + .navbar-search { + margin-top: 7px; } -} -@media (max-width: 980px) { - form.navbar-form, form.navbar-search { - border-top: 1px solid #D4D4D4; - border-bottom: 1px solid #D4D4D4; + .nav-collapse.collapse { + + .nav li:first-child > a { + margin-bottom: 10px; + } + + .nav li > a { + color: @linkColor; + .border-radius(0); + font-weight: normal; + + &:hover { + background-color: rgba(0, 0, 0, 0.05); + color: @linkColorHover; + } + } + + .navbar-form, + .navbar-search { + border-top: 1px solid rgba(128, 128, 128, 0.2); + border-bottom: 1px solid rgba(128, 128, 128, 0.2); + } + + .nav-header { + color: @grayLight; + } } -} -.navbar-fixed-top { - position: static; - margin-bottom: 1.6em; + &-inverse { + + .brand:hover { + color: @white; + } + + .nav-collapse.collapse { + + .nav li > a { + color: @grayLighter; + } + + .nav li > a:hover { + background-color: rgba(0, 0, 0, 0.2); + color: @white; + } + } + + } } div.subnav { @@ -150,22 +163,6 @@ div.subnav { .box-shadow(none); background-color: transparent; } - -} - -div.subnav-fixed { - position: static; - left: auto; - width: 100%; - margin: 0; - .box-shadow(none); - .border-radius(4px); - border: 1px solid #E5E5E5; - - .nav { - width: auto; - padding: 0; - } } .dropdown-menu { @@ -178,27 +175,6 @@ div.subnav-fixed { } } -.navbar .nav-collapse.in { - - .nav li:first-child > a { - margin-bottom: 10px; - } - - .nav li > a { - color: @linkColor; - .border-radius(0); - font-weight: normal; - - &:hover { - color: @linkColorHover; - } - } - - .nav li > a:hover { - background: transparent; - } -} - // NAV // ----------------------------------------------------- @@ -292,11 +268,15 @@ div.subnav-fixed { margin-top: 3px; opacity: 0.8; } + + .divider { + margin: 1px; + } } .breadcrumb { .border-radius(0); - background-color: @white; + background-color: transparent; background-image: none; } @@ -453,7 +433,6 @@ select, input[type="file"] { .box-shadow(none); border: 1px solid #D4D4D4; .border-radius(0); - background-color: @white; } blockquote { |