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
c07632e4
Commit
c07632e4
authored
11 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Reorder button and table variants for consistent order
parent
107b334d
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
dist/css/bootstrap.css
+64
-64
dist/css/bootstrap.css
dist/css/bootstrap.min.css
+1
-1
dist/css/bootstrap.min.css
less/buttons.less
+4
-4
less/buttons.less
less/tables.less
+1
-1
less/tables.less
with
70 additions
and
70 deletions
+70
-70
dist/css/bootstrap.css
+
64
-
64
View file @
c07632e4
...
@@ -1767,24 +1767,6 @@ table th[class*="col-"] {
...
@@ -1767,24 +1767,6 @@ table th[class*="col-"] {
background-color
:
#d0e9c6
;
background-color
:
#d0e9c6
;
}
}
.table
>
thead
>
tr
>
.danger
,
.table
>
tbody
>
tr
>
.danger
,
.table
>
tfoot
>
tr
>
.danger
,
.table
>
thead
>
.danger
>
td
,
.table
>
tbody
>
.danger
>
td
,
.table
>
tfoot
>
.danger
>
td
,
.table
>
thead
>
.danger
>
th
,
.table
>
tbody
>
.danger
>
th
,
.table
>
tfoot
>
.danger
>
th
{
background-color
:
#f2dede
;
}
.table-hover
>
tbody
>
tr
>
.danger
:hover
,
.table-hover
>
tbody
>
.danger
:hover
>
td
,
.table-hover
>
tbody
>
.danger
:hover
>
th
{
background-color
:
#ebcccc
;
}
.table
>
thead
>
tr
>
.warning
,
.table
>
thead
>
tr
>
.warning
,
.table
>
tbody
>
tr
>
.warning
,
.table
>
tbody
>
tr
>
.warning
,
.table
>
tfoot
>
tr
>
.warning
,
.table
>
tfoot
>
tr
>
.warning
,
...
@@ -1803,6 +1785,24 @@ table th[class*="col-"] {
...
@@ -1803,6 +1785,24 @@ table th[class*="col-"] {
background-color
:
#faf2cc
;
background-color
:
#faf2cc
;
}
}
.table
>
thead
>
tr
>
.danger
,
.table
>
tbody
>
tr
>
.danger
,
.table
>
tfoot
>
tr
>
.danger
,
.table
>
thead
>
.danger
>
td
,
.table
>
tbody
>
.danger
>
td
,
.table
>
tfoot
>
.danger
>
td
,
.table
>
thead
>
.danger
>
th
,
.table
>
tbody
>
.danger
>
th
,
.table
>
tfoot
>
.danger
>
th
{
background-color
:
#f2dede
;
}
.table-hover
>
tbody
>
tr
>
.danger
:hover
,
.table-hover
>
tbody
>
.danger
:hover
>
td
,
.table-hover
>
tbody
>
.danger
:hover
>
th
{
background-color
:
#ebcccc
;
}
@media
(
max-width
:
767px
)
{
@media
(
max-width
:
767px
)
{
.table-responsive
{
.table-responsive
{
width
:
100%
;
width
:
100%
;
...
@@ -2393,6 +2393,52 @@ fieldset[disabled] .btn-primary.active {
...
@@ -2393,6 +2393,52 @@ fieldset[disabled] .btn-primary.active {
background-color
:
#ffffff
;
background-color
:
#ffffff
;
}
}
.btn-success
{
color
:
#ffffff
;
background-color
:
#5cb85c
;
border-color
:
#4cae4c
;
}
.btn-success
:hover
,
.btn-success
:focus
,
.btn-success
:active
,
.btn-success.active
,
.open
.dropdown-toggle.btn-success
{
color
:
#ffffff
;
background-color
:
#47a447
;
border-color
:
#398439
;
}
.btn-success
:active
,
.btn-success.active
,
.open
.dropdown-toggle.btn-success
{
background-image
:
none
;
}
.btn-success.disabled
,
.btn-success
[
disabled
],
fieldset
[
disabled
]
.btn-success
,
.btn-success.disabled
:hover
,
.btn-success
[
disabled
]
:hover
,
fieldset
[
disabled
]
.btn-success
:hover
,
.btn-success.disabled
:focus
,
.btn-success
[
disabled
]
:focus
,
fieldset
[
disabled
]
.btn-success
:focus
,
.btn-success.disabled
:active
,
.btn-success
[
disabled
]
:active
,
fieldset
[
disabled
]
.btn-success
:active
,
.btn-success.disabled.active
,
.btn-success
[
disabled
]
.active
,
fieldset
[
disabled
]
.btn-success.active
{
background-color
:
#5cb85c
;
border-color
:
#4cae4c
;
}
.btn-success
.badge
{
color
:
#5cb85c
;
background-color
:
#ffffff
;
}
.btn-warning
{
.btn-warning
{
color
:
#ffffff
;
color
:
#ffffff
;
background-color
:
#f0ad4e
;
background-color
:
#f0ad4e
;
...
@@ -2485,52 +2531,6 @@ fieldset[disabled] .btn-danger.active {
...
@@ -2485,52 +2531,6 @@ fieldset[disabled] .btn-danger.active {
background-color
:
#ffffff
;
background-color
:
#ffffff
;
}
}
.btn-success
{
color
:
#ffffff
;
background-color
:
#5cb85c
;
border-color
:
#4cae4c
;
}
.btn-success
:hover
,
.btn-success
:focus
,
.btn-success
:active
,
.btn-success.active
,
.open
.dropdown-toggle.btn-success
{
color
:
#ffffff
;
background-color
:
#47a447
;
border-color
:
#398439
;
}
.btn-success
:active
,
.btn-success.active
,
.open
.dropdown-toggle.btn-success
{
background-image
:
none
;
}
.btn-success.disabled
,
.btn-success
[
disabled
],
fieldset
[
disabled
]
.btn-success
,
.btn-success.disabled
:hover
,
.btn-success
[
disabled
]
:hover
,
fieldset
[
disabled
]
.btn-success
:hover
,
.btn-success.disabled
:focus
,
.btn-success
[
disabled
]
:focus
,
fieldset
[
disabled
]
.btn-success
:focus
,
.btn-success.disabled
:active
,
.btn-success
[
disabled
]
:active
,
fieldset
[
disabled
]
.btn-success
:active
,
.btn-success.disabled.active
,
.btn-success
[
disabled
]
.active
,
fieldset
[
disabled
]
.btn-success.active
{
background-color
:
#5cb85c
;
border-color
:
#4cae4c
;
}
.btn-success
.badge
{
color
:
#5cb85c
;
background-color
:
#ffffff
;
}
.btn-info
{
.btn-info
{
color
:
#ffffff
;
color
:
#ffffff
;
background-color
:
#5bc0de
;
background-color
:
#5bc0de
;
...
...
This diff is collapsed.
Click to expand it.
dist/css/bootstrap.min.css
+
1
-
1
View file @
c07632e4
This diff is collapsed.
Click to expand it.
less/buttons.less
+
4
-
4
View file @
c07632e4
...
@@ -56,6 +56,10 @@
...
@@ -56,6 +56,10 @@
.btn-primary {
.btn-primary {
.button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);
.button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);
}
}
// Success appears as green
.btn-success {
.button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);
}
// Warning appears as orange
// Warning appears as orange
.btn-warning {
.btn-warning {
.button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);
.button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);
...
@@ -64,10 +68,6 @@
...
@@ -64,10 +68,6 @@
.btn-danger {
.btn-danger {
.button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);
.button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);
}
}
// Success appears as green
.btn-success {
.button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);
}
// Info appears as blue-green
// Info appears as blue-green
.btn-info {
.btn-info {
.button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);
.button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);
...
...
This diff is collapsed.
Click to expand it.
less/tables.less
+
1
-
1
View file @
c07632e4
...
@@ -156,8 +156,8 @@ table {
...
@@ -156,8 +156,8 @@ table {
// Generate the contextual variants
// Generate the contextual variants
.table-row-variant(active; @table-bg-active);
.table-row-variant(active; @table-bg-active);
.table-row-variant(success; @state-success-bg);
.table-row-variant(success; @state-success-bg);
.table-row-variant(danger; @state-danger-bg);
.table-row-variant(warning; @state-warning-bg);
.table-row-variant(warning; @state-warning-bg);
.table-row-variant(danger; @state-danger-bg);
// Responsive tables
// Responsive tables
...
...
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