Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
a3e9fc54
Commit
a3e9fc54
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
clean up search form in navbar, add new variable for placeholder text color
parent
f4ac080f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
docs/assets/bootstrap.zip
+0
-0
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
+6
-13
docs/assets/css/bootstrap.css
docs/download.html
+2
-0
docs/download.html
docs/templates/pages/download.mustache
+2
-0
docs/templates/pages/download.mustache
less/navbar.less
+9
-12
less/navbar.less
less/variables.less
+2
-0
less/variables.less
with
21 additions
and
25 deletions
+21
-25
docs/assets/bootstrap.zip
+
0
-
0
View file @
a3e9fc54
No preview for this file type
This diff is collapsed.
Click to expand it.
docs/assets/css/bootstrap.css
+
6
-
13
View file @
a3e9fc54
...
...
@@ -2881,10 +2881,8 @@ input[type="submit"].btn.btn-small {
font-weight
:
normal
;
line-height
:
1
;
color
:
#ffffff
;
color
:
rgba
(
255
,
255
,
255
,
0.75
);
background
:
#666
;
background
:
rgba
(
255
,
255
,
255
,
0.3
);
border
:
1px
solid
#111
;
background-color
:
#626262
;
border
:
1px
solid
#000000
;
-webkit-box-shadow
:
inset
0
1px
2px
rgba
(
0
,
0
,
0
,
0.1
),
0
1px
0px
rgba
(
255
,
255
,
255
,
0.15
);
-moz-box-shadow
:
inset
0
1px
2px
rgba
(
0
,
0
,
0
,
0.1
),
0
1px
0px
rgba
(
255
,
255
,
255
,
0.15
);
box-shadow
:
inset
0
1px
2px
rgba
(
0
,
0
,
0
,
0.1
),
0
1px
0px
rgba
(
255
,
255
,
255
,
0.15
);
...
...
@@ -2894,16 +2892,11 @@ input[type="submit"].btn.btn-small {
-o-transition
:
none
;
transition
:
none
;
}
.navbar-search
.search-query
:-moz-placeholder
{
color
:
#eeeeee
;
}
.navbar-search
.search-query
::-webkit-input-placeholder
{
color
:
#eeeeee
;
.navbar-search
.search-query
:-moz-placeholder
{
color
:
#cccccc
;
}
.navbar-search
.search-query
:hover
{
color
:
#ffffff
;
background-color
:
#999999
;
background-color
:
rgba
(
255
,
255
,
255
,
0.5
);
.navbar-search
.search-query
::-webkit-input-placeholder
{
color
:
#cccccc
;
}
.navbar-search
.search-query
:focus
,
.navbar-search
.search-query.focused
{
...
...
This diff is collapsed.
Click to expand it.
docs/download.html
+
2
-
0
View file @
a3e9fc54
...
...
@@ -327,6 +327,8 @@
<input
type=
"text"
class=
"span3"
placeholder=
"transparent"
>
<label>
@navbarLinkBackgroundActive
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"@navbarBackground"
>
<label>
@navbarSearchPlaceholderColor
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"#ccc"
>
<h3>
Dropdowns
</h3>
<label>
@dropdownBackground
</label>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/download.mustache
+
2
-
0
View file @
a3e9fc54
...
...
@@ -251,6 +251,8 @@
<input
type=
"text"
class=
"span3"
placeholder=
"transparent"
>
<label>
@navbarLinkBackgroundActive
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"@navbarBackground"
>
<label>
@navbarSearchPlaceholderColor
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"#ccc"
>
<h3>
{{
_i
}}
Dropdowns
{{/
i
}}
</h3>
<label>
@dropdownBackground
</label>
...
...
This diff is collapsed.
Click to expand it.
less/navbar.less
+
9
-
12
View file @
a3e9fc54
...
...
@@ -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 {
...
...
This diff is collapsed.
Click to expand it.
less/variables.less
+
2
-
0
View file @
a3e9fc54
...
...
@@ -149,6 +149,8 @@
@navbarLinkBackgroundHover: transparent;
@navbarLinkBackgroundActive: @navbarBackground;
@navbarSearchPlaceholderColor: #ccc;
// Hero unit
// -------------------------
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment