diff options
| author | Jacob Thornton <[email protected]> | 2011-06-30 10:44:04 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-06-30 10:44:04 -0700 |
| commit | 9282876b443daed99cbfac10ff6adace8b916f6b (patch) | |
| tree | 106c9ceb1f9c55e7e1f6894abe5e65de4e65834c /lib | |
| parent | 518c882da08390d45194d318ab575ed10766a382 (diff) | |
| parent | 588b2da937dd5c34766863fba3a9daaf2276d900 (diff) | |
| download | bootstrap-9282876b443daed99cbfac10ff6adace8b916f6b.tar.xz bootstrap-9282876b443daed99cbfac10ff6adace8b916f6b.zip | |
Merge branch 'master' of http://git.local.twitter.com/bootstrap
Conflicts:
lib/bootstrap.less
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bootstrap.less | 21 | ||||
| -rw-r--r-- | lib/forms.less | 8 | ||||
| -rw-r--r-- | lib/scaffolding.less | 5 |
3 files changed, 16 insertions, 18 deletions
diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 4c69ef86d..834d95080 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -1,14 +1,13 @@ - /*! - * Bootstrap v0.0.1 - * - * Copyright 2011 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Made with love by two broheims, @mdo and @fat - * Date: {{ date }} - */ - +/*! + * Bootstrap v1.0.0 + * + * Copyright 2011 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + * Date: {{ date }} + */ // CSS Reset @import "reset.less"; diff --git a/lib/forms.less b/lib/forms.less index 6052978c6..ab82c6a09 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -62,7 +62,7 @@ form { line-height: @baseline; height: @baseline; color: @gray; - border: 1px solid #bbb; + border: 1px solid #ccc; .border-radius(3px); } select, @@ -85,13 +85,15 @@ form { select, textarea { @transition: border linear .2s, box-shadow linear .2s; .transition(@transition); + .box-shadow(inset 0 1px 3px rgba(0,0,0,.1)); } input[type=text]:focus, input[type=password]:focus, textarea:focus { outline: none; - border-color: rgba(82,168,236,.75); - .box-shadow(0 0 8px rgba(82,168,236,.5)); + border-color: rgba(82,168,236,.8); + @shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); + .box-shadow(@shadow); } // Error styles div.error { diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 4adfdeb79..ed73a996b 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -104,15 +104,12 @@ a { .opacity(65); cursor: default; } - &:focus { - - } &:active { @shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); } } -// Help Firefox not be a douche about adding extra padding to buttons +// Help Firefox not be a jerk about adding extra padding to buttons button.btn, input[type=submit].btn { &::-moz-focus-inner { |