diff options
| author | Jacob Thornton <[email protected]> | 2011-09-11 21:04:01 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-11 21:04:01 -0700 |
| commit | f8aaec5260a0a3bfe11c8f54b79ed0924a6c278b (patch) | |
| tree | 8bd6276872658feb9d5723433ba4b495d2e68fae /bootstrap-1.3.0.css | |
| parent | 200f5817ba7eb4c9ccafed3faad45b06ba89dfa7 (diff) | |
| parent | af2223efb1048c9b9dd53f7f2481646d731d0da7 (diff) | |
| download | bootstrap-f8aaec5260a0a3bfe11c8f54b79ed0924a6c278b.tar.xz bootstrap-f8aaec5260a0a3bfe11c8f54b79ed0924a6c278b.zip | |
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Diffstat (limited to 'bootstrap-1.3.0.css')
| -rw-r--r-- | bootstrap-1.3.0.css | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index 966ce6d2e..23eda7a42 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap-1.3.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Sep 11 19:59:57 PDT 2011 + * Date: Sun Sep 11 20:23:28 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1015,20 +1015,22 @@ textarea[readonly] { border-radius: 0 3px 3px 0; } .input-prepend .add-on, .input-append .add-on { - background: #f5f5f5; + position: relative; + z-index: 2; float: left; display: block; width: auto; min-width: 16px; + height: 18px; padding: 4px 4px 4px 5px; - color: #bfbfbf; + margin-right: -1px; font-weight: normal; line-height: 18px; - height: 18px; + color: #bfbfbf; text-align: center; text-shadow: 0 1px 0 #fff; + background-color: #f5f5f5; border: 1px solid #ccc; - border-right-width: 0; -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; @@ -1052,8 +1054,8 @@ textarea[readonly] { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; - border-right-width: 1px; - border-left-width: 0; + margin-right: 0; + margin-left: -1px; } .inputs-list { margin: 0 0 5px; @@ -1433,6 +1435,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { .topbar div > ul.secondary-nav .dropdown-menu, .nav.secondary-nav .dropdown-menu { right: 0; + border: 0; } .topbar div > ul a.menu:hover, .nav a.menu:hover, |