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
12a00f62
Commit
12a00f62
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
remove color variables, swap others were appropro
parent
0ef34770
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
docs/assets/css/bootstrap.css
+2
-2
docs/assets/css/bootstrap.css
docs/customize.html
+0
-15
docs/customize.html
docs/templates/pages/customize.mustache
+0
-15
docs/templates/pages/customize.mustache
less/forms.less
+2
-2
less/forms.less
less/labels-badges.less
+2
-2
less/labels-badges.less
less/progress-bars.less
+2
-2
less/progress-bars.less
less/variables.less
+0
-11
less/variables.less
with
8 additions
and
49 deletions
+8
-49
docs/assets/css/bootstrap.css
+
2
-
2
View file @
12a00f62
...
@@ -1435,8 +1435,8 @@ select:focus:invalid:focus {
...
@@ -1435,8 +1435,8 @@ select:focus:invalid:focus {
.input-append
.active
,
.input-append
.active
,
.input-prepend
.active
{
.input-prepend
.active
{
background-color
:
#
a9dba9
;
background-color
:
#
dff0d8
;
border-color
:
#46
a546
;
border-color
:
#46
8847
;
}
}
.input-prepend
.add-on
,
.input-prepend
.add-on
,
...
...
This diff is collapsed.
Click to expand it.
docs/customize.html
+
0
-
15
View file @
12a00f62
...
@@ -247,21 +247,6 @@
...
@@ -247,21 +247,6 @@
<input
type=
"text"
class=
"span3"
placeholder=
"#08c"
>
<input
type=
"text"
class=
"span3"
placeholder=
"#08c"
>
<label>
@link-color-hover
</label>
<label>
@link-color-hover
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"darken(@link-color, 15%)"
>
<input
type=
"text"
class=
"span3"
placeholder=
"darken(@link-color, 15%)"
>
<h3>
Colors
</h3>
<label>
@blue
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"#049cdb"
>
<label>
@green
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"#46a546"
>
<label>
@red
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"#9d261d"
>
<label>
@yellow
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"#ffc40d"
>
<label>
@orange
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"#f89406"
>
<label>
@pink
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"#c3325f"
>
<label>
@purple
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"#7a43b6"
>
<h3>
Sprites
</h3>
<h3>
Sprites
</h3>
<label>
@iconSpritePath
</label>
<label>
@iconSpritePath
</label>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/customize.mustache
+
0
-
15
View file @
12a00f62
...
@@ -179,21 +179,6 @@
...
@@ -179,21 +179,6 @@
<input
type=
"text"
class=
"span3"
placeholder=
"#08c"
>
<input
type=
"text"
class=
"span3"
placeholder=
"#08c"
>
<label>
@link-color-hover
</label>
<label>
@link-color-hover
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"darken(@link-color, 15%)"
>
<input
type=
"text"
class=
"span3"
placeholder=
"darken(@link-color, 15%)"
>
<h3>
{{
_i
}}
Colors
{{/
i
}}
</h3>
<label>
@blue
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"#049cdb"
>
<label>
@green
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"#46a546"
>
<label>
@red
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"#9d261d"
>
<label>
@yellow
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"#ffc40d"
>
<label>
@orange
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"#f89406"
>
<label>
@pink
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"#c3325f"
>
<label>
@purple
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"#7a43b6"
>
<h3>
{{
_i
}}
Sprites
{{/
i
}}
</h3>
<h3>
{{
_i
}}
Sprites
{{/
i
}}
</h3>
<label>
@iconSpritePath
</label>
<label>
@iconSpritePath
</label>
...
...
This diff is collapsed.
Click to expand it.
less/forms.less
+
2
-
2
View file @
12a00f62
...
@@ -479,8 +479,8 @@ select:focus:invalid {
...
@@ -479,8 +479,8 @@ select:focus:invalid {
border-radius: 0;
border-radius: 0;
}
}
.active {
.active {
background-color:
lighten(@green, 30)
;
background-color:
@successBackground
;
border-color: @
green
;
border-color: @
successText
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
less/labels-badges.less
+
2
-
2
View file @
12a00f62
...
@@ -53,8 +53,8 @@ a {
...
@@ -53,8 +53,8 @@ a {
&-danger { background-color: @errorText; }
&-danger { background-color: @errorText; }
&-danger[href] { background-color: darken(@errorText, 10%); }
&-danger[href] { background-color: darken(@errorText, 10%); }
// Warnings (orange)
// Warnings (orange)
&-warning { background-color:
@orange
; }
&-warning { background-color:
#f89406
; }
&-warning[href] { background-color: darken(
@orange
, 10%); }
&-warning[href] { background-color: darken(
#f89406
, 10%); }
// Success (green)
// Success (green)
&-success { background-color: @successText; }
&-success { background-color: @successText; }
&-success[href] { background-color: darken(@successText, 10%); }
&-success[href] { background-color: darken(@successText, 10%); }
...
...
This diff is collapsed.
Click to expand it.
less/progress-bars.less
+
2
-
2
View file @
12a00f62
...
@@ -115,8 +115,8 @@
...
@@ -115,8 +115,8 @@
// Warning (orange)
// Warning (orange)
.progress-warning .bar, .progress .bar-warning {
.progress-warning .bar, .progress .bar-warning {
#gradient > .vertical(lighten(
@orange
, 15%),
@orange
);
#gradient > .vertical(lighten(
#f89406
, 15%),
#f89406
);
}
}
.progress-warning.progress-striped .bar, .progress-striped .bar-warning {
.progress-warning.progress-striped .bar, .progress-striped .bar-warning {
#gradient > .striped(lighten(
@orange
, 15%));
#gradient > .striped(lighten(
#f89406
, 15%));
}
}
This diff is collapsed.
Click to expand it.
less/variables.less
+
0
-
11
View file @
12a00f62
...
@@ -17,17 +17,6 @@
...
@@ -17,17 +17,6 @@
@grayLighter: #eee;
@grayLighter: #eee;
// Accent colors
// -------------------------
@blue: #049cdb;
@green: #46a546;
@red: #9d261d;
@yellow: #ffc40d;
@orange: #f89406;
@pink: #c3325f;
@purple: #7a43b6;
// Scaffolding
// Scaffolding
// -------------------------
// -------------------------
...
...
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