Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
masonstrap
Commits
d1e89565
Commit
d1e89565
authored
Jul 29, 2013
by
Thomas Park
Browse files
cyborg: add inverse label and badge, fix table row warning, close #118
parent
0c2ed300
Changes
3
Hide whitespace changes
Inline
Side-by-side
cyborg/bootstrap.css
View file @
d1e89565
...
...
@@ -3,11 +3,11 @@
/*!
* Bootstrap v2.3.2
*
* Copyright 201
2
Twitter, Inc
* Copyright 201
3
Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world
@twitter
by @mdo and @fat.
* Designed and built with all the love in the world by @mdo and @fat.
*/
.clearfix
{
...
...
@@ -6836,6 +6836,11 @@ label {
background-color
:
#33b5e5
;
}
.table
tbody
tr
.warning
td
{
color
:
#ffffff
;
background-color
:
#ff8800
;
}
.dropdown-menu
{
-webkit-box-shadow
:
0
2px
4px
rgba
(
0
,
0
,
0
,
0.8
);
-moz-box-shadow
:
0
2px
4px
rgba
(
0
,
0
,
0
,
0.8
);
...
...
@@ -6857,6 +6862,15 @@ label {
border
:
none
;
}
.alert
h1
,
.alert
h2
,
.alert
h3
,
.alert
h4
,
.alert
h5
,
.alert
h6
{
color
:
#eeeeee
;
}
.label
{
color
:
#eeeeee
;
}
...
...
@@ -6880,7 +6894,8 @@ label {
background-color
:
#990000
;
}
.label-warning
{
.label-warning
,
.alert-warning
{
background-color
:
#cc6d00
;
}
...
...
@@ -6906,6 +6921,16 @@ label {
background-color
:
#004d66
;
}
.badge-inverse
,
.label-inverse
,
.alert-inverse
{
background-color
:
#7a29a3
;
}
.label-inverse
:hover
{
background-color
:
#5c1f7a
;
}
.well
,
.hero-unit
{
-webkit-border-radius
:
1px
;
...
...
cyborg/bootstrap.min.css
View file @
d1e89565
This source diff could not be displayed because it is too large. You can
view the blob
instead.
cyborg/bootswatch.less
View file @
d1e89565
...
...
@@ -468,6 +468,11 @@ legend, label {
background-color: @blue;
color: @white;
}
tbody tr.warning td {
background-color: @orange;
color: @white;
}
}
// DROPDOWNS
...
...
@@ -495,6 +500,12 @@ legend, label {
border: none;
}
.alert {
h1, h2, h3, h4, h5, h6 {
color: @grayLighter;
}
}
.label {
color: @grayLighter;
}
...
...
@@ -509,7 +520,7 @@ legend, label {
.label-important:hover { background-color: darken(@red, 10%); }
.label-warning { background-color: darken(@orange, 10%); }
.label-warning
, .alert-warning
{ background-color: darken(@orange, 10%); }
.label-warning:hover { background-color: darken(@orange, 20%); }
...
...
@@ -521,6 +532,12 @@ legend, label {
.label-info:hover { background-color: darken(@blueDark, 20%); }
.badge-inverse,
.label-inverse,
.alert-inverse { background-color: darken(@purple, 10%); }
.label-inverse:hover { background-color: darken(@purple, 20%); }
// MISC
// -----------------------------------------------------
...
...
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