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
e9b46a94
Commit
e9b46a94
authored
Dec 27, 2012
by
Thomas Park
Browse files
amelia, cosmo: fixes #53
parent
8dab462d
Changes
6
Hide whitespace changes
Inline
Side-by-side
amelia/bootstrap.css
View file @
e9b46a94
...
...
@@ -5277,7 +5277,8 @@ div.subnav .nav > .active > a {
}
div
.subnav
.nav
>
.active
>
a
:hover
,
div
.subnav
.nav
>
li
>
a
:hover
,
div.subnav .nav > li.active > a:hover {
div
.subnav
.nav
>
.active
>
a
,
div
.subnav
.nav
>
.active
>
a
:hover
{
border-right-color
:
transparent
;
background-color
:
rgba
(
255
,
255
,
255
,
0.4
);
color
:
rgba
(
255
,
255
,
255
,
0.9
);
...
...
@@ -5311,24 +5312,16 @@ div.subnav-fixed {
}
.nav-tabs
li
.active
>
a
,
.nav-pills
li
.active
>
a
,
.nav-tabs li:active > a,
.nav-pills li:active > a,
.nav-tabs
li
.active
>
a
:hover
,
.nav-pills li.active > a:hover,
.nav-tabs li:active > a:hover,
.nav-pills li:active > a:hover {
.nav-pills
li
.active
>
a
:hover
{
color
:
rgba
(
255
,
255
,
255
,
0.9
);
}
.nav-tabs
li
.active
>
a
,
.nav-pills
li
.active
>
a
,
.nav-tabs li:active > a,
.nav-pills li:active > a,
.nav-tabs
li
>
a
:hover
,
.nav-pills
li
>
a
:hover
,
.nav-tabs
li
.active
>
a
:hover
,
.nav-pills li.active > a:hover,
.nav-tabs li:active > a:hover,
.nav-pills li:active > a:hover {
.nav-pills
li
.active
>
a
:hover
{
background-color
:
#8AD5DC
;
border-color
:
transparent
;
text-shadow
:
none
;
...
...
@@ -5349,9 +5342,7 @@ div.subnav-fixed {
.nav-tabs.nav-stacked
li
>
a
,
.nav-tabs.nav-stacked
li
>
a
:hover
,
.nav-tabs.nav-stacked
li
.active
>
a
,
.nav-tabs.nav-stacked li:active > a,
.nav-tabs.nav-stacked li.active > a:hover,
.nav-tabs.nav-stacked li:active > a:hover {
.nav-tabs.nav-stacked
li
.active
>
a
:hover
{
border-color
:
transparent
;
}
.nav-list
.nav-header
{
...
...
@@ -5362,10 +5353,8 @@ div.subnav-fixed {
text-shadow
:
none
;
}
.nav-list
li
.active
>
a
,
.nav-list li:active > a,
.nav-list
li
>
a
:hover
,
.nav-list li.active > a:hover,
.nav-list li:active > a:hover {
.nav-list
li
.active
>
a
:hover
{
background-color
:
#8AD5DC
;
text-shadow
:
none
;
}
...
...
@@ -5749,6 +5738,14 @@ textarea,
.input-prepend
.btn
{
padding
:
4px
10px
;
}
.alert
h1
,
.alert
h2
,
.alert
h3
,
.alert
h4
,
.alert
h5
,
.alert
h6
{
color
:
rgba
(
255
,
255
,
255
,
0.9
);
}
.alert
,
.label
{
border-color
:
transparent
;
...
...
amelia/bootstrap.min.css
View file @
e9b46a94
...
...
@@ -875,20 +875,20 @@ hr{border-bottom:1px solid rgba(255, 255, 255, 0.3);}
div
.subnav
.nav
>
li
>
a
{
color
:
rgba
(
255
,
255
,
255
,
0.9
);
border-color
:
transparent
;}
div
.subnav
.nav
>
li
:first-child
>
a
,
div
.subnav
.nav
>
li
:first-child
>
a
:hover
{
-webkit-border-radius
:
0
;
-moz-border-radius
:
0
;
border-radius
:
0
;}
div
.subnav
.nav
>
.active
>
a
{
background-color
:
transparent
;
border-color
:
transparent
;
color
:
rgba
(
255
,
255
,
255
,
0.9
);
-webkit-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;}
div
.subnav
.nav
>
.active
>
a
:hover
,
div
.subnav
.nav
>
li
>
a
:hover
,
div
.subnav
.nav
>
li
.active
>
a
:hover
{
border-right-color
:
transparent
;
background-color
:
rgba
(
255
,
255
,
255
,
0.4
);
color
:
rgba
(
255
,
255
,
255
,
0.9
);}
div
.subnav
.nav
>
.active
>
a
:hover
,
div
.subnav
.nav
>
li
>
a
:hover
,
div
.subnav
.nav
>
.active
>
a
,
div
.subnav
.nav
>
.active
>
a
:hover
{
border-right-color
:
transparent
;
background-color
:
rgba
(
255
,
255
,
255
,
0.4
);
color
:
rgba
(
255
,
255
,
255
,
0.9
);}
div
.subnav
.nav
>
li
:first-child
>
a
:hover
{
border-left-color
:
rgba
(
255
,
255
,
255
,
0.4
);
border-left-width
:
1px
;}
div
.subnav-fixed
{
top
:
50px
;}
.nav-tabs
li
.open
>
.dropdown-toggle
,
.nav-pills
li
.open
>
.dropdown-toggle
{
background-color
:
#8AD5DC
;
color
:
#e8d069
;
border-color
:
transparent
;}
.nav-tabs
,
.nav-pills
{
border-color
:
transparent
;}
.nav-tabs
li
>
a
,
.nav-pills
li
>
a
{
border-color
:
transparent
;
-webkit-border-radius
:
0
;
-moz-border-radius
:
0
;
border-radius
:
0
;
-webkit-box-shadow
:
0
;
-moz-box-shadow
:
0
;
box-shadow
:
0
;}
.nav-tabs
li
.active
>
a
,
.nav-pills
li
.active
>
a
,
.nav-tabs
li
:active
>
a
,
.nav-pills
li
:active
>
a
,
.nav-tabs
li
.active
>
a
:hover
,
.nav-pills
li
.active
>
a
:hover
,
.nav-tabs
li
:active
>
a
:hover
,
.nav-pills
li
:
active
>
a
:hover
{
color
:
rgba
(
255
,
255
,
255
,
0.9
);}
.nav-tabs
li
.active
>
a
,
.nav-pills
li
.active
>
a
,
.nav-tabs
li
:active
>
a
,
.nav-pills
li
:active
>
a
,
.nav-tabs
li
>
a
:hover
,
.nav-pills
li
>
a
:hover
,
.nav-tabs
li
.active
>
a
:hover
,
.nav-pills
li
.active
>
a
:hover
,
.nav-tabs
li
:active
>
a
:hover
,
.nav-pills
li
:active
>
a
:hover
{
background-color
:
#8AD5DC
;
border-color
:
transparent
;
text-shadow
:
none
;}
.nav-tabs
li
.active
>
a
,
.nav-pills
li
.active
>
a
,
.nav-tabs
li
.active
>
a
:hover
,
.nav-pills
li
.
active
>
a
:hover
{
color
:
rgba
(
255
,
255
,
255
,
0.9
);}
.nav-tabs
li
.active
>
a
,
.nav-pills
li
.active
>
a
,
.nav-tabs
li
>
a
:hover
,
.nav-pills
li
>
a
:hover
,
.nav-tabs
li
.active
>
a
:hover
,
.nav-pills
li
.active
>
a
:hover
{
background-color
:
#8AD5DC
;
border-color
:
transparent
;
text-shadow
:
none
;}
.nav-tabs
,
.nav-tabs
>
li
>
a
{
border-bottom
:
1px
solid
rgba
(
255
,
255
,
255
,
0.5
);}
.nav-tabs
>
li
>
a
{
background-color
:
#3CB9C6
;}
.nav-tabs.nav-stacked
li
>
a
:first-child
,
.nav-tabs.nav-stacked
li
>
a
:last-child
{
-webkit-border-radius
:
0
;
-moz-border-radius
:
0
;
border-radius
:
0
;}
.nav-tabs.nav-stacked
li
>
a
,
.nav-tabs.nav-stacked
li
>
a
:hover
,
.nav-tabs.nav-stacked
li
.active
>
a
,
.nav-tabs.nav-stacked
li
:active
>
a
,
.nav-tabs.nav-stacked
li
.active
>
a
:hover
,
.nav-tabs.nav-stacked
li
:
active
>
a
:hover
{
border-color
:
transparent
;}
.nav-tabs.nav-stacked
li
>
a
,
.nav-tabs.nav-stacked
li
>
a
:hover
,
.nav-tabs.nav-stacked
li
.active
>
a
,
.nav-tabs.nav-stacked
li
.
active
>
a
:hover
{
border-color
:
transparent
;}
.nav-list
.nav-header
{
text-shadow
:
none
;
color
:
rgba
(
255
,
255
,
255
,
0.9
);}
.nav-list
li
>
a
{
text-shadow
:
none
;}
.nav-list
li
.active
>
a
,
.nav-list
li
:active
>
a
,
.nav-list
li
>
a
:hover
,
.nav-list
li
.active
>
a
:hover
,
.nav-list
li
:
active
>
a
:hover
{
background-color
:
#8AD5DC
;
text-shadow
:
none
;}
.nav-list
li
.active
>
a
,
.nav-list
li
>
a
:hover
,
.nav-list
li
.
active
>
a
:hover
{
background-color
:
#8AD5DC
;
text-shadow
:
none
;}
.nav-list
.divider
{
background-color
:
rgba
(
255
,
255
,
255
,
0.3
);
border-bottom
:
none
;}
.breadcrumb
,
.pager
>
li
>
a
{
border-color
:
transparent
;
-webkit-border-radius
:
0
;
-moz-border-radius
:
0
;
border-radius
:
0
;
-webkit-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;
text-shadow
:
none
;}
.breadcrumb
{
background-color
:
#3CB9C6
;
background-image
:
none
;}
.breadcrumb
li
{
text-shadow
:
none
;}
...
...
@@ -949,6 +949,7 @@ input,textarea,.search-query,.uneditable-input,.input-append input,.input-append
.control-group.success
>
label
,
.control-group.success
.help-inline
{
color
:
#93e08b
;}
.input-prepend
.add-on
,
.input-append
.add-on
{
height
:
20px
;
padding-top
:
4px
;
background-color
:
#dddddd
;
border-color
:
transparent
;
-webkit-border-radius
:
0
;
-moz-border-radius
:
0
;
border-radius
:
0
;
color
:
#555555
;
text-shadow
:
none
;}
.input-append
.btn
,
.input-prepend
.btn
{
padding
:
4px
10px
;}
.alert
h1
,
.alert
h2
,
.alert
h3
,
.alert
h4
,
.alert
h5
,
.alert
h6
{
color
:
rgba
(
255
,
255
,
255
,
0.9
);}
.alert
,
.label
{
border-color
:
transparent
;
-webkit-border-radius
:
0
;
-moz-border-radius
:
0
;
border-radius
:
0
;
-webkit-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;
text-shadow
:
none
;}
.alert-heading
{
color
:
rgba
(
255
,
255
,
255
,
0.9
);}
.label
,
.label
:hover
{
background-color
:
#dddddd
;
text-shadow
:
none
;
color
:
#444444
;}
...
...
amelia/bootswatch.less
View file @
e9b46a94
...
...
@@ -191,7 +191,8 @@ div.subnav {
.nav > .active > a:hover,
.nav > li > a:hover,
.nav > li.active > a:hover, {
.nav > .active > a,
.nav > .active > a:hover, {
border-right-color: transparent;
background-color: rgba(255, 255, 255, 0.4);
color: @textColor;
...
...
@@ -227,17 +228,13 @@ div.subnav {
}
li.active > a,
li:active > a,
li.active > a:hover,
li:active > a:hover {
li.active > a:hover {
color: @textColor;
}
li.active > a,
li:active > a,
li > a:hover,
li.active > a:hover,
li:active > a:hover {
li.active > a:hover {
background-color: #8AD5DC;
border-color: transparent;
text-shadow: none;
...
...
@@ -262,14 +259,13 @@ div.subnav {
li > a,
li > a:hover,
li.active > a,
li:active > a,
li.active > a:hover,
li:active > a:hover {
li.active > a:hover {
border-color: transparent;
}
}
.nav-list {
.nav-header {
text-shadow: none;
color: @textColor;
...
...
@@ -280,10 +276,8 @@ div.subnav {
}
li.active > a,
li:active > a,
li > a:hover,
li.active > a:hover,
li:active > a:hover {
li.active > a:hover {
background-color: #8AD5DC;
text-shadow: none;
}
...
...
@@ -561,6 +555,13 @@ input, textarea, .search-query, .uneditable-input,
// ALERTS, LABELS, BADGES
// -----------------------------------------------------
.alert {
h1, h2, h3, h4, h5, h6 {
color: @textColor;
}
}
.alert, .label {
border-color: transparent;
.border-radius(0);
...
...
cosmo/bootstrap.css
View file @
e9b46a94
...
...
@@ -5204,7 +5204,7 @@ div.subnav {
-webkit-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;
border
-color
:
transparent
;
border
:
none
;
-webkit-border-radius
:
0
;
-moz-border-radius
:
0
;
border-radius
:
0
;
...
...
@@ -5215,17 +5215,14 @@ div.subnav .nav {
div
.subnav
.nav
>
li
>
a
{
border-color
:
transparent
;
}
div
.subnav
.nav
>
.active
>
a
{
div
.subnav
.nav
>
.active
>
a
,
div
.subnav
.nav
>
.active
>
a
:hover
{
border-color
:
transparent
;
background-color
:
transparent
;
background-color
:
#000000
;
color
:
#ffffff
;
-webkit-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;
color
:
#080808
;
}
div
.subnav
.nav
>
.active
>
a
:hover
{
background-color
:
#000000
;
color
:
#ffffff
;
}
div
.subnav-fixed
{
top
:
50px
;
...
...
cosmo/bootstrap.min.css
View file @
e9b46a94
...
...
@@ -868,9 +868,9 @@ blockquote small{color:#bbbbbb;}
.navbar-inverse
.brand
,
.navbar-inverse
.nav
>
li
>
a
{
text-shadow
:
none
;}
.navbar-inverse
.brand
:hover
,
.navbar-inverse
.nav
>
.active
>
a
,
.navbar-inverse
.nav
>
.active
>
a
:hover
,
.navbar-inverse
.nav
>
.active
>
a
:focus
{
background-color
:
rgba
(
0
,
0
,
0
,
0.05
);
-webkit-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;
color
:
#ffffff
;}
.navbar-inverse
.navbar-search
.search-query
{
color
:
#080808
;}
div
.subnav
{
background-color
:
#dfdfdf
;
background-image
:
none
;
-webkit-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;
border
-color
:
transparent
;
-webkit-border-radius
:
0
;
-moz-border-radius
:
0
;
border-radius
:
0
;}
div
.subnav
.nav
{
background-color
:
transparent
;}
div
.subnav
{
background-color
:
#dfdfdf
;
background-image
:
none
;
-webkit-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;
border
:
none
;
-webkit-border-radius
:
0
;
-moz-border-radius
:
0
;
border-radius
:
0
;}
div
.subnav
.nav
{
background-color
:
transparent
;}
div
.subnav
.nav
>
li
>
a
{
border-color
:
transparent
;}
div
.subnav
.nav
>
.active
>
a
{
border-color
:
transparent
;
background-color
:
transparent
;
-webkit-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;
color
:
#080808
;}
div
.subnav
.nav
>
.active
>
a
:hover
{
background-color
:
#000000
;
color
:
#ffffff
;
}
div
.subnav
.nav
>
.active
>
a
,
div
.subnav
.nav
>
.active
>
a
:hover
{
border-color
:
transparent
;
background-color
:
#000000
;
color
:
#ffffff
;
-webkit-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;}
div
.subnav-fixed
{
top
:
50px
;}
.nav
.open
.dropdown-toggle
,
.nav
>
li
.dropdown.open.active
>
a
:hover
{
color
:
#007fff
;}
.nav-tabs
>
li
>
a
{
-webkit-border-radius
:
0
;
-moz-border-radius
:
0
;
border-radius
:
0
;}
...
...
cosmo/bootswatch.less
View file @
e9b46a94
...
...
@@ -117,7 +117,7 @@ div.subnav {
background-color: @grayLight;
background-image: none;
.box-shadow(none);
border
-color: transparent
;
border
: none
;
.border-radius(0);
.nav {
...
...
@@ -128,17 +128,13 @@ div.subnav {
border-color: transparent;
}
.nav > .active > a {
.nav > .active > a,
.nav > .active > a:hover {
border-color: transparent;
background-color: transparent;
background-color: @black;
color: @white;
// border-left-width: 2px;
.box-shadow(none);
color: @grayDarker;
&:hover {
background-color: @black;
color: @white;
}
}
&-fixed {
...
...
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