Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
e0d60b13
Commit
e0d60b13
authored
Apr 21, 2013
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #7617: lowercase and dash gray color vars
parent
364f8330
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
49 additions
and
49 deletions
+49
-49
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+3
-3
less/badges.less
less/badges.less
+1
-1
less/breadcrumbs.less
less/breadcrumbs.less
+1
-1
less/buttons.less
less/buttons.less
+1
-1
less/code.less
less/code.less
+1
-1
less/dropdowns.less
less/dropdowns.less
+1
-1
less/forms.less
less/forms.less
+2
-2
less/labels.less
less/labels.less
+1
-1
less/navs.less
less/navs.less
+13
-13
less/pager.less
less/pager.less
+2
-2
less/pagination.less
less/pagination.less
+2
-2
less/type.less
less/type.less
+8
-8
less/variables.less
less/variables.less
+13
-13
No files found.
docs/assets/css/bootstrap.css
View file @
e0d60b13
...
@@ -3471,8 +3471,8 @@ button.close {
...
@@ -3471,8 +3471,8 @@ button.close {
.nav-pills .open .dropdown-toggle,
.nav-pills .open .dropdown-toggle,
.nav > li.dropdown.open.active > a:hover {
.nav > li.dropdown.open.active > a:hover {
color: #fff;
color: #fff;
background-color: @gray
L
ight;
background-color: @gray
-l
ight;
border-color: @gray
L
ight;
border-color: @gray
-l
ight;
}
}
.nav li.dropdown.open .caret,
.nav li.dropdown.open .caret,
.nav li.dropdown.open.active .caret,
.nav li.dropdown.open.active .caret,
...
@@ -3484,7 +3484,7 @@ button.close {
...
@@ -3484,7 +3484,7 @@ button.close {
// Dropdowns in stacked tabs
// Dropdowns in stacked tabs
.tabs-stacked .open > a:hover {
.tabs-stacked .open > a:hover {
border-color: @gray
L
ight;
border-color: @gray
-l
ight;
}
}
*/
*/
...
...
less/badges.less
View file @
e0d60b13
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
vertical-align: middle;
vertical-align: middle;
white-space: nowrap;
white-space: nowrap;
text-align: center;
text-align: center;
background-color: @gray
L
ight;
background-color: @gray
-l
ight;
border-radius: 10px;
border-radius: 10px;
// Empty labels/badges collapse
// Empty labels/badges collapse
...
...
less/breadcrumbs.less
View file @
e0d60b13
...
@@ -23,6 +23,6 @@
...
@@ -23,6 +23,6 @@
}
}
}
}
> .active {
> .active {
color: @gray
L
ight;
color: @gray
-l
ight;
}
}
}
}
less/buttons.less
View file @
e0d60b13
...
@@ -168,7 +168,7 @@ fieldset[disabled] .btn-link {
...
@@ -168,7 +168,7 @@ fieldset[disabled] .btn-link {
fieldset[disabled] & {
fieldset[disabled] & {
&:hover,
&:hover,
&:focus {
&:focus {
color: @gray
D
ark;
color: @gray
-d
ark;
text-decoration: none;
text-decoration: none;
}
}
}
}
...
...
less/code.less
View file @
e0d60b13
...
@@ -9,7 +9,7 @@ pre {
...
@@ -9,7 +9,7 @@ pre {
padding: 0 3px 2px;
padding: 0 3px 2px;
font-family: @font-family-monospace;
font-family: @font-family-monospace;
font-size: (@font-size-base - 2);
font-size: (@font-size-base - 2);
color: @gray
D
ark;
color: @gray
-d
ark;
border-radius: 4px;
border-radius: 4px;
}
}
...
...
less/dropdowns.less
View file @
e0d60b13
...
@@ -103,7 +103,7 @@
...
@@ -103,7 +103,7 @@
.dropdown-menu > .disabled > a,
.dropdown-menu > .disabled > a,
.dropdown-menu > .disabled > a:hover,
.dropdown-menu > .disabled > a:hover,
.dropdown-menu > .disabled > a:focus {
.dropdown-menu > .disabled > a:focus {
color: @gray
L
ight;
color: @gray
-l
ight;
}
}
// Nuke hover/focus effects
// Nuke hover/focus effects
.dropdown-menu > .disabled > a:hover,
.dropdown-menu > .disabled > a:hover,
...
...
less/forms.less
View file @
e0d60b13
...
@@ -23,7 +23,7 @@ legend {
...
@@ -23,7 +23,7 @@ legend {
margin-bottom: @line-height-base;
margin-bottom: @line-height-base;
font-size: (@font-size-base * 1.5);
font-size: (@font-size-base * 1.5);
line-height: (@line-height-base * 2);
line-height: (@line-height-base * 2);
color: @gray
D
ark;
color: @gray
-d
ark;
border: 0;
border: 0;
border-bottom: 1px solid #e5e5e5;
border-bottom: 1px solid #e5e5e5;
}
}
...
@@ -426,7 +426,7 @@ select:focus:invalid {
...
@@ -426,7 +426,7 @@ select:focus:invalid {
line-height: @line-height-base;
line-height: @line-height-base;
text-align: center;
text-align: center;
text-shadow: 0 1px 0 #fff;
text-shadow: 0 1px 0 #fff;
background-color: @gray
L
ighter;
background-color: @gray
-l
ighter;
border: 1px solid #ccc;
border: 1px solid #ccc;
&.input-small {
&.input-small {
...
...
less/labels.less
View file @
e0d60b13
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
vertical-align: middle;
vertical-align: middle;
white-space: nowrap;
white-space: nowrap;
text-align: center;
text-align: center;
background-color: @gray
L
ight;
background-color: @gray
-l
ight;
border-radius: .25em;
border-radius: .25em;
}
}
...
...
less/navs.less
View file @
e0d60b13
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
&:hover,
&:hover,
&:focus {
&:focus {
text-decoration: none;
text-decoration: none;
background-color: @gray
Lighter;
background-color: @gray
-lighter;
}
}
}
}
...
@@ -33,12 +33,12 @@
...
@@ -33,12 +33,12 @@
// Gray out text
// Gray out text
&.disabled > a {
&.disabled > a {
color: @gray
L
ight;
color: @gray
-l
ight;
}
}
// Nuke hover effects
// Nuke hover effects
&.disabled > a:hover,
&.disabled > a:hover,
&.disabled > a:focus {
&.disabled > a:focus {
color: @gray
L
ight;
color: @gray
-l
ight;
text-decoration: none;
text-decoration: none;
background-color: transparent;
background-color: transparent;
cursor: default;
cursor: default;
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
> .pull-right {
> .pull-right {
float: right;
float: right;
}
}
// Dividers (basically an hr) within the dropdown
// Dividers (basically an hr) within the dropdown
.divider {
.divider {
.nav-divider();
.nav-divider();
...
@@ -75,7 +75,7 @@
...
@@ -75,7 +75,7 @@
> li {
> li {
float: left;
float: left;
// Make the list-items overlay the bottom border
// Make the list-items overlay the bottom border
margin-bottom: -1px;
margin-bottom: -1px;
// Actual tabs (as links)
// Actual tabs (as links)
> a {
> a {
...
@@ -84,7 +84,7 @@
...
@@ -84,7 +84,7 @@
border: 1px solid transparent;
border: 1px solid transparent;
border-radius: @border-radius-base @border-radius-base 0 0;
border-radius: @border-radius-base @border-radius-base 0 0;
&:hover {
&:hover {
border-color: @gray
Lighter @grayL
ighter #ddd;
border-color: @gray
-lighter @gray-l
ighter #ddd;
}
}
}
}
...
@@ -96,7 +96,7 @@
...
@@ -96,7 +96,7 @@
background-color: @body-bg;
background-color: @body-bg;
border: 1px solid #ddd;
border: 1px solid #ddd;
border-bottom-color: transparent;
border-bottom-color: transparent;
cursor: default;
cursor: default;
}
}
}
}
// pulling this in mainly for less shorthand
// pulling this in mainly for less shorthand
...
@@ -128,7 +128,7 @@
...
@@ -128,7 +128,7 @@
&.active > a:hover,
&.active > a:hover,
&.active > a:focus {
&.active > a:focus {
color: #fff;
color: #fff;
background-color: @component-active-bg;
background-color: @component-active-bg;
}
}
}
}
}
}
...
@@ -141,7 +141,7 @@
...
@@ -141,7 +141,7 @@
+ li {
+ li {
> a {
> a {
margin-top: 2px;
margin-top: 2px;
margin-left: 0; // no need for this gap between nav items
margin-left: 0; // no need for this gap between nav items
}
}
}
}
}
}
...
@@ -186,7 +186,7 @@
...
@@ -186,7 +186,7 @@
font-size: 11px;
font-size: 11px;
font-weight: bold;
font-weight: bold;
line-height: @line-height-base;
line-height: @line-height-base;
color: @gray
L
ight;
color: @gray
-l
ight;
text-shadow: 0 1px 0 rgba(255,255,255,.5);
text-shadow: 0 1px 0 rgba(255,255,255,.5);
text-transform: uppercase;
text-transform: uppercase;
}
}
...
@@ -264,8 +264,8 @@
...
@@ -264,8 +264,8 @@
.nav-pills .open .dropdown-toggle,
.nav-pills .open .dropdown-toggle,
.nav > li.dropdown.open.active > a:hover {
.nav > li.dropdown.open.active > a:hover {
color: #fff;
color: #fff;
background-color: @gray
L
ight;
background-color: @gray
-l
ight;
border-color: @gray
L
ight;
border-color: @gray
-l
ight;
}
}
.nav li.dropdown.open .caret,
.nav li.dropdown.open .caret,
.nav li.dropdown.open.active .caret,
.nav li.dropdown.open.active .caret,
...
@@ -277,7 +277,7 @@
...
@@ -277,7 +277,7 @@
// Dropdowns in stacked tabs
// Dropdowns in stacked tabs
.tabs-stacked .open > a:hover {
.tabs-stacked .open > a:hover {
border-color: @gray
L
ight;
border-color: @gray
-l
ight;
}
}
*/
*/
less/pager.less
View file @
e0d60b13
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
float: right;
float: right;
}
}
}
}
.previous {
.previous {
> a,
> a,
> span {
> span {
...
@@ -45,7 +45,7 @@
...
@@ -45,7 +45,7 @@
> a:hover,
> a:hover,
> a:focus,
> a:focus,
> span {
> span {
color: @gray
L
ight;
color: @gray
-l
ight;
background-color: @pagination-bg;
background-color: @pagination-bg;
cursor: default;
cursor: default;
}
}
...
...
less/pagination.less
View file @
e0d60b13
...
@@ -27,14 +27,14 @@
...
@@ -27,14 +27,14 @@
}
}
.pagination > .active > a,
.pagination > .active > a,
.pagination > .active > span {
.pagination > .active > span {
color: @gray
L
ight;
color: @gray
-l
ight;
cursor: default;
cursor: default;
}
}
.pagination > .disabled > span,
.pagination > .disabled > span,
.pagination > .disabled > a,
.pagination > .disabled > a,
.pagination > .disabled > a:hover,
.pagination > .disabled > a:hover,
.pagination > .disabled > a:focus {
.pagination > .disabled > a:focus {
color: @gray
L
ight;
color: @gray
-l
ight;
background-color: @pagination-bg;
background-color: @pagination-bg;
cursor: default;
cursor: default;
}
}
...
...
less/type.less
View file @
e0d60b13
...
@@ -28,9 +28,9 @@ em { font-style: italic; }
...
@@ -28,9 +28,9 @@ em { font-style: italic; }
cite { font-style: normal; }
cite { font-style: normal; }
// Utility classes
// Utility classes
.text-muted { color: @gray
L
ight; }
.text-muted { color: @gray
-l
ight; }
a.text-muted:hover,
a.text-muted:hover,
a.text-muted:focus { color: darken(@gray
L
ight, 10%); }
a.text-muted:focus { color: darken(@gray
-l
ight, 10%); }
.text-warning { color: @state-warning-text; }
.text-warning { color: @state-warning-text; }
a.text-warning:hover,
a.text-warning:hover,
...
@@ -60,7 +60,7 @@ h1, h2, h3, h4, h5, h6,
...
@@ -60,7 +60,7 @@ h1, h2, h3, h4, h5, h6,
small {
small {
font-weight: normal;
font-weight: normal;
line-height: 1;
line-height: 1;
color: @gray
L
ight;
color: @gray
-l
ight;
}
}
}
}
...
@@ -100,7 +100,7 @@ h4 small, .h4 small { font-size: @font-size-base; }
...
@@ -100,7 +100,7 @@ h4 small, .h4 small { font-size: @font-size-base; }
.page-header {
.page-header {
padding-bottom: ((@line-height-base / 2) - 1);
padding-bottom: ((@line-height-base / 2) - 1);
margin: (@line-height-base * 2) 0 @line-height-base;
margin: (@line-height-base * 2) 0 @line-height-base;
border-bottom: 1px solid @gray
L
ighter;
border-bottom: 1px solid @gray
-l
ighter;
}
}
...
@@ -187,7 +187,7 @@ abbr[title],
...
@@ -187,7 +187,7 @@ abbr[title],
// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257
// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257
abbr[data-original-title] {
abbr[data-original-title] {
cursor: help;
cursor: help;
border-bottom: 1px dotted @gray
L
ight;
border-bottom: 1px dotted @gray
-l
ight;
}
}
abbr.initialism {
abbr.initialism {
font-size: 90%;
font-size: 90%;
...
@@ -198,7 +198,7 @@ abbr.initialism {
...
@@ -198,7 +198,7 @@ abbr.initialism {
blockquote {
blockquote {
padding: (@line-height-base/2) @line-height-base;
padding: (@line-height-base/2) @line-height-base;
margin: 0 0 @line-height-base;
margin: 0 0 @line-height-base;
border-left: 5px solid @gray
L
ighter;
border-left: 5px solid @gray
-l
ighter;
p {
p {
font-size: (@font-size-base * 1.25);
font-size: (@font-size-base * 1.25);
font-weight: 300;
font-weight: 300;
...
@@ -210,7 +210,7 @@ blockquote {
...
@@ -210,7 +210,7 @@ blockquote {
small {
small {
display: block;
display: block;
line-height: @line-height-base;
line-height: @line-height-base;
color: @gray
L
ight;
color: @gray
-l
ight;
&:before {
&:before {
content: '\2014 \00A0';
content: '\2014 \00A0';
}
}
...
@@ -221,7 +221,7 @@ blockquote {
...
@@ -221,7 +221,7 @@ blockquote {
float: right;
float: right;
padding-right: 15px;
padding-right: 15px;
padding-left: 0;
padding-left: 0;
border-right: 5px solid @gray
L
ighter;
border-right: 5px solid @gray
-l
ighter;
border-left: 0;
border-left: 0;
p,
p,
small {
small {
...
...
less/variables.less
View file @
e0d60b13
...
@@ -10,11 +10,11 @@
...
@@ -10,11 +10,11 @@
// Grays
// Grays
// -------------------------
// -------------------------
@gray
Darker: #222;
@gray
-darker: lighten(#000, 13.5%); // #222
@gray
Dark: #333;
@gray
-dark: lighten(#000, 20%); // #333
@gray:
#555;
@gray:
lighten(#000, 33.5%); // #555
@gray
Light: #999;
@gray
-light: lighten(#000, 60%); // #999
@gray
Lighter: #eee;
@gray
-lighter: lighten(#000, 93.5%); // #eee
// Brand colors
// Brand colors
// -------------------------
// -------------------------
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
// -------------------------
// -------------------------
@body-bg: #fff;
@body-bg: #fff;
@text-color: @gray
D
ark;
@text-color: @gray
-d
ark;
// Links
// Links
// -------------------------
// -------------------------
...
@@ -109,12 +109,12 @@
...
@@ -109,12 +109,12 @@
// -------------------------
// -------------------------
@input-bg: #fff;
@input-bg: #fff;
@input-bg-disabled: @gray
L
ighter;
@input-bg-disabled: @gray
-l
ighter;
@input-border: #ccc;
@input-border: #ccc;
@input-border-radius: @border-radius-base;
@input-border-radius: @border-radius-base;
@input-color-placeholder: @gray
L
ight;
@input-color-placeholder: @gray
-l
ight;
@input-height-base: (@line-height-base + 14px); // base line-height + 12px vertical padding + 2px top/bottom border
@input-height-base: (@line-height-base + 14px); // base line-height + 12px vertical padding + 2px top/bottom border
@input-height-large: (@line-height-base + 24px); // base line-height + 22px vertical padding + 2px top/bottom border
@input-height-large: (@line-height-base + 24px); // base line-height + 22px vertical padding + 2px top/bottom border
...
@@ -134,7 +134,7 @@
...
@@ -134,7 +134,7 @@
@dropdown-link-active-color: #fff;
@dropdown-link-active-color: #fff;
@dropdown-link-active-bg: @component-active-bg;
@dropdown-link-active-bg: @component-active-bg;
@dropdown-link-color: @gray
D
ark;
@dropdown-link-color: @gray
-d
ark;
@dropdown-link-hover-color: #fff;
@dropdown-link-hover-color: #fff;
@dropdown-link-hover-bg: @dropdown-link-active-bg;
@dropdown-link-hover-bg: @dropdown-link-active-bg;
...
@@ -184,11 +184,11 @@
...
@@ -184,11 +184,11 @@
@navbar-brand-hover-bg: transparent;
@navbar-brand-hover-bg: transparent;
// Inverted navbar
// Inverted navbar
@navbar-inverse-text: @gray
L
ight;
@navbar-inverse-text: @gray
-l
ight;
@navbar-inverse-bg: #222;
@navbar-inverse-bg: #222;
// Inverted navbar links
// Inverted navbar links
@navbar-inverse-link-color: @gray
L
ight;
@navbar-inverse-link-color: @gray
-l
ight;
@navbar-inverse-link-hover-color: #fff;
@navbar-inverse-link-hover-color: #fff;
@navbar-inverse-link-hover-bg: transparent;
@navbar-inverse-link-hover-bg: transparent;
@navbar-inverse-link-active-color: @navbar-inverse-link-hover-color;
@navbar-inverse-link-active-color: @navbar-inverse-link-hover-color;
...
@@ -220,7 +220,7 @@
...
@@ -220,7 +220,7 @@
// Jumbotron
// Jumbotron
// -------------------------
// -------------------------
@jumbotron-bg: @gray
L
ighter;
@jumbotron-bg: @gray
-l
ighter;
@jumbotron-heading-color: inherit;
@jumbotron-heading-color: inherit;
@jumbotron-lead-color: inherit;
@jumbotron-lead-color: inherit;
...
@@ -363,7 +363,7 @@
...
@@ -363,7 +363,7 @@
// -------------------------
// -------------------------
// Hr border color
// Hr border color
@hr-border: @gray
L
ighter;
@hr-border: @gray
-l
ighter;
// Horizontal forms & lists
// Horizontal forms & lists
@component-offset-horizontal: 180px;
@component-offset-horizontal: 180px;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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