mirror of https://github.com/twbs/bootstrap.git
				
				
				
			Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
This commit is contained in:
		
						commit
						c25e8182ba
					
				|  | @ -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 @@ | ||||||
|     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 { | ||||||
|  |  | ||||||
|  | @ -235,7 +235,8 @@ a { | ||||||
|   text-decoration: none; |   text-decoration: none; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| a:hover { | a:hover, | ||||||
|  | a:focus { | ||||||
|   color: #005580; |   color: #005580; | ||||||
|   text-decoration: underline; |   text-decoration: underline; | ||||||
| } | } | ||||||
|  | @ -678,7 +679,8 @@ cite { | ||||||
|   color: #999999; |   color: #999999; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| a.muted:hover { | a.muted:hover, | ||||||
|  | a.muted:focus { | ||||||
|   color: #808080; |   color: #808080; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | @ -686,7 +688,8 @@ a.muted:hover { | ||||||
|   color: #c09853; |   color: #c09853; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| a.text-warning:hover { | a.text-warning:hover, | ||||||
|  | a.text-warning:focus { | ||||||
|   color: #a47e3c; |   color: #a47e3c; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | @ -694,7 +697,8 @@ a.text-warning:hover { | ||||||
|   color: #b94a48; |   color: #b94a48; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| a.text-error:hover { | a.text-error:hover, | ||||||
|  | a.text-error:focus { | ||||||
|   color: #953b39; |   color: #953b39; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | @ -702,7 +706,8 @@ a.text-error:hover { | ||||||
|   color: #3a87ad; |   color: #3a87ad; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| a.text-info:hover { | a.text-info:hover, | ||||||
|  | a.text-info:focus { | ||||||
|   color: #2d6987; |   color: #2d6987; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | @ -710,7 +715,8 @@ a.text-info:hover { | ||||||
|   color: #468847; |   color: #468847; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| a.text-success:hover { | a.text-success:hover, | ||||||
|  | a.text-success:focus { | ||||||
|   color: #356635; |   color: #356635; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | @ -2281,7 +2287,7 @@ table th[class*="span"], | ||||||
|   background-repeat: no-repeat; |   background-repeat: no-repeat; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| /* 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-"], | ||||||
|  | @ -2291,11 +2297,15 @@ table th[class*="span"], | ||||||
| .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("../img/glyphicons-halflings-white.png"); |   background-image: url("../img/glyphicons-halflings-white.png"); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | @ -2946,7 +2956,8 @@ table th[class*="span"], | ||||||
| 
 | 
 | ||||||
| .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 { | ||||||
|   color: #ffffff; |   color: #ffffff; | ||||||
|   text-decoration: none; |   text-decoration: none; | ||||||
|   background-color: #0081c2; |   background-color: #0081c2; | ||||||
|  | @ -2960,7 +2971,8 @@ table th[class*="span"], | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .dropdown-menu > .active > a, | .dropdown-menu > .active > a, | ||||||
| .dropdown-menu > .active > a:hover { | .dropdown-menu > .active > a:hover, | ||||||
|  | .dropdown-menu > .active > a:focus { | ||||||
|   color: #ffffff; |   color: #ffffff; | ||||||
|   text-decoration: none; |   text-decoration: none; | ||||||
|   background-color: #0081c2; |   background-color: #0081c2; | ||||||
|  | @ -2975,11 +2987,13 @@ table th[class*="span"], | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .dropdown-menu > .disabled > a, | .dropdown-menu > .disabled > a, | ||||||
| .dropdown-menu > .disabled > a:hover { | .dropdown-menu > .disabled > a:hover, | ||||||
|  | .dropdown-menu > .disabled > a:focus { | ||||||
|   color: #999999; |   color: #999999; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .dropdown-menu > .disabled > a:hover { | .dropdown-menu > .disabled > a:hover, | ||||||
|  | .dropdown-menu > .disabled > a:focus { | ||||||
|   text-decoration: none; |   text-decoration: none; | ||||||
|   cursor: default; |   cursor: default; | ||||||
|   background-color: transparent; |   background-color: transparent; | ||||||
|  | @ -3155,7 +3169,8 @@ table th[class*="span"], | ||||||
|   filter: alpha(opacity=20); |   filter: alpha(opacity=20); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .close:hover { | .close:hover, | ||||||
|  | .close:focus { | ||||||
|   color: #000000; |   color: #000000; | ||||||
|   text-decoration: none; |   text-decoration: none; | ||||||
|   cursor: pointer; |   cursor: pointer; | ||||||
|  | @ -3209,6 +3224,7 @@ button.close { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .btn:hover, | .btn:hover, | ||||||
|  | .btn:focus, | ||||||
| .btn:active, | .btn:active, | ||||||
| .btn.active, | .btn.active, | ||||||
| .btn.disabled, | .btn.disabled, | ||||||
|  | @ -3227,7 +3243,8 @@ button.close { | ||||||
|   *margin-left: 0; |   *margin-left: 0; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .btn:hover { | .btn:hover, | ||||||
|  | .btn:focus { | ||||||
|   color: #333333; |   color: #333333; | ||||||
|   text-decoration: none; |   text-decoration: none; | ||||||
|   background-position: 0 -15px; |   background-position: 0 -15px; | ||||||
|  | @ -3349,6 +3366,7 @@ input[type="button"].btn-block { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .btn-primary:hover, | .btn-primary:hover, | ||||||
|  | .btn-primary:focus, | ||||||
| .btn-primary:active, | .btn-primary:active, | ||||||
| .btn-primary.active, | .btn-primary.active, | ||||||
| .btn-primary.disabled, | .btn-primary.disabled, | ||||||
|  | @ -3381,6 +3399,7 @@ input[type="button"].btn-block { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .btn-warning:hover, | .btn-warning:hover, | ||||||
|  | .btn-warning:focus, | ||||||
| .btn-warning:active, | .btn-warning:active, | ||||||
| .btn-warning.active, | .btn-warning.active, | ||||||
| .btn-warning.disabled, | .btn-warning.disabled, | ||||||
|  | @ -3413,6 +3432,7 @@ input[type="button"].btn-block { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .btn-danger:hover, | .btn-danger:hover, | ||||||
|  | .btn-danger:focus, | ||||||
| .btn-danger:active, | .btn-danger:active, | ||||||
| .btn-danger.active, | .btn-danger.active, | ||||||
| .btn-danger.disabled, | .btn-danger.disabled, | ||||||
|  | @ -3445,6 +3465,7 @@ input[type="button"].btn-block { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .btn-success:hover, | .btn-success:hover, | ||||||
|  | .btn-success:focus, | ||||||
| .btn-success:active, | .btn-success:active, | ||||||
| .btn-success.active, | .btn-success.active, | ||||||
| .btn-success.disabled, | .btn-success.disabled, | ||||||
|  | @ -3477,6 +3498,7 @@ input[type="button"].btn-block { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .btn-info:hover, | .btn-info:hover, | ||||||
|  | .btn-info:focus, | ||||||
| .btn-info:active, | .btn-info:active, | ||||||
| .btn-info.active, | .btn-info.active, | ||||||
| .btn-info.disabled, | .btn-info.disabled, | ||||||
|  | @ -3509,6 +3531,7 @@ input[type="button"].btn-block { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .btn-inverse:hover, | .btn-inverse:hover, | ||||||
|  | .btn-inverse:focus, | ||||||
| .btn-inverse:active, | .btn-inverse:active, | ||||||
| .btn-inverse.active, | .btn-inverse.active, | ||||||
| .btn-inverse.disabled, | .btn-inverse.disabled, | ||||||
|  | @ -3572,13 +3595,15 @@ input[type="submit"].btn.btn-mini { | ||||||
|           border-radius: 0; |           border-radius: 0; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .btn-link:hover { | .btn-link:hover, | ||||||
|  | .btn-link:focus { | ||||||
|   color: #005580; |   color: #005580; | ||||||
|   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: #333333; |   color: #333333; | ||||||
|   text-decoration: none; |   text-decoration: none; | ||||||
| } | } | ||||||
|  | @ -3922,7 +3947,8 @@ input[type="submit"].btn.btn-mini { | ||||||
|   display: block; |   display: block; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .nav > li > a:hover { | .nav > li > a:hover, | ||||||
|  | .nav > li > a:focus { | ||||||
|   text-decoration: none; |   text-decoration: none; | ||||||
|   background-color: #eeeeee; |   background-color: #eeeeee; | ||||||
| } | } | ||||||
|  | @ -3968,7 +3994,8 @@ input[type="submit"].btn.btn-mini { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .nav-list > .active > a, | .nav-list > .active > a, | ||||||
| .nav-list > .active > a:hover { | .nav-list > .active > a:hover, | ||||||
|  | .nav-list > .active > a:focus { | ||||||
|   color: #ffffff; |   color: #ffffff; | ||||||
|   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); |   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); | ||||||
|   background-color: #0088cc; |   background-color: #0088cc; | ||||||
|  | @ -4039,12 +4066,14 @@ input[type="submit"].btn.btn-mini { | ||||||
|           border-radius: 4px 4px 0 0; |           border-radius: 4px 4px 0 0; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .nav-tabs > li > a:hover { | .nav-tabs > li > a:hover, | ||||||
|  | .nav-tabs > li > a:focus { | ||||||
|   border-color: #eeeeee #eeeeee #dddddd; |   border-color: #eeeeee #eeeeee #dddddd; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .nav-tabs > .active > a, | .nav-tabs > .active > a, | ||||||
| .nav-tabs > .active > a:hover { | .nav-tabs > .active > a:hover, | ||||||
|  | .nav-tabs > .active > a:focus { | ||||||
|   color: #555555; |   color: #555555; | ||||||
|   cursor: default; |   cursor: default; | ||||||
|   background-color: #ffffff; |   background-color: #ffffff; | ||||||
|  | @ -4063,7 +4092,8 @@ input[type="submit"].btn.btn-mini { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .nav-pills > .active > a, | .nav-pills > .active > a, | ||||||
| .nav-pills > .active > a:hover { | .nav-pills > .active > a:hover, | ||||||
|  | .nav-pills > .active > a:focus { | ||||||
|   color: #ffffff; |   color: #ffffff; | ||||||
|   background-color: #0088cc; |   background-color: #0088cc; | ||||||
| } | } | ||||||
|  | @ -4105,7 +4135,8 @@ input[type="submit"].btn.btn-mini { | ||||||
|   -moz-border-radius-bottomleft: 4px; |   -moz-border-radius-bottomleft: 4px; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .nav-tabs.nav-stacked > li > a:hover { | .nav-tabs.nav-stacked > li > a:hover, | ||||||
|  | .nav-tabs.nav-stacked > li > a:focus { | ||||||
|   z-index: 2; |   z-index: 2; | ||||||
|   border-color: #ddd; |   border-color: #ddd; | ||||||
| } | } | ||||||
|  | @ -4136,7 +4167,8 @@ input[type="submit"].btn.btn-mini { | ||||||
|   border-bottom-color: #0088cc; |   border-bottom-color: #0088cc; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .nav .dropdown-toggle:hover .caret { | .nav .dropdown-toggle:hover .caret, | ||||||
|  | .nav .dropdown-toggle:focus .caret { | ||||||
|   border-top-color: #005580; |   border-top-color: #005580; | ||||||
|   border-bottom-color: #005580; |   border-bottom-color: #005580; | ||||||
| } | } | ||||||
|  | @ -4157,13 +4189,15 @@ input[type="submit"].btn.btn-mini { | ||||||
|   border-bottom-color: #555555; |   border-bottom-color: #555555; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .nav > .dropdown.active > a:hover { | .nav > .dropdown.active > a:hover, | ||||||
|  | .nav > .dropdown.active > a:focus { | ||||||
|   cursor: pointer; |   cursor: pointer; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .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: #ffffff; |   color: #ffffff; | ||||||
|   background-color: #999999; |   background-color: #999999; | ||||||
|   border-color: #999999; |   border-color: #999999; | ||||||
|  | @ -4171,14 +4205,16 @@ input[type="submit"].btn.btn-mini { | ||||||
| 
 | 
 | ||||||
| .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: #ffffff; |   border-top-color: #ffffff; | ||||||
|   border-bottom-color: #ffffff; |   border-bottom-color: #ffffff; | ||||||
|   opacity: 1; |   opacity: 1; | ||||||
|   filter: alpha(opacity=100); |   filter: alpha(opacity=100); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .tabs-stacked .open > a:hover { | .tabs-stacked .open > a:hover, | ||||||
|  | .tabs-stacked .open > a:focus { | ||||||
|   border-color: #999999; |   border-color: #999999; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | @ -4232,13 +4268,15 @@ input[type="submit"].btn.btn-mini { | ||||||
|           border-radius: 0 0 4px 4px; |           border-radius: 0 0 4px 4px; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .tabs-below > .nav-tabs > li > a:hover { | .tabs-below > .nav-tabs > li > a:hover, | ||||||
|  | .tabs-below > .nav-tabs > li > a:focus { | ||||||
|   border-top-color: #ddd; |   border-top-color: #ddd; | ||||||
|   border-bottom-color: transparent; |   border-bottom-color: transparent; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .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; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | @ -4267,12 +4305,14 @@ input[type="submit"].btn.btn-mini { | ||||||
|           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: #eeeeee #dddddd #eeeeee #eeeeee; |   border-color: #eeeeee #dddddd #eeeeee #eeeeee; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .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: #ffffff; |   *border-right-color: #ffffff; | ||||||
| } | } | ||||||
|  | @ -4290,12 +4330,14 @@ input[type="submit"].btn.btn-mini { | ||||||
|           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: #eeeeee #eeeeee #eeeeee #dddddd; |   border-color: #eeeeee #eeeeee #eeeeee #dddddd; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .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: #ffffff; |   *border-left-color: #ffffff; | ||||||
| } | } | ||||||
|  | @ -4304,7 +4346,8 @@ input[type="submit"].btn.btn-mini { | ||||||
|   color: #999999; |   color: #999999; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .nav > .disabled > a:hover { | .nav > .disabled > a:hover, | ||||||
|  | .nav > .disabled > a:focus { | ||||||
|   text-decoration: none; |   text-decoration: none; | ||||||
|   cursor: default; |   cursor: default; | ||||||
|   background-color: transparent; |   background-color: transparent; | ||||||
|  | @ -4370,7 +4413,8 @@ input[type="submit"].btn.btn-mini { | ||||||
|   text-shadow: 0 1px 0 #ffffff; |   text-shadow: 0 1px 0 #ffffff; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .navbar .brand:hover { | .navbar .brand:hover, | ||||||
|  | .navbar .brand:focus { | ||||||
|   text-decoration: none; |   text-decoration: none; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | @ -4384,7 +4428,8 @@ input[type="submit"].btn.btn-mini { | ||||||
|   color: #777777; |   color: #777777; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .navbar-link:hover { | .navbar-link:hover, | ||||||
|  | .navbar-link:focus { | ||||||
|   color: #333333; |   color: #333333; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | @ -4612,6 +4657,7 @@ input[type="submit"].btn.btn-mini { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .navbar .btn-navbar:hover, | .navbar .btn-navbar:hover, | ||||||
|  | .navbar .btn-navbar:focus, | ||||||
| .navbar .btn-navbar:active, | .navbar .btn-navbar:active, | ||||||
| .navbar .btn-navbar.active, | .navbar .btn-navbar.active, | ||||||
| .navbar .btn-navbar.disabled, | .navbar .btn-navbar.disabled, | ||||||
|  | @ -4681,7 +4727,8 @@ input[type="submit"].btn.btn-mini { | ||||||
|   border-bottom: 0; |   border-bottom: 0; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .navbar .nav li.dropdown > a:hover .caret { | .navbar .nav li.dropdown > a:hover .caret, | ||||||
|  | .navbar .nav li.dropdown > a:focus .caret { | ||||||
|   border-top-color: #333333; |   border-top-color: #333333; | ||||||
|   border-bottom-color: #333333; |   border-bottom-color: #333333; | ||||||
| } | } | ||||||
|  | @ -4753,7 +4800,9 @@ input[type="submit"].btn.btn-mini { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .navbar-inverse .brand:hover, | .navbar-inverse .brand:hover, | ||||||
| .navbar-inverse .nav > li > a:hover { | .navbar-inverse .nav > li > a:hover, | ||||||
|  | .navbar-inverse .brand:focus, | ||||||
|  | .navbar-inverse .nav > li > a:focus { | ||||||
|   color: #ffffff; |   color: #ffffff; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | @ -4782,7 +4831,8 @@ input[type="submit"].btn.btn-mini { | ||||||
|   color: #999999; |   color: #999999; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .navbar-inverse .navbar-link:hover { | .navbar-inverse .navbar-link:hover, | ||||||
|  | .navbar-inverse .navbar-link:focus { | ||||||
|   color: #ffffff; |   color: #ffffff; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | @ -4798,7 +4848,8 @@ input[type="submit"].btn.btn-mini { | ||||||
|   background-color: #111111; |   background-color: #111111; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .navbar-inverse .nav li.dropdown > a:hover .caret { | .navbar-inverse .nav li.dropdown > a:hover .caret, | ||||||
|  | .navbar-inverse .nav li.dropdown > a:focus .caret { | ||||||
|   border-top-color: #ffffff; |   border-top-color: #ffffff; | ||||||
|   border-bottom-color: #ffffff; |   border-bottom-color: #ffffff; | ||||||
| } | } | ||||||
|  | @ -4871,6 +4922,7 @@ input[type="submit"].btn.btn-mini { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .navbar-inverse .btn-navbar:hover, | .navbar-inverse .btn-navbar:hover, | ||||||
|  | .navbar-inverse .btn-navbar:focus, | ||||||
| .navbar-inverse .btn-navbar:active, | .navbar-inverse .btn-navbar:active, | ||||||
| .navbar-inverse .btn-navbar.active, | .navbar-inverse .btn-navbar.active, | ||||||
| .navbar-inverse .btn-navbar.disabled, | .navbar-inverse .btn-navbar.disabled, | ||||||
|  | @ -4945,6 +4997,7 @@ input[type="submit"].btn.btn-mini { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .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: #f5f5f5; |   background-color: #f5f5f5; | ||||||
|  | @ -4958,7 +5011,8 @@ input[type="submit"].btn.btn-mini { | ||||||
| 
 | 
 | ||||||
| .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: #999999; |   color: #999999; | ||||||
|   cursor: default; |   cursor: default; | ||||||
|   background-color: transparent; |   background-color: transparent; | ||||||
|  | @ -5088,7 +5142,8 @@ input[type="submit"].btn.btn-mini { | ||||||
|           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; | ||||||
| } | } | ||||||
|  | @ -5105,6 +5160,7 @@ input[type="submit"].btn.btn-mini { | ||||||
| 
 | 
 | ||||||
| .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: #999999; |   color: #999999; | ||||||
|   cursor: default; |   cursor: default; | ||||||
|  | @ -5503,7 +5559,8 @@ input[type="submit"].btn.btn-mini { | ||||||
|           transition: all 0.2s ease-in-out; |           transition: all 0.2s ease-in-out; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| a.thumbnail:hover { | a.thumbnail:hover, | ||||||
|  | a.thumbnail:focus { | ||||||
|   border-color: #0088cc; |   border-color: #0088cc; | ||||||
|   -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); |   -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); | ||||||
|      -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); |      -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); | ||||||
|  | @ -5593,7 +5650,9 @@ a.thumbnail:hover { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| a.label:hover, | a.label:hover, | ||||||
| a.badge:hover { | a.label:focus, | ||||||
|  | a.badge:hover, | ||||||
|  | a.badge:focus { | ||||||
|   color: #ffffff; |   color: #ffffff; | ||||||
|   text-decoration: none; |   text-decoration: none; | ||||||
|   cursor: pointer; |   cursor: pointer; | ||||||
|  | @ -5989,7 +6048,8 @@ a.badge:hover { | ||||||
|   left: auto; |   left: auto; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .carousel-control:hover { | .carousel-control:hover, | ||||||
|  | .carousel-control:focus { | ||||||
|   color: #ffffff; |   color: #ffffff; | ||||||
|   text-decoration: none; |   text-decoration: none; | ||||||
|   opacity: 0.9; |   opacity: 0.9; | ||||||
|  |  | ||||||
|  | @ -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 »</a></p> |             <p><a href="#" class="btn btn-primary btn-large">Learn more »</a></p> | ||||||
|           </div> |           </div> | ||||||
|           <div class="row-fluid"> |           <div class="row-fluid"> | ||||||
|             <div class="span4"> |             <div class="span4"> | ||||||
|  |  | ||||||
|  | @ -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 »</a></p> |         <p><a href="#" class="btn btn-primary btn-large">Learn more »</a></p> | ||||||
|       </div> |       </div> | ||||||
| 
 | 
 | ||||||
|       <!-- Example row of columns --> |       <!-- Example row of columns --> | ||||||
|  |  | ||||||
|  | @ -212,7 +212,7 @@ | ||||||
| 
 | 
 | ||||||
|   , getPosition: function () { |   , getPosition: function () { | ||||||
|       var el = this.$element[0] |       var el = this.$element[0] | ||||||
|       return $.extend({}, el.getBoundingClientRect ? el.getBoundingClientRect() : { |       return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { | ||||||
|         width: el.offsetWidth |         width: el.offsetWidth | ||||||
|       , height: el.offsetHeight |       , height: el.offsetHeight | ||||||
|       }, this.$element.offset()) |       }, this.$element.offset()) | ||||||
|  |  | ||||||
|  | @ -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 { | ||||||
|   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; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -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); | ||||||
|  |  | ||||||
|  | @ -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; | ||||||
|  |  | ||||||
|  | @ -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 @@ | ||||||
| // 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 @@ | ||||||
| 
 | 
 | ||||||
| // 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 | ||||||
|  |  | ||||||
|  | @ -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; | ||||||
|  |  | ||||||
|  | @ -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%); | ||||||
|  |  | ||||||
|  | @ -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 @@ | ||||||
| // ------------------------- | // ------------------------- | ||||||
| .navbar-link { | .navbar-link { | ||||||
|   color: @navbarLinkColor; |   color: @navbarLinkColor; | ||||||
|   &:hover { |   &:hover, | ||||||
|  |   &:focus { | ||||||
|     color: @navbarLinkColorHover; |     color: @navbarLinkColorHover; | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  | @ -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; | ||||||
| } | } | ||||||
|  | @ -336,8 +338,9 @@ | ||||||
|   } |   } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // Caret should match text color on hover | // Caret should match text color on hover/focus | ||||||
| .navbar .nav li.dropdown > a:hover .caret { | .navbar .nav li.dropdown > a:hover .caret, | ||||||
|  | .navbar .nav li.dropdown > a:focus .caret { | ||||||
|   border-top-color: @navbarLinkColorHover; |   border-top-color: @navbarLinkColorHover; | ||||||
|   border-bottom-color: @navbarLinkColorHover; |   border-bottom-color: @navbarLinkColorHover; | ||||||
| } | } | ||||||
|  | @ -397,7 +400,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 +430,8 @@ | ||||||
|   // Inline text links |   // Inline text links | ||||||
|   .navbar-link { |   .navbar-link { | ||||||
|     color: @navbarInverseLinkColor; |     color: @navbarInverseLinkColor; | ||||||
|     &:hover { |     &:hover, | ||||||
|  |     &:focus { | ||||||
|       color: @navbarInverseLinkColorHover; |       color: @navbarInverseLinkColorHover; | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  | @ -444,7 +449,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; | ||||||
|   } |   } | ||||||
|  |  | ||||||
|  | @ -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 @@ | ||||||
|   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 @@ | ||||||
|   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 @@ | ||||||
| 
 | 
 | ||||||
| // 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 @@ | ||||||
| .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 @@ | ||||||
|   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 @@ | ||||||
|   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 @@ | ||||||
| // ------------------------- | // ------------------------- | ||||||
| .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 @@ | ||||||
| } | } | ||||||
| .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 @@ | ||||||
|   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 @@ | ||||||
|   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 @@ | ||||||
| .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; | ||||||
|  |  | ||||||
|  | @ -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 @@ | ||||||
| } | } | ||||||
| .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; | ||||||
|  |  | ||||||
|  | @ -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 @@ | ||||||
| } | } | ||||||
| .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; | ||||||
|  |  | ||||||
|  | @ -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 @@ | ||||||
|     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 | ||||||
|  |  | ||||||
|  | @ -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; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -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 @@ | ||||||
| .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}"); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -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)); | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -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; } | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue