aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-11-04 00:31:43 -0700
committerMark Otto <[email protected]>2012-11-04 00:31:43 -0700
commit25fded1ff4a0ba13e1566adcf6ac82b88e291adb (patch)
treee2c98ca5851cf133fa35b96862baf8b62aa1945b
parent3de6f3ff88eeac5276af46e0262101b715dea1ad (diff)
downloadbootstrap-25fded1ff4a0ba13e1566adcf6ac82b88e291adb.tar.xz
bootstrap-25fded1ff4a0ba13e1566adcf6ac82b88e291adb.zip
responsive images, updated shadows on navbars, remove responsive file from docs
-rw-r--r--docs/assets/css/bootstrap.css8
-rw-r--r--docs/assets/css/docs.css17
-rw-r--r--docs/assets/img/bs-docs-bootstrap-features.pngbin5039 -> 11244 bytes
-rw-r--r--docs/assets/img/bs-docs-responsive-illustrations.pngbin10744 -> 10572 bytes
-rw-r--r--docs/assets/img/bs-docs-twitter-github.pngbin14894 -> 30968 bytes
-rw-r--r--docs/assets/img/less-logo-large.pngbin12824 -> 0 bytes
-rw-r--r--docs/templates/layout.mustache1
-rw-r--r--less/navbar.less4
8 files changed, 17 insertions, 13 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 7320e6da4..0f936bae3 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3916,14 +3916,14 @@ input[type="button"].btn-block {
.navbar-fixed-top,
.navbar-static-top {
- -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
- box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
+ -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+ box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
}
.navbar-fixed-bottom {
bottom: 0;
- -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
- box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
+ -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+ box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
}
.navbar .nav {
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index ec15ae2f1..ebd111fd8 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -134,9 +134,6 @@ hr.soften {
font-weight: 200;
color: #fff; /* redeclare to override the `.jumbotron a` */
border: 0;
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
- border-radius: 6px;
-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25);
-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25);
box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25);
@@ -173,6 +170,16 @@ hr.soften {
background: url(../img/bs-docs-masthead-pattern.png) repeat center center;
opacity: .4;
}
+@media
+only screen and (-webkit-min-device-pixel-ratio: 2),
+only screen and ( min--moz-device-pixel-ratio: 2),
+only screen and ( -o-min-device-pixel-ratio: 2/1) {
+
+ .jumbotron:after {
+ background-size: 150px 150px;
+ }
+
+}
/* Masthead (docs home)
------------------------- */
@@ -317,9 +324,7 @@ hr.soften {
.show-grid [class*="span"] {
background-color: #eee;
text-align: center;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
+ border-radius: 3px;
min-height: 40px;
line-height: 40px;
}
diff --git a/docs/assets/img/bs-docs-bootstrap-features.png b/docs/assets/img/bs-docs-bootstrap-features.png
index d02c5ca69..7cd8501ae 100644
--- a/docs/assets/img/bs-docs-bootstrap-features.png
+++ b/docs/assets/img/bs-docs-bootstrap-features.png
Binary files differ
diff --git a/docs/assets/img/bs-docs-responsive-illustrations.png b/docs/assets/img/bs-docs-responsive-illustrations.png
index 66b564b31..77c8f18f5 100644
--- a/docs/assets/img/bs-docs-responsive-illustrations.png
+++ b/docs/assets/img/bs-docs-responsive-illustrations.png
Binary files differ
diff --git a/docs/assets/img/bs-docs-twitter-github.png b/docs/assets/img/bs-docs-twitter-github.png
index e49eb46e4..06100f398 100644
--- a/docs/assets/img/bs-docs-twitter-github.png
+++ b/docs/assets/img/bs-docs-twitter-github.png
Binary files differ
diff --git a/docs/assets/img/less-logo-large.png b/docs/assets/img/less-logo-large.png
deleted file mode 100644
index 8f62ffbe0..000000000
--- a/docs/assets/img/less-logo-large.png
+++ /dev/null
Binary files differ
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 6a8fbd926..cdbee0793 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -9,7 +9,6 @@
<!-- Le styles -->
<link href="assets/css/bootstrap.css" rel="stylesheet">
- <link href="assets/css/bootstrap-responsive.css" rel="stylesheet">
<link href="assets/css/docs.css" rel="stylesheet">
<link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
diff --git a/less/navbar.less b/less/navbar.less
index 3bfc8ae6e..c0d4b205f 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -182,13 +182,13 @@
}
.navbar-fixed-top,
.navbar-static-top {
- .box-shadow(~"inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)");
+ .box-shadow(0 1px 10px rgba(0,0,0,.1));
}
// Fixed to bottom
.navbar-fixed-bottom {
bottom: 0;
- .box-shadow(~"inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1)");
+ .box-shadow(0 -1px 10px rgba(0,0,0,.1));
}