rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-29 21:52:22 +01:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2013-07-24 16:53:34 -07:00
commit 1f40da9676
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/css/bootstrap.css vendored
View File

@ -2219,7 +2219,7 @@ input[type="button"].btn-block {
.dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:hover,
.dropdown-menu > .disabled > a:focus { .dropdown-menu > .disabled > a:focus {
text-decoration: none; text-decoration: none;
cursor: default; cursor: not-allowed;
background-color: transparent; background-color: transparent;
background-image: none; background-image: none;
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
@ -2540,7 +2540,7 @@ button.close {
.nav > li.disabled > a:focus { .nav > li.disabled > a:focus {
color: #999999; color: #999999;
text-decoration: none; text-decoration: none;
cursor: default; cursor: not-allowed;
background-color: transparent; background-color: transparent;
} }
@ -3316,7 +3316,7 @@ button.close {
.pagination > .disabled > a:hover, .pagination > .disabled > a:hover,
.pagination > .disabled > a:focus { .pagination > .disabled > a:focus {
color: #999999; color: #999999;
cursor: default; cursor: not-allowed;
background-color: #ffffff; background-color: #ffffff;
} }
@ -3417,7 +3417,7 @@ button.close {
.pager .disabled > a:focus, .pager .disabled > a:focus,
.pager .disabled > span { .pager .disabled > span {
color: #999999; color: #999999;
cursor: default; cursor: not-allowed;
background-color: #ffffff; background-color: #ffffff;
} }

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
less/dropdowns.less
View File

@ -102,7 +102,7 @@
background-color: transparent; background-color: transparent;
background-image: none; // Remove CSS gradient background-image: none; // Remove CSS gradient
.reset-filter(); .reset-filter();
cursor: default; cursor: not-allowed;
} }
} }

2
less/navs.less
View File

@ -36,7 +36,7 @@
color: @gray-light; color: @gray-light;
text-decoration: none; text-decoration: none;
background-color: transparent; background-color: transparent;
cursor: default; cursor: not-allowed;
} }
} }

2
less/pager.less
View File

@ -48,7 +48,7 @@
> span { > span {
color: @gray-light; color: @gray-light;
background-color: @pagination-bg; background-color: @pagination-bg;
cursor: default; cursor: not-allowed;
} }
} }

2
less/pagination.less
View File

@ -53,7 +53,7 @@
> a:focus { > a:focus {
color: @gray-light; color: @gray-light;
background-color: @pagination-bg; background-color: @pagination-bg;
cursor: default; cursor: not-allowed;
} }
} }
} }