1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-02 18:02:37 +02:00

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

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-07-24 16:53:34 -07:00
6 changed files with 9 additions and 9 deletions

View File

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

View File

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

View File

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

View File

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