Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <markotto@twitter.com>2012-03-11 04:15:54 +0400
committerMark Otto <markotto@twitter.com>2012-03-11 04:15:54 +0400
commita3e9fc547cca06da9b0a3449aa447436665b6fb9 (patch)
tree199635dac1df7a2bf8543172fe5aafd2081fe04e /less
parentf4ac080f9e9cdf5f762d44ce931453f5cf483358 (diff)
clean up search form in navbar, add new variable for placeholder text color
Diffstat (limited to 'less')
-rw-r--r--less/navbar.less21
-rw-r--r--less/variables.less2
2 files changed, 11 insertions, 12 deletions
diff --git a/less/navbar.less b/less/navbar.less
index 75ad1336de..0a4870ec3c 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -127,23 +127,20 @@
padding: 4px 9px;
#font > .sans-serif(13px, normal, 1);
color: @white;
- color: rgba(255,255,255,.75);
- background: #666;
- background: rgba(255,255,255,.3);
- border: 1px solid #111;
+ background-color: lighten(@navbarBackground, 25%);
+ border: 1px solid darken(@navbarBackground, 15%);
@shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
.box-shadow(@shadow);
.transition(none);
- // Placeholder text gets special styles; can't be bundled together though for some reason
- .placeholder(@grayLighter);
-
- // Hover states
- &:hover {
- color: @white;
- background-color: @grayLight;
- background-color: rgba(255,255,255,.5);
+ // Placeholder text gets special styles; can't be a grouped selector
+ &:-moz-placeholder {
+ color: @navbarSearchPlaceholderColor;
+ }
+ &::-webkit-input-placeholder {
+ color: @navbarSearchPlaceholderColor;
}
+
// Focus states (we use .focused since IE7-8 and down doesn't support :focus)
&:focus,
&.focused {
diff --git a/less/variables.less b/less/variables.less
index f3ba7122ac..6c251da566 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -149,6 +149,8 @@
@navbarLinkBackgroundHover: transparent;
@navbarLinkBackgroundActive: @navbarBackground;
+@navbarSearchPlaceholderColor: #ccc;
+
// Hero unit
// -------------------------