diff options
| author | Mark Otto <[email protected]> | 2013-08-05 16:03:10 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-05 16:03:10 -0700 |
| commit | 04dc22103706519dfc48c6634351a66a3218221f (patch) | |
| tree | db41dd228717589b7a67727913e1c5ddfe74bd83 /dist/css/bootstrap.css | |
| parent | 9bbe8a020a9082cbec011c8fae66bc5ffc8fe5bd (diff) | |
| parent | 1aedb7862ccf93bb983652bc24c11cc9f01699d3 (diff) | |
| download | bootstrap-04dc22103706519dfc48c6634351a66a3218221f.tar.xz bootstrap-04dc22103706519dfc48c6634351a66a3218221f.zip | |
Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip
Conflicts:
customize.html
less/alerts.less
less/badges.less
less/button-groups.less
less/buttons.less
less/carousel.less
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index b52b76790..23e2800af 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1713,7 +1713,7 @@ textarea.input-sm { padding: 6px 12px; margin-bottom: 0; font-size: 14px; - font-weight: 500; + font-weight: bold; line-height: 1.428571429; text-align: center; white-space: nowrap; @@ -1996,7 +1996,7 @@ fieldset[disabled] .btn-link { fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { - color: #333333; + color: #999999; text-decoration: none; } |