aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-12-19 23:52:38 -0800
committerMark Otto <[email protected]>2012-12-19 23:52:38 -0800
commit9726fded1c587c14b57a61a92b88ac74fe21d320 (patch)
tree20168379104b2e4a05863ed038eb487ad428843a
parent5d776bcfd2e7da0bcce37252dc983149d8b2d377 (diff)
downloadbootstrap-9726fded1c587c14b57a61a92b88ac74fe21d320.tar.xz
bootstrap-9726fded1c587c14b57a61a92b88ac74fe21d320.zip
Get on that carousel indicator lifestyle with some new hawtness
-rw-r--r--docs/assets/css/bootstrap.css25
-rw-r--r--less/carousel.less25
-rw-r--r--package.json4
3 files changed, 52 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 6ef11ed9b..9b77c47b8 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -5968,6 +5968,31 @@ a.badge:hover {
filter: alpha(opacity=90);
}
+.carousel-indicators {
+ position: absolute;
+ top: 15px;
+ right: 15px;
+ z-index: 5;
+ margin: 0;
+ list-style: none;
+}
+
+.carousel-indicators li {
+ display: block;
+ float: left;
+ width: 10px;
+ height: 10px;
+ margin-left: 5px;
+ text-indent: -999px;
+ background-color: #ccc;
+ background-color: rgba(255, 255, 255, 0.25);
+ border-radius: 5px;
+}
+
+.carousel-indicators .active {
+ background-color: #fff;
+}
+
.carousel-caption {
position: absolute;
right: 0;
diff --git a/less/carousel.less b/less/carousel.less
index 2dc050603..b321e5bb5 100644
--- a/less/carousel.less
+++ b/less/carousel.less
@@ -105,6 +105,31 @@
}
}
+// Carousel indicator pips
+// -----------------------------
+.carousel-indicators {
+ position: absolute;
+ top: 15px;
+ right: 15px;
+ z-index: 5;
+ margin: 0;
+ list-style: none;
+
+ li {
+ display: block;
+ float: left;
+ width: 10px;
+ height: 10px;
+ margin-left: 5px;
+ text-indent: -999px;
+ background-color: #ccc;
+ background-color: rgba(255,255,255,.25);
+ border-radius: 5px;
+ }
+ .active {
+ background-color: #fff;
+ }
+}
// Caption for text below images
// -----------------------------
diff --git a/package.json b/package.json
index 794a9565b..9512b2c73 100644
--- a/package.json
+++ b/package.json
@@ -18,9 +18,9 @@
]
, "devDependencies": {
"uglify-js": "1.3.4"
- , "jshint": "0.6.1"
+ , "jshint": "0.9.1"
, "recess": "1.0.3"
, "connect": "2.1.3"
, "hogan.js": "2.0.0"
}
-} \ No newline at end of file
+}