diff options
| author | Jacob Thornton <[email protected]> | 2011-07-02 10:47:25 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-07-02 10:47:25 -0700 |
| commit | e112d34b42d3ad23f662a646159f6266ab1b86ba (patch) | |
| tree | e8f06bd35b007c7895c5484d5cd9934daa544ee1 /lib | |
| parent | 088bfcc13a1f85557d12553a7942e3284c6ceae5 (diff) | |
| parent | 5992b4e0af8b65ecbd429ccb4c6809aaa50edbd9 (diff) | |
| download | bootstrap-e112d34b42d3ad23f662a646159f6266ab1b86ba.tar.xz bootstrap-e112d34b42d3ad23f662a646159f6266ab1b86ba.zip | |
Merge branch 'master' of http://git.local.twitter.com/bootstrap
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/forms.less | 9 | ||||
| -rw-r--r-- | lib/patterns.less | 10 |
2 files changed, 13 insertions, 6 deletions
diff --git a/lib/forms.less b/lib/forms.less index 74aa7a4df..4a1c359e3 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -79,6 +79,13 @@ form { border-color: #ccc; .box-shadow(inset 0 1px 2px rgba(0,0,0,.075)); } + // Placeholder text gets special styles; can't be bundled together though for some reason + :-moz-placeholder { + color: @grayLight; + } + ::-webkit-input-placeholder { + color: @grayLight; + } // Focus states input[type=text], input[type=password], @@ -229,7 +236,7 @@ div.input-append { height: 18px; text-align: center; text-shadow: 0 1px 0 #fff; - border: 1px solid #bbb; + border: 1px solid #ccc; border-right-width: 0; .border-radius(3px 0 0 3px); } diff --git a/lib/patterns.less b/lib/patterns.less index f3d431f53..3ce02ea10 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -515,7 +515,7 @@ div.twipsy { position: absolute; visibility: visible; padding: 5px; - font-size: 10px; + font-size: 11px; z-index: 100000; .opacity(80); &.above { @@ -540,8 +540,8 @@ div.twipsy { } &.below { .twipsy-arrow { - top:0; - left:50%; + top: 0; + left: 50%; margin-left: -5px; border-left: 5px solid transparent; border-right: 5px solid transparent; @@ -559,12 +559,12 @@ div.twipsy { } } .twipsy-inner { - padding: 5px 8px 4px; + padding: 3px 8px; background-color: #000; color: white; text-align: center; max-width: 200px; - text-decoration:none; + text-decoration: none; .border-radius(4px); } .twipsy-arrow { |