Skip to content
GitLab
Explore
Projects
Groups
Snippets
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
a0d0864b
Commit
a0d0864b
authored
11 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
fixes
#9877
: improve active state on nav list items in theme
parent
5bbbdb39
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dist/css/bootstrap-theme.css
+18
-4
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.min.css
+1
-1
dist/css/bootstrap-theme.min.css
less/theme.less
+6
-4
less/theme.less
with
25 additions
and
9 deletions
+25
-9
dist/css/bootstrap-theme.css
+
18
-
4
View file @
a0d0864b
...
@@ -184,7 +184,7 @@
...
@@ -184,7 +184,7 @@
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ff428bca'
,
endColorstr
=
'#ff357ebd'
,
GradientType
=
0
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ff428bca'
,
endColorstr
=
'#ff357ebd'
,
GradientType
=
0
);
}
}
.navbar
{
.navbar
-default
{
background-image
:
-webkit-gradient
(
linear
,
left
0%
,
left
100%
,
from
(
#ffffff
),
to
(
#f8f8f8
));
background-image
:
-webkit-gradient
(
linear
,
left
0%
,
left
100%
,
from
(
#ffffff
),
to
(
#f8f8f8
));
background-image
:
-webkit-linear-gradient
(
top
,
#ffffff
,
0%
,
#f8f8f8
,
100%
);
background-image
:
-webkit-linear-gradient
(
top
,
#ffffff
,
0%
,
#f8f8f8
,
100%
);
background-image
:
-moz-linear-gradient
(
top
,
#ffffff
0%
,
#f8f8f8
100%
);
background-image
:
-moz-linear-gradient
(
top
,
#ffffff
0%
,
#f8f8f8
100%
);
...
@@ -196,8 +196,15 @@
...
@@ -196,8 +196,15 @@
box-shadow
:
inset
0
1px
0
rgba
(
255
,
255
,
255
,
0.15
),
0
1px
5px
rgba
(
0
,
0
,
0
,
0.075
);
box-shadow
:
inset
0
1px
0
rgba
(
255
,
255
,
255
,
0.15
),
0
1px
5px
rgba
(
0
,
0
,
0
,
0.075
);
}
}
.navbar
.navbar-nav
>
.active
>
a
{
.navbar-default
.navbar-nav
>
.active
>
a
{
background-color
:
#f8f8f8
;
background-image
:
-webkit-gradient
(
linear
,
left
0%
,
left
100%
,
from
(
#ebebeb
),
to
(
#f3f3f3
));
background-image
:
-webkit-linear-gradient
(
top
,
#ebebeb
,
0%
,
#f3f3f3
,
100%
);
background-image
:
-moz-linear-gradient
(
top
,
#ebebeb
0%
,
#f3f3f3
100%
);
background-image
:
linear-gradient
(
to
bottom
,
#ebebeb
0%
,
#f3f3f3
100%
);
background-repeat
:
repeat-x
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ffebebeb'
,
endColorstr
=
'#fff3f3f3'
,
GradientType
=
0
);
-webkit-box-shadow
:
inset
0
3px
9px
rgba
(
0
,
0
,
0
,
0.075
);
box-shadow
:
inset
0
3px
9px
rgba
(
0
,
0
,
0
,
0.075
);
}
}
.navbar-brand
,
.navbar-brand
,
...
@@ -215,7 +222,14 @@
...
@@ -215,7 +222,14 @@
}
}
.navbar-inverse
.navbar-nav
>
.active
>
a
{
.navbar-inverse
.navbar-nav
>
.active
>
a
{
background-color
:
#222222
;
background-image
:
-webkit-gradient
(
linear
,
left
0%
,
left
100%
,
from
(
#222222
),
to
(
#272727
));
background-image
:
-webkit-linear-gradient
(
top
,
#222222
,
0%
,
#272727
,
100%
);
background-image
:
-moz-linear-gradient
(
top
,
#222222
0%
,
#272727
100%
);
background-image
:
linear-gradient
(
to
bottom
,
#222222
0%
,
#272727
100%
);
background-repeat
:
repeat-x
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ff222222'
,
endColorstr
=
'#ff272727'
,
GradientType
=
0
);
-webkit-box-shadow
:
inset
0
3px
9px
rgba
(
0
,
0
,
0
,
0.25
);
box-shadow
:
inset
0
3px
9px
rgba
(
0
,
0
,
0
,
0.25
);
}
}
.navbar-inverse
.navbar-brand
,
.navbar-inverse
.navbar-brand
,
...
...
This diff is collapsed.
Click to expand it.
dist/css/bootstrap-theme.min.css
+
1
-
1
View file @
a0d0864b
This diff is collapsed.
Click to expand it.
less/theme.less
+
6
-
4
View file @
a0d0864b
...
@@ -98,15 +98,16 @@
...
@@ -98,15 +98,16 @@
// Navbar
// Navbar
// --------------------------------------------------
// --------------------------------------------------
//
Basic
navbar
//
Default
navbar
.navbar {
.navbar
-default
{
#gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg;);
#gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg;);
border-radius: @navbar-border-radius;
border-radius: @navbar-border-radius;
@shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
@shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
.box-shadow(@shadow);
.box-shadow(@shadow);
.navbar-nav > .active > a {
.navbar-nav > .active > a {
background-color: @navbar-default-bg;
#gradient > .vertical(@start-color: darken(@navbar-default-bg, 5%); @end-color: darken(@navbar-default-bg, 2%););
.box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
}
}
}
}
.navbar-brand,
.navbar-brand,
...
@@ -119,7 +120,8 @@
...
@@ -119,7 +120,8 @@
#gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg;);
#gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg;);
.navbar-nav > .active > a {
.navbar-nav > .active > a {
background-color: @navbar-inverse-bg;
#gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%););
.box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
}
}
.navbar-brand,
.navbar-brand,
...
...
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
Menu
Explore
Projects
Groups
Snippets