Skip to content

B
bootstrap
Commit 15c7e73a authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip 

Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
parents cb0fed66 c5532908
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 6159 deletions
docs/assets/css/bootstrap-responsive.css
View file @ 15c7e73a
...@@ -1003,7 +1003,9 @@ ...@@ -1003,7 +1003,9 @@
margin-bottom: 2px; margin-bottom: 2px;
} }
.nav-collapse .nav > li > a:hover, .nav-collapse .nav > li > a:hover,
.nav-collapse .dropdown-menu a:hover { .nav-collapse .nav > li > a:focus,
.nav-collapse .dropdown-menu a:hover,
.nav-collapse .dropdown-menu a:focus {
background-color: #f2f2f2; background-color: #f2f2f2;
} }
.navbar-inverse .nav-collapse .nav > li > a, .navbar-inverse .nav-collapse .nav > li > a,
...@@ -1011,7 +1013,9 @@ ...@@ -1011,7 +1013,9 @@
color: #999999; color: #999999;
} }
.navbar-inverse .nav-collapse .nav > li > a:hover, .navbar-inverse .nav-collapse .nav > li > a:hover,
.navbar-inverse .nav-collapse .dropdown-menu a:hover { .navbar-inverse .nav-collapse .nav > li > a:focus,
.navbar-inverse .nav-collapse .dropdown-menu a:hover,
.navbar-inverse .nav-collapse .dropdown-menu a:focus {
background-color: #111111; background-color: #111111;
} }
.nav-collapse.in .btn-group { .nav-collapse.in .btn-group {
......
docs/assets/css/bootstrap.css
View file @ 15c7e73a
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/examples/fluid.html
View file @ 15c7e73a
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<div class="hero-unit"> <div class="hero-unit">
<h1>Hello, world!</h1> <h1>Hello, world!</h1>
<p>This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.</p> <p>This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.</p>
<p><a class="btn btn-primary btn-large">Learn more &raquo;</a></p> <p><a href="#" class="btn btn-primary btn-large">Learn more &raquo;</a></p>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span4"> <div class="span4">
......
docs/examples/hero.html
View file @ 15c7e73a
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<div class="hero-unit"> <div class="hero-unit">
<h1>Hello, world!</h1> <h1>Hello, world!</h1>
<p>This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.</p> <p>This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.</p>
<p><a class="btn btn-primary btn-large">Learn more &raquo;</a></p> <p><a href="#" class="btn btn-primary btn-large">Learn more &raquo;</a></p>
</div> </div>
<!-- Example row of columns --> <!-- Example row of columns -->
......
less/buttons.less
View file @ 15c7e73a
...@@ -25,13 +25,14 @@ ...@@ -25,13 +25,14 @@
.ie7-restore-left-whitespace(); // Give IE7 some love .ie7-restore-left-whitespace(); // Give IE7 some love
.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
// Hover state // Hover/focus state
&:hover { &:hover,
&:focus {
color: @grayDark; color: @grayDark;
text-decoration: none; text-decoration: none;
background-position: 0 -15px; background-position: 0 -15px;
// transition is only when going to hover, otherwise the background // transition is only when going to hover/focus, otherwise the background
// behind the gradient (there for IE<=9 fallback) gets mismatched // behind the gradient (there for IE<=9 fallback) gets mismatched
.transition(background-position .1s linear); .transition(background-position .1s linear);
} }
...@@ -214,12 +215,14 @@ input[type="submit"].btn { ...@@ -214,12 +215,14 @@ input[type="submit"].btn {
color: @linkColor; color: @linkColor;
.border-radius(0); .border-radius(0);
} }
.btn-link:hover { .btn-link:hover,
.btn-link:focus {
color: @linkColorHover; color: @linkColorHover;
text-decoration: underline; text-decoration: underline;
background-color: transparent; background-color: transparent;
} }
.btn-link[disabled]:hover { .btn-link[disabled]:hover,
.btn-link[disabled]:focus {
color: @grayDark; color: @grayDark;
text-decoration: none; text-decoration: none;
} }
less/carousel.less
View file @ 15c7e73a
...@@ -98,8 +98,9 @@ ...@@ -98,8 +98,9 @@
right: 15px; right: 15px;
} }
// Hover state // Hover/focus state
&:hover { &:hover,
&:focus {
color: @white; color: @white;
text-decoration: none; text-decoration: none;
.opacity(90); .opacity(90);
......
less/close.less
View file @ 15c7e73a
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
color: @black; color: @black;
text-shadow: 0 1px 0 rgba(255,255,255,1); text-shadow: 0 1px 0 rgba(255,255,255,1);
.opacity(20); .opacity(20);
&:hover { &:hover,
&:focus {
color: @black; color: @black;
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
......
less/dropdowns.less
View file @ 15c7e73a
...@@ -83,11 +83,12 @@ ...@@ -83,11 +83,12 @@
} }
} }
// Hover state // Hover/Focus state
// ----------- // -----------
.dropdown-menu > li > a:hover, .dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus, .dropdown-menu > li > a:focus,
.dropdown-submenu:hover > a { .dropdown-submenu:hover > a,
.dropdown-submenu:focus > a {
text-decoration: none; text-decoration: none;
color: @dropdownLinkColorHover; color: @dropdownLinkColorHover;
#gradient > .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%)); #gradient > .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%));
...@@ -96,7 +97,8 @@ ...@@ -96,7 +97,8 @@
// Active state // Active state
// ------------ // ------------
.dropdown-menu > .active > a, .dropdown-menu > .active > a,
.dropdown-menu > .active > a:hover { .dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:focus {
color: @dropdownLinkColorActive; color: @dropdownLinkColorActive;
text-decoration: none; text-decoration: none;
outline: 0; outline: 0;
...@@ -105,13 +107,15 @@ ...@@ -105,13 +107,15 @@
// Disabled state // Disabled state
// -------------- // --------------
// Gray out text and ensure the hover state remains gray // Gray out text and ensure the hover/focus state remains gray
.dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a,
.dropdown-menu > .disabled > a:hover { .dropdown-menu > .disabled > a:hover,
.dropdown-menu > .disabled > a:focus {
color: @grayLight; color: @grayLight;
} }
// Nuke hover effects // Nuke hover/focus effects
.dropdown-menu > .disabled > a:hover { .dropdown-menu > .disabled > a:hover
.dropdown-menu > .disabled > a:focus {
text-decoration: none; text-decoration: none;
background-color: transparent; background-color: transparent;
background-image: none; // Remove CSS gradient background-image: none; // Remove CSS gradient
......
less/labels-badges.less
View file @ 15c7e73a
...@@ -35,10 +35,12 @@ ...@@ -35,10 +35,12 @@
} }
} }
// Hover state, but only for links // Hover/focus state, but only for links
a { a {
&.label:hover, &.label:hover,
&.badge:hover { &.label:focus,
&.badge:hover,
&.badge:focus {
color: @white; color: @white;
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
......
less/mixins.less
View file @ 15c7e73a
...@@ -517,7 +517,7 @@ ...@@ -517,7 +517,7 @@
.reset-filter(); .reset-filter();
// in these cases the gradient won't cover the background, so we override // in these cases the gradient won't cover the background, so we override
&:hover, &:active, &.active, &.disabled, &[disabled] { &:hover, &:focus, &:active, &.active, &.disabled, &[disabled] {
color: @textColor; color: @textColor;
background-color: @endColor; background-color: @endColor;
*background-color: darken(@endColor, 5%); *background-color: darken(@endColor, 5%);
......
less/navbar.less
View file @ 15c7e73a
...@@ -56,7 +56,8 @@ ...@@ -56,7 +56,8 @@
font-weight: 200; font-weight: 200;
color: @navbarBrandColor; color: @navbarBrandColor;
text-shadow: 0 1px 0 @navbarBackgroundHighlight; text-shadow: 0 1px 0 @navbarBackgroundHighlight;
&:hover { &:hover,
&:focus {
text-decoration: none; text-decoration: none;
} }
} }
...@@ -73,7 +74,8 @@ ...@@ -73,7 +74,8 @@
// ------------------------- // -------------------------
.navbar-link { .navbar-link {
color: @navbarLinkColor; color: @navbarLinkColor;
&:hover { &:hover,
&:focus {
color: @navbarLinkColorHover; color: @navbarLinkColorHover;
} }
} }
...@@ -249,10 +251,10 @@ ...@@ -249,10 +251,10 @@
margin-top: 8px; margin-top: 8px;
} }
// Hover // Hover/focus
.navbar .nav > li > a:focus, .navbar .nav > li > a:focus,
.navbar .nav > li > a:hover { .navbar .nav > li > a:hover {
background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover/:focus from .active
color: @navbarLinkColorHover; color: @navbarLinkColorHover;
text-decoration: none; text-decoration: none;
} }
...@@ -340,6 +342,11 @@ ...@@ -340,6 +342,11 @@
.navbar .nav li.dropdown > a:hover .caret { .navbar .nav li.dropdown > a:hover .caret {
border-top-color: @navbarLinkColorHover; border-top-color: @navbarLinkColorHover;
border-bottom-color: @navbarLinkColorHover; border-bottom-color: @navbarLinkColorHover;
// Caret should match text color on hover/focus
.navbar .nav li.dropdown > a:hover .caret,
.navbar .nav li.dropdown > a:focus .caret {
border-top-color: @navbarLinkColorHover;
border-bottom-color: @navbarLinkColorHover;
} }
// Remove background color from open dropdown // Remove background color from open dropdown
...@@ -397,7 +404,8 @@ ...@@ -397,7 +404,8 @@
.nav > li > a { .nav > li > a {
color: @navbarInverseLinkColor; color: @navbarInverseLinkColor;
text-shadow: 0 -1px 0 rgba(0,0,0,.25); text-shadow: 0 -1px 0 rgba(0,0,0,.25);
&:hover { &:hover,
&:focus {
color: @navbarInverseLinkColorHover; color: @navbarInverseLinkColorHover;
} }
} }
...@@ -426,7 +434,8 @@ ...@@ -426,7 +434,8 @@
// Inline text links // Inline text links
.navbar-link { .navbar-link {
color: @navbarInverseLinkColor; color: @navbarInverseLinkColor;
&:hover { &:hover,
&:focus {
color: @navbarInverseLinkColorHover; color: @navbarInverseLinkColorHover;
} }
} }
...@@ -444,7 +453,8 @@ ...@@ -444,7 +453,8 @@
background-color: @navbarInverseLinkBackgroundActive; background-color: @navbarInverseLinkBackgroundActive;
color: @navbarInverseLinkColorActive; color: @navbarInverseLinkColorActive;
} }
.nav li.dropdown > a:hover .caret { .nav li.dropdown > a:hover .caret,
.nav li.dropdown > a:focus .caret {
border-top-color: @navbarInverseLinkColorActive; border-top-color: @navbarInverseLinkColorActive;
border-bottom-color: @navbarInverseLinkColorActive; border-bottom-color: @navbarInverseLinkColorActive;
} }
......
less/navs.less
View file @ 15c7e73a
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
.nav > li > a { .nav > li > a {
display: block; display: block;
} }
.nav > li > a:hover { .nav > li > a:hover,
.nav > li > a:focus {
text-decoration: none; text-decoration: none;
background-color: @grayLighter; background-color: @grayLighter;
} }
...@@ -68,7 +69,8 @@ ...@@ -68,7 +69,8 @@
padding: 3px 15px; padding: 3px 15px;
} }
.nav-list > .active > a, .nav-list > .active > a,
.nav-list > .active > a:hover { .nav-list > .active > a:hover,
.nav-list > .active > a:focus {
color: @white; color: @white;
text-shadow: 0 -1px 0 rgba(0,0,0,.2); text-shadow: 0 -1px 0 rgba(0,0,0,.2);
background-color: @linkColor; background-color: @linkColor;
...@@ -122,13 +124,15 @@ ...@@ -122,13 +124,15 @@
line-height: @baseLineHeight; line-height: @baseLineHeight;
border: 1px solid transparent; border: 1px solid transparent;
.border-radius(4px 4px 0 0); .border-radius(4px 4px 0 0);
&:hover { &:hover,
&:focus {
border-color: @grayLighter @grayLighter #ddd; border-color: @grayLighter @grayLighter #ddd;
} }
} }
// Active state, and it's :hover to override normal :hover // Active state, and it's :hover/:focus to override normal :hover/:focus
.nav-tabs > .active > a, .nav-tabs > .active > a,
.nav-tabs > .active > a:hover { .nav-tabs > .active > a:hover,
.nav-tabs > .active > a:focus {
color: @gray; color: @gray;
background-color: @bodyBackground; background-color: @bodyBackground;
border: 1px solid #ddd; border: 1px solid #ddd;
...@@ -151,7 +155,8 @@ ...@@ -151,7 +155,8 @@
// Active state // Active state
.nav-pills > .active > a, .nav-pills > .active > a,
.nav-pills > .active > a:hover { .nav-pills > .active > a:hover,
.nav-pills > .active > a:focus {
color: @white; color: @white;
background-color: @linkColor; background-color: @linkColor;
} }
...@@ -183,7 +188,8 @@ ...@@ -183,7 +188,8 @@
.nav-tabs.nav-stacked > li:last-child > a { .nav-tabs.nav-stacked > li:last-child > a {
.border-bottom-radius(4px); .border-bottom-radius(4px);
} }
.nav-tabs.nav-stacked > li > a:hover { .nav-tabs.nav-stacked > li > a:hover,
.nav-tabs.nav-stacked > li > a:focus {
border-color: #ddd; border-color: #ddd;
z-index: 2; z-index: 2;
} }
...@@ -216,7 +222,8 @@ ...@@ -216,7 +222,8 @@
border-bottom-color: @linkColor; border-bottom-color: @linkColor;
margin-top: 6px; margin-top: 6px;
} }
.nav .dropdown-toggle:hover .caret { .nav .dropdown-toggle:hover .caret,
.nav .dropdown-toggle:focus .caret {
border-top-color: @linkColorHover; border-top-color: @linkColorHover;
border-bottom-color: @linkColorHover; border-bottom-color: @linkColorHover;
} }
...@@ -236,9 +243,10 @@ ...@@ -236,9 +243,10 @@
border-bottom-color: @gray; border-bottom-color: @gray;
} }
// Active:hover dropdown links // Active:hover/:focus dropdown links
// ------------------------- // -------------------------
.nav > .dropdown.active > a:hover { .nav > .dropdown.active > a:hover,
.nav > .dropdown.active > a:focus {
cursor: pointer; cursor: pointer;
} }
...@@ -246,21 +254,24 @@ ...@@ -246,21 +254,24 @@
// ------------------------- // -------------------------
.nav-tabs .open .dropdown-toggle, .nav-tabs .open .dropdown-toggle,
.nav-pills .open .dropdown-toggle, .nav-pills .open .dropdown-toggle,
.nav > li.dropdown.open.active > a:hover { .nav > li.dropdown.open.active > a:hover,
.nav > li.dropdown.open.active > a:focus {
color: @white; color: @white;
background-color: @grayLight; background-color: @grayLight;
border-color: @grayLight; border-color: @grayLight;
} }
.nav li.dropdown.open .caret, .nav li.dropdown.open .caret,
.nav li.dropdown.open.active .caret, .nav li.dropdown.open.active .caret,
.nav li.dropdown.open a:hover .caret { .nav li.dropdown.open a:hover .caret,
.nav li.dropdown.open a:focus .caret {
border-top-color: @white; border-top-color: @white;
border-bottom-color: @white; border-bottom-color: @white;
.opacity(100); .opacity(100);
} }
// Dropdowns in stacked tabs // Dropdowns in stacked tabs
.tabs-stacked .open > a:hover { .tabs-stacked .open > a:hover,
.tabs-stacked .open > a:focus {
border-color: @grayLight; border-color: @grayLight;
} }
...@@ -311,13 +322,15 @@ ...@@ -311,13 +322,15 @@
} }
.tabs-below > .nav-tabs > li > a { .tabs-below > .nav-tabs > li > a {
.border-radius(0 0 4px 4px); .border-radius(0 0 4px 4px);
&:hover { &:hover,
&:focus {
border-bottom-color: transparent; border-bottom-color: transparent;
border-top-color: #ddd; border-top-color: #ddd;
} }
} }
.tabs-below > .nav-tabs > .active > a, .tabs-below > .nav-tabs > .active > a,
.tabs-below > .nav-tabs > .active > a:hover { .tabs-below > .nav-tabs > .active > a:hover,
.tabs-below > .nav-tabs > .active > a:focus {
border-color: transparent #ddd #ddd #ddd; border-color: transparent #ddd #ddd #ddd;
} }
...@@ -346,11 +359,13 @@ ...@@ -346,11 +359,13 @@
margin-right: -1px; margin-right: -1px;
.border-radius(4px 0 0 4px); .border-radius(4px 0 0 4px);
} }
.tabs-left > .nav-tabs > li > a:hover { .tabs-left > .nav-tabs > li > a:hover,
.tabs-left > .nav-tabs > li > a:focus {
border-color: @grayLighter #ddd @grayLighter @grayLighter; border-color: @grayLighter #ddd @grayLighter @grayLighter;
} }
.tabs-left > .nav-tabs .active > a, .tabs-left > .nav-tabs .active > a,
.tabs-left > .nav-tabs .active > a:hover { .tabs-left > .nav-tabs .active > a:hover,
.tabs-left > .nav-tabs .active > a:focus {
border-color: #ddd transparent #ddd #ddd; border-color: #ddd transparent #ddd #ddd;
*border-right-color: @white; *border-right-color: @white;
} }
...@@ -365,11 +380,13 @@ ...@@ -365,11 +380,13 @@
margin-left: -1px; margin-left: -1px;
.border-radius(0 4px 4px 0); .border-radius(0 4px 4px 0);
} }
.tabs-right > .nav-tabs > li > a:hover { .tabs-right > .nav-tabs > li > a:hover,
.tabs-right > .nav-tabs > li > a:focus {
border-color: @grayLighter @grayLighter @grayLighter #ddd; border-color: @grayLighter @grayLighter @grayLighter #ddd;
} }
.tabs-right > .nav-tabs .active > a, .tabs-right > .nav-tabs .active > a,
.tabs-right > .nav-tabs .active > a:hover { .tabs-right > .nav-tabs .active > a:hover,
.tabs-right > .nav-tabs .active > a:focus {
border-color: #ddd #ddd #ddd transparent; border-color: #ddd #ddd #ddd transparent;
*border-left-color: @white; *border-left-color: @white;
} }
...@@ -383,8 +400,9 @@ ...@@ -383,8 +400,9 @@
.nav > .disabled > a { .nav > .disabled > a {
color: @grayLight; color: @grayLight;
} }
// Nuke hover effects // Nuke hover/focus effects
.nav > .disabled > a:hover { .nav > .disabled > a:hover,
.nav > .disabled > a:focus {
text-decoration: none; text-decoration: none;
background-color: transparent; background-color: transparent;
cursor: default; cursor: default;
......
less/pager.less
View file @ 15c7e73a
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
border: 1px solid #ddd; border: 1px solid #ddd;
.border-radius(15px); .border-radius(15px);
} }
.pager li > a:hover { .pager li > a:hover,
.pager li > a:focus {
text-decoration: none; text-decoration: none;
background-color: #f5f5f5; background-color: #f5f5f5;
} }
...@@ -34,6 +35,7 @@ ...@@ -34,6 +35,7 @@
} }
.pager .disabled > a, .pager .disabled > a,
.pager .disabled > a:hover, .pager .disabled > a:hover,
.pager .disabled > a:focus,
.pager .disabled > span { .pager .disabled > span {
color: @grayLight; color: @grayLight;
background-color: #fff; background-color: #fff;
......
less/pagination.less
View file @ 15c7e73a
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
border-left-width: 0; border-left-width: 0;
} }
.pagination ul > li > a:hover, .pagination ul > li > a:hover,
.pagination ul > li > a:focus,
.pagination ul > .active > a, .pagination ul > .active > a,
.pagination ul > .active > span { .pagination ul > .active > span {
background-color: @paginationActiveBackground; background-color: @paginationActiveBackground;
...@@ -43,7 +44,8 @@ ...@@ -43,7 +44,8 @@
} }
.pagination ul > .disabled > span, .pagination ul > .disabled > span,
.pagination ul > .disabled > a, .pagination ul > .disabled > a,
.pagination ul > .disabled > a:hover { .pagination ul > .disabled > a:hover,
.pagination ul > .disabled > a:focus {
color: @grayLight; color: @grayLight;
background-color: transparent; background-color: transparent;
cursor: default; cursor: default;
......
less/responsive-navbar.less
View file @ 15c7e73a
...@@ -81,7 +81,9 @@ ...@@ -81,7 +81,9 @@
margin-bottom: 2px; margin-bottom: 2px;
} }
.nav-collapse .nav > li > a:hover, .nav-collapse .nav > li > a:hover,
.nav-collapse .dropdown-menu a:hover { .nav-collapse .nav > li > a:focus,
.nav-collapse .dropdown-menu a:hover,
.nav-collapse .dropdown-menu a:focus {
background-color: @navbarBackground; background-color: @navbarBackground;
} }
.navbar-inverse .nav-collapse .nav > li > a, .navbar-inverse .nav-collapse .nav > li > a,
...@@ -89,7 +91,9 @@ ...@@ -89,7 +91,9 @@
color: @navbarInverseLinkColor; color: @navbarInverseLinkColor;
} }
.navbar-inverse .nav-collapse .nav > li > a:hover, .navbar-inverse .nav-collapse .nav > li > a:hover,
.navbar-inverse .nav-collapse .dropdown-menu a:hover { .navbar-inverse .nav-collapse .nav > li > a:focus,
.navbar-inverse .nav-collapse .dropdown-menu a:hover,
.navbar-inverse .nav-collapse .dropdown-menu a:focus {
background-color: @navbarInverseBackground; background-color: @navbarInverseBackground;
} }
// Buttons in the navbar // Buttons in the navbar
......
less/scaffolding.less
View file @ 15c7e73a
...@@ -23,7 +23,8 @@ a { ...@@ -23,7 +23,8 @@ a {
color: @linkColor; color: @linkColor;
text-decoration: none; text-decoration: none;
} }
a:hover { a:hover,
a:focus {
color: @linkColorHover; color: @linkColorHover;
text-decoration: underline; text-decoration: underline;
} }
......
less/sprites.less
View file @ 15c7e73a
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
margin-top: 1px; margin-top: 1px;
} }
/* White icons with optional class, or on hover/active states of certain elements */ /* White icons with optional class, or on hover/focus/active states of certain elements */
.icon-white, .icon-white,
.nav-pills > .active > a > [class^="icon-"], .nav-pills > .active > a > [class^="icon-"],
.nav-pills > .active > a > [class*=" icon-"], .nav-pills > .active > a > [class*=" icon-"],
...@@ -37,11 +37,15 @@ ...@@ -37,11 +37,15 @@
.navbar-inverse .nav > .active > a > [class^="icon-"], .navbar-inverse .nav > .active > a > [class^="icon-"],
.navbar-inverse .nav > .active > a > [class*=" icon-"], .navbar-inverse .nav > .active > a > [class*=" icon-"],
.dropdown-menu > li > a:hover > [class^="icon-"], .dropdown-menu > li > a:hover > [class^="icon-"],
.dropdown-menu > li > a:focus > [class^="icon-"],
.dropdown-menu > li > a:hover > [class*=" icon-"], .dropdown-menu > li > a:hover > [class*=" icon-"],
.dropdown-menu > li > a:focus > [class*=" icon-"],
.dropdown-menu > .active > a > [class^="icon-"], .dropdown-menu > .active > a > [class^="icon-"],
.dropdown-menu > .active > a > [class*=" icon-"], .dropdown-menu > .active > a > [class*=" icon-"],
.dropdown-submenu:hover > a > [class^="icon-"], .dropdown-submenu:hover > a > [class^="icon-"],
.dropdown-submenu:hover > a > [class*=" icon-"] { .dropdown-submenu:focus > a > [class^="icon-"],
.dropdown-submenu:hover > a > [class*=" icon-"],
.dropdown-submenu:focus > a > [class*=" icon-"] {
background-image: url("@{iconWhiteSpritePath}"); background-image: url("@{iconWhiteSpritePath}");
} }
......
less/thumbnails.less
View file @ 15c7e73a
...@@ -33,8 +33,9 @@ ...@@ -33,8 +33,9 @@
.box-shadow(0 1px 3px rgba(0,0,0,.055)); .box-shadow(0 1px 3px rgba(0,0,0,.055));
.transition(all .2s ease-in-out); .transition(all .2s ease-in-out);
} }
// Add a hover state for linked versions only // Add a hover/focus state for linked versions only
a.thumbnail:hover { a.thumbnail:hover,
a.thumbnail:focus {
border-color: @linkColor; border-color: @linkColor;
.box-shadow(0 1px 4px rgba(0,105,214,.25)); .box-shadow(0 1px 4px rgba(0,105,214,.25));
} }
......
less/type.less
View file @ 15c7e73a
...@@ -29,19 +29,24 @@ cite { font-style: normal; } ...@@ -29,19 +29,24 @@ cite { font-style: normal; }
// Utility classes // Utility classes
.muted { color: @grayLight; } .muted { color: @grayLight; }
a.muted:hover { color: darken(@grayLight, 10%); } a.muted:hover,
a.muted:focus { color: darken(@grayLight, 10%); }
.text-warning { color: @warningText; } .text-warning { color: @warningText; }
a.text-warning:hover { color: darken(@warningText, 10%); } a.text-warning:hover,
a.text-warning:focus { color: darken(@warningText, 10%); }
.text-error { color: @errorText; } .text-error { color: @errorText; }
a.text-error:hover { color: darken(@errorText, 10%); } a.text-error:hover,
a.text-error:focus { color: darken(@errorText, 10%); }
.text-info { color: @infoText; } .text-info { color: @infoText; }
a.text-info:hover { color: darken(@infoText, 10%); } a.text-info:hover,
a.text-info:focus { color: darken(@infoText, 10%); }
.text-success { color: @successText; } .text-success { color: @successText; }
a.text-success:hover { color: darken(@successText, 10%); } a.text-success:hover,
a.text-success:focus { color: darken(@successText, 10%); }
.text-left { text-align: left; } .text-left { text-align: left; }
.text-right { text-align: right; } .text-right { text-align: right; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment