diff options
| author | Mark Otto <[email protected]> | 2012-02-12 14:01:58 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-12 14:01:58 -0800 |
| commit | a9e469e75aba9edb6e4b0eb29f0a51dbef3167b7 (patch) | |
| tree | ab09b6370dc8fce74d06eed515a961bbb092e55f | |
| parent | 86b6ea4b5f2919c6dd962301b94af4e4096dbb16 (diff) | |
| download | bootstrap-a9e469e75aba9edb6e4b0eb29f0a51dbef3167b7.tar.xz bootstrap-a9e469e75aba9edb6e4b0eb29f0a51dbef3167b7.zip | |
add navbar background hover variable and fix uneditable-input with append/prepend controls
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 52750 -> 52755 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 1 | ||||
| -rw-r--r-- | less/forms.less | 1 | ||||
| -rw-r--r-- | less/navbar.less | 2 | ||||
| -rw-r--r-- | less/variables.less | 1 |
5 files changed, 4 insertions, 1 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 89446db2c..22be76caf 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a88db6685..b1a1d2611 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -913,6 +913,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec border-radius: 3px 0 0 3px; } .input-append .uneditable-input { + border-left-color: #eee; border-right-color: #ccc; } .input-append .add-on { diff --git a/less/forms.less b/less/forms.less index 81833b064..eb98f1bcb 100644 --- a/less/forms.less +++ b/less/forms.less @@ -395,6 +395,7 @@ select:focus:required:invalid { .border-radius(3px 0 0 3px); } .uneditable-input { + border-left-color: #eee; border-right-color: #ccc; } .add-on { diff --git a/less/navbar.less b/less/navbar.less index cd637acac..35c209fc4 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -194,7 +194,7 @@ } // Hover .navbar .nav > li > a:hover { - background-color: transparent; + background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active color: @navbarLinkColorHover; text-decoration: none; } diff --git a/less/variables.less b/less/variables.less index ced64d7cd..3d448ab21 100644 --- a/less/variables.less +++ b/less/variables.less @@ -68,6 +68,7 @@ @navbarHeight: 40px; @navbarBackground: @grayDarker; @navbarBackgroundHighlight: @grayDark; +@navbarLinkBackgroundHover: transparent; @navbarText: @grayLight; @navbarLinkColor: @grayLight; |