aboutsummaryrefslogtreecommitdiff
path: root/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-12-19 22:58:56 -0800
committerMark Otto <[email protected]>2011-12-19 22:58:56 -0800
commit72a536393c2f2aba4f855384e94c4ce09bc2e39c (patch)
tree94e4505ce831c891408d19e82f3f56511c9556de /bootstrap.css
parentaa69286c306ab4d0e5fe748953cded81f8260cc1 (diff)
downloadbootstrap-72a536393c2f2aba4f855384e94c4ce09bc2e39c.tar.xz
bootstrap-72a536393c2f2aba4f855384e94c4ce09bc2e39c.zip
mostly docs updates, but also some bug fixes per github issues
Diffstat (limited to 'bootstrap.css')
-rw-r--r--bootstrap.css35
1 files changed, 21 insertions, 14 deletions
diff --git a/bootstrap.css b/bootstrap.css
index 6411413ff..f57423b0c 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Mon Dec 12 09:51:27 PST 2011
+ * Date: Mon Dec 19 22:58:34 PST 2011
*/
html, body {
margin: 0;
@@ -600,9 +600,11 @@ select, input[type=file] {
line-height: 27px;
}
+select {
+ background-color: #ffffff;
+}
select[multiple] {
height: inherit;
- background-color: #ffffff;
}
input[type=image] {
-webkit-box-shadow: none;
@@ -2492,27 +2494,28 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
.popover .content p, .popover .content ul, .popover .content ol {
margin-bottom: 0;
}
-.media-grid {
+.thumbnails {
margin-left: -20px;
margin-bottom: 0;
+ list-style: none;
zoom: 1;
}
-.media-grid:before, .media-grid:after {
+.thumbnails:before, .thumbnails:after {
display: table;
*display: inline;
content: "";
zoom: 1;
}
-.media-grid:after {
+.thumbnails:after {
clear: both;
}
-.media-grid li {
- display: inline;
-}
-.media-grid a {
+.thumbnails > li {
float: left;
- padding: 4px;
margin: 0 0 20px 20px;
+}
+.thumbnail {
+ display: block;
+ line-height: 1;
border: 1px solid #ddd;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
@@ -2521,15 +2524,19 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
}
-.media-grid a img {
- display: block;
-}
-.media-grid a:hover {
+a.thumbnail:hover {
border-color: #0069d6;
-webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
}
+.thumbnail > img {
+ display: block;
+ margin: 4px;
+}
+.thumbnail .caption {
+ padding: 9px;
+}
.hidden {
display: none;
visibility: hidden;