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
97816efd
Commit
97816efd
authored
Apr 03, 2012
by
Thomas Park
Browse files
amelia: color tweaks
parent
fa7ba513
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
amelia/bootstrap.css
View file @
97816efd
...
...
@@ -142,11 +142,11 @@ body {
background-color
:
#003f4d
;
}
a
{
color
:
#
fcdd3f
;
color
:
#
e8d069
;
text-decoration
:
none
;
}
a
:hover
{
color
:
#
fcdd3f
;
color
:
#
e8d069
;
text-decoration
:
underline
;
}
.row
{
...
...
@@ -1036,8 +1036,8 @@ select:focus:required:invalid:focus {
}
.input-prepend
.active
,
.input-append
.active
{
background-color
:
#
c5f086
;
border-color
:
#
7fc518
;
background-color
:
#
b8ebb3
;
border-color
:
#
48ca3b
;
}
.input-prepend
.add-on
,
.input-prepend
.btn
{
...
...
@@ -2148,16 +2148,16 @@ table .span24 {
background-color
:
#b25818
\
9
;
}
.btn-danger
{
background-color
:
#dbb
804
;
background-image
:
-moz-linear-gradient
(
top
,
#dbb
804
,
#dbb
804
);
background-image
:
-ms-linear-gradient
(
top
,
#dbb
804
,
#dbb
804
);
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
100%
,
from
(
#dbb
804
),
to
(
#dbb
804
));
background-image
:
-webkit-linear-gradient
(
top
,
#dbb
804
,
#dbb
804
);
background-image
:
-o-linear-gradient
(
top
,
#dbb
804
,
#dbb
804
);
background-image
:
linear-gradient
(
top
,
#dbb
804
,
#dbb
804
);
background-color
:
#d
e
bb
27
;
background-image
:
-moz-linear-gradient
(
top
,
#d
e
bb
27
,
#d
e
bb
27
);
background-image
:
-ms-linear-gradient
(
top
,
#d
e
bb
27
,
#d
e
bb
27
);
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
100%
,
from
(
#d
e
bb
27
),
to
(
#d
e
bb
27
));
background-image
:
-webkit-linear-gradient
(
top
,
#d
e
bb
27
,
#d
e
bb
27
);
background-image
:
-o-linear-gradient
(
top
,
#d
e
bb
27
,
#d
e
bb
27
);
background-image
:
linear-gradient
(
top
,
#d
e
bb
27
,
#d
e
bb
27
);
background-repeat
:
repeat-x
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#dbb
804
'
,
endColorstr
=
'#dbb
804
'
,
GradientType
=
0
);
border-color
:
#dbb
804
#dbb
804
#907902
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#d
e
bb
27
'
,
endColorstr
=
'#d
e
bb
27
'
,
GradientType
=
0
);
border-color
:
#d
e
bb
27
#d
e
bb
27
#a08618
;
border-color
:
rgba
(
0
,
0
,
0
,
0.1
)
rgba
(
0
,
0
,
0
,
0.1
)
rgba
(
0
,
0
,
0
,
0.25
);
filter
:
progid
:
dximagetransform
.
microsoft
.
gradient
(
enabled
=
false
);
}
...
...
@@ -2166,23 +2166,23 @@ table .span24 {
.btn-danger.active
,
.btn-danger.disabled
,
.btn-danger
[
disabled
]
{
background-color
:
#dbb
804
;
background-color
:
#d
e
bb
27
;
}
.btn-danger
:active
,
.btn-danger.active
{
background-color
:
#
a98e03
\
9
;
background-color
:
#
b6991c
\
9
;
}
.btn-success
{
background-color
:
#
7fc518
;
background-image
:
-moz-linear-gradient
(
top
,
#
7fc518
,
#7fc518
);
background-image
:
-ms-linear-gradient
(
top
,
#
7fc518
,
#7fc518
);
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
100%
,
from
(
#
7fc518
),
to
(
#
7fc518
));
background-image
:
-webkit-linear-gradient
(
top
,
#
7fc518
,
#7fc518
);
background-image
:
-o-linear-gradient
(
top
,
#
7fc518
,
#7fc518
);
background-image
:
linear-gradient
(
top
,
#
7fc518
,
#7fc518
);
background-color
:
#
48ca3b
;
background-image
:
-moz-linear-gradient
(
top
,
#
48ca3b
,
#48ca3b
);
background-image
:
-ms-linear-gradient
(
top
,
#
48ca3b
,
#48ca3b
);
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
100%
,
from
(
#
48ca3b
),
to
(
#
48ca3b
));
background-image
:
-webkit-linear-gradient
(
top
,
#
48ca3b
,
#48ca3b
);
background-image
:
-o-linear-gradient
(
top
,
#
48ca3b
,
#48ca3b
);
background-image
:
linear-gradient
(
top
,
#
48ca3b
,
#48ca3b
);
background-repeat
:
repeat-x
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#
7fc518
'
,
endColorstr
=
'#
7fc518
'
,
GradientType
=
0
);
border-color
:
#
7fc518
#7fc518
#538110
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#
48ca3b
'
,
endColorstr
=
'#
48ca3b
'
,
GradientType
=
0
);
border-color
:
#
48ca3b
#48ca3b
#319127
;
border-color
:
rgba
(
0
,
0
,
0
,
0.1
)
rgba
(
0
,
0
,
0
,
0.1
)
rgba
(
0
,
0
,
0
,
0.25
);
filter
:
progid
:
dximagetransform
.
microsoft
.
gradient
(
enabled
=
false
);
}
...
...
@@ -2191,11 +2191,11 @@ table .span24 {
.btn-success.active
,
.btn-success.disabled
,
.btn-success
[
disabled
]
{
background-color
:
#
7fc518
;
background-color
:
#
48ca3b
;
}
.btn-success
:active
,
.btn-success.active
{
background-color
:
#
629812
\
9
;
background-color
:
#
38a52d
\
9
;
}
.btn-info
{
background-color
:
#4d3a7d
;
...
...
@@ -2517,7 +2517,7 @@ input[type="submit"].btn.btn-mini {
.nav-list
>
.active
>
a
:hover
{
color
:
#ffffff
;
text-shadow
:
0
-1px
0
rgba
(
0
,
0
,
0
,
0.2
);
background-color
:
#
fcdd3f
;
background-color
:
#
e8d069
;
}
.nav-list
[
class
^=
"icon-"
]
{
margin-right
:
2px
;
...
...
@@ -2595,7 +2595,7 @@ input[type="submit"].btn.btn-mini {
.nav-pills
>
.active
>
a
,
.nav-pills
>
.active
>
a
:hover
{
color
:
#ffffff
;
background-color
:
#
fcdd3f
;
background-color
:
#
e8d069
;
}
.nav-stacked
>
li
{
float
:
none
;
...
...
@@ -2644,14 +2644,14 @@ input[type="submit"].btn.btn-mini {
}
.nav-tabs
.dropdown-toggle
.caret
,
.nav-pills
.dropdown-toggle
.caret
{
border-top-color
:
#
fcdd3f
;
border-bottom-color
:
#
fcdd3f
;
border-top-color
:
#
e8d069
;
border-bottom-color
:
#
e8d069
;
margin-top
:
6px
;
}
.nav-tabs
.dropdown-toggle
:hover
.caret
,
.nav-pills
.dropdown-toggle
:hover
.caret
{
border-top-color
:
#
fcdd3f
;
border-bottom-color
:
#
fcdd3f
;
border-top-color
:
#
e8d069
;
border-bottom-color
:
#
e8d069
;
}
.nav-tabs
.active
.dropdown-toggle
.caret
,
.nav-pills
.active
.dropdown-toggle
.caret
{
...
...
@@ -3551,7 +3551,7 @@ input[type="submit"].btn.btn-mini {
box-shadow
:
0
1px
1px
rgba
(
0
,
0
,
0
,
0.075
);
}
a
.thumbnail
:hover
{
border-color
:
#
fcdd3f
;
border-color
:
#
e8d069
;
-webkit-box-shadow
:
0
1px
4px
rgba
(
0
,
105
,
214
,
0.25
);
-moz-box-shadow
:
0
1px
4px
rgba
(
0
,
105
,
214
,
0.25
);
box-shadow
:
0
1px
4px
rgba
(
0
,
105
,
214
,
0.25
);
...
...
@@ -4238,7 +4238,7 @@ div.subnav-fixed {
background-color
:
#2d2249
\
9
;
}
.btn-success
{
background-color
:
#
7fc518
;
background-color
:
#
48ca3b
;
border-color
:
transparent
;
}
.btn-success
:hover
,
...
...
@@ -4246,19 +4246,19 @@ div.subnav-fixed {
.btn-success.active
,
.btn-success.disabled
,
.btn-success
[
disabled
]
{
background-color
:
#
70ae15
;
background-color
:
#
3eb932
;
text-shadow
:
none
;
}
.btn-success
:active
,
.btn-success.active
{
background-color
:
#
538110
;
background-color
:
#
319127
;
-webkit-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;
}
.btn-success
:active
,
.btn-success.active
{
background-color
:
#
538110
\
9
;
background-color
:
#
319127
\
9
;
}
.btn-warning
{
background-color
:
#df6e1e
;
...
...
@@ -4284,7 +4284,7 @@ div.subnav-fixed {
background-color
:
#9c4d15
\
9
;
}
.btn-danger
{
background-color
:
#dbb
804
;
background-color
:
#d
e
bb
27
;
border-color
:
transparent
;
}
.btn-danger
:hover
,
...
...
@@ -4292,19 +4292,19 @@ div.subnav-fixed {
.btn-danger.active
,
.btn-danger.disabled
,
.btn-danger
[
disabled
]
{
background-color
:
#c
2a303
;
background-color
:
#c
cab1f
;
text-shadow
:
none
;
}
.btn-danger
:active
,
.btn-danger.active
{
background-color
:
#
907902
;
background-color
:
#
a08618
;
-webkit-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;
}
.btn-danger
:active
,
.btn-danger.active
{
background-color
:
#
907902
\
9
;
background-color
:
#
a08618
\
9
;
}
.btn-inverse
{
background-color
:
#27666d
;
...
...
@@ -4401,11 +4401,11 @@ textarea,
}
.control-group.error
>
label
,
.control-group.error
.help-inline
{
color
:
#fde6
71
;
color
:
#
e
fde
9
6
;
}
.control-group.success
>
label
,
.control-group.success
.help-inline
{
color
:
#
afeb58
;
color
:
#
93e08b
;
}
.input-prepend
.add-on
,
.input-append
.add-on
{
...
...
@@ -4438,7 +4438,7 @@ textarea,
text-shadow
:
none
;
}
.breadcrumb
.divider
{
color
:
#
fcdd3f
;
color
:
#
e8d069
;
}
.pager
>
li
>
a
{
background-color
:
#3CB9C6
;
...
...
@@ -4459,7 +4459,7 @@ textarea,
}
.pagination
li
a
:hover
{
background-color
:
rgba
(
255
,
255
,
255
,
0.4
);
color
:
#
fcdd3f
;
color
:
#
e8d069
;
}
.pagination
.active
a
,
.pagination
.active
a
:hover
{
...
...
@@ -4476,7 +4476,7 @@ textarea,
.nav-tabs
.dropdown.open
>
.dropdown-toggle
,
.nav-pills
.dropdown.open
>
.dropdown-toggle
{
background-color
:
#8AD5DC
;
color
:
#
fcdd3f
;
color
:
#
e8d069
;
border-color
:
transparent
;
}
.nav-tabs
,
...
...
@@ -4608,13 +4608,13 @@ pre {
.label-important
,
.label-important
:hover
,
.alert-error
{
background-color
:
#d
bb804
;
background-color
:
#d
5b321
;
color
:
rgba
(
255
,
255
,
255
,
0.9
);
}
.label-success
,
.label-success
:hover
,
.alert-success
{
background-color
:
#
7fc518
;
background-color
:
#
48ca3b
;
color
:
rgba
(
255
,
255
,
255
,
0.9
);
}
.label-info
,
...
...
@@ -4652,10 +4652,10 @@ pre {
}
.progress-success
.bar
{
background-image
:
none
;
background-color
:
#
7fc518
;
background-color
:
#
48ca3b
;
}
.progress-success.progress-striped
.bar
{
background-color
:
#
7fc518
;
background-color
:
#
48ca3b
;
background-image
:
-webkit-gradient
(
linear
,
0
100%
,
100%
0
,
color-stop
(
0.25
,
rgba
(
255
,
255
,
255
,
0.15
)),
color-stop
(
0.25
,
transparent
),
color-stop
(
0.5
,
transparent
),
color-stop
(
0.5
,
rgba
(
255
,
255
,
255
,
0.15
)),
color-stop
(
0.75
,
rgba
(
255
,
255
,
255
,
0.15
)),
color-stop
(
0.75
,
transparent
),
to
(
transparent
));
background-image
:
-webkit-linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
background-image
:
-moz-linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
...
...
amelia/bootstrap.min.css
View file @
97816efd
This diff is collapsed.
Click to expand it.
amelia/variables.less
View file @
97816efd
...
...
@@ -25,9 +25,9 @@
// -------------------------
@blue: #00BCE1;
@blueDark: #1269B0;
@green: #
7FC518
;
@green: #
48CA3B
;
@red: #E51925;
@yellow: #
EAC504
;
@yellow: #
DEBB27
;
@orange: #DF6E1E;
@pink: #FFBCB9;
@purple: #4D3A7D;
...
...
@@ -83,8 +83,8 @@
@btnWarningBackground: @orange;
@btnWarningBackgroundHighlight: @orange;
@btnDangerBackground:
darken(
@yellow
, 3%)
;
@btnDangerBackgroundHighlight:
darken(
@yellow
, 3%)
;
@btnDangerBackground: @yellow;
@btnDangerBackgroundHighlight: @yellow;
@btnInverseBackground: #27666D;
@btnInverseBackgroundHighlight: #27666D;
...
...
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