From 8b58a1c3d9fea740c89f48c1771a6c7dd44e1f41 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 2 Jan 2012 19:13:02 -0800 Subject: [PATCH] placeholder design for carousel --- bootstrap.css | 28 ++++++++++++++++++++-- bootstrap.min.css | 6 +++-- docs/javascript.html | 55 +++++++++++++++++++++++++++++++++----------- lib/thumbnails.less | 26 +++++++++++++++++---- 4 files changed, 92 insertions(+), 23 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 601c1875b9..ae1754aa65 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 Jan 2 16:04:30 PST 2012 + * Date: Mon Jan 2 19:12:52 PST 2012 */ html, body { margin: 0; @@ -491,7 +491,7 @@ address { } code, pre { padding: 0 3px 2px; - font-family: Menlo, Monaco, Courier New, monospace; + font-family: Menlo, Monaco, "Courier New", monospace; font-size: 12px; color: #404040; -webkit-border-radius: 3px; @@ -2584,12 +2584,36 @@ a.thumbnail:hover { .thumbnail .caption { padding: 9px; } +.carousel { + position: relative; +} .carousel .item { display: none; } .carousel .active { display: block; } +.carousel .nav { + height: 50px; + position: absolute; + top: 50%; + margin: -25px 0 0; + cursor: pointer; + background: rgba(0, 0, 0, 0.7); + color: white; + font-size: 42px; + left: 5px; + font-weight: 100; + padding: 0 15px; +} +.carousel .nav.right { + right: 5px; + left: auto; +} +.carousel .nav:hover { + text-decoration: none; + background: rgba(0, 0, 0, 0.8); +} .hidden { display: none; visibility: hidden; diff --git a/bootstrap.min.css b/bootstrap.min.css index b3e5a3eefe..2272502263 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -87,7 +87,7 @@ blockquote{padding-left:15px;margin-bottom:18px;border-left:5px solid #eee;}bloc blockquote small{display:block;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';} blockquote.pull-right{float:right;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} address{display:block;margin-bottom:18px;line-height:18px;} -code,pre{padding:0 3px 2px;font-family:Menlo, Monaco, Courier New, monospace;font-size:12px;color:#404040;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#404040;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} code{padding:1px 3px;background-color:#fee9cc;} pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;} pre code{padding:0;background-color:transparent;} @@ -342,7 +342,9 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; 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;max-width:100%;} .thumbnail .caption{padding:9px;} -.carousel .item{display:none;} +.carousel{position:relative;}.carousel .item{display:none;} .carousel .active{display:block;} +.carousel .nav{height:50px;position:absolute;top:50%;margin:-25px 0 0;cursor:pointer;background:rgba(0, 0, 0, 0.7);color:white;font-size:42px;left:5px;font-weight:100;padding:0 15px;}.carousel .nav.right{right:5px;left:auto;} +.carousel .nav:hover{text-decoration:none;background:rgba(0, 0, 0, 0.8);} .hidden{display:none;visibility:hidden;} @media (max-width: 480px){.modal{width:auto;margin:0;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;}.modal .close{padding:10px;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}} diff --git a/docs/javascript.html b/docs/javascript.html index 8e5e22adba..ae464e849e 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -118,8 +118,8 @@ The collapse plugin offers simple, generic collapsible element support for making accordions and other collapsible ui components. - bootstrap-carousel.js - Carousel add + bootstrap-carousel.js + A plugin for rotating through elements. A merry-go-round. @@ -1015,7 +1015,7 @@ $('#myCollapsible').on('hidden', function () {
-

The carousel plugin creates a carousel douh..

+

A generic plugin for cycling through elements. A merry-go-round.

Download
@@ -1023,19 +1023,40 @@ $('#myCollapsible').on('hidden', function () { 
$('.carousel').carousel()

Markup

Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.

- 

+
+<div class="thumbnail carousel">
+
+  <!-- navigation -->
+  <a class="nav" href="#myCarousel" data-show="next">&lt;</a>
+  <a class="nav" href="#myCarousel" data-show="previous">&gt;</a>
+
+  <!-- items -->
+  <div class="item active">
+    <img src="http://placehold.it/1100x350">
+    <div class="caption">
+      <h5>Thumbnail label</h5>
+      <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. </p>
+    </div>
+  </div>
+
+  <div class="item">
+    <img src="http://placehold.it/1100x350">
+    <div class="caption">
+      <h5>Thumbnail label</h5>
+      <p>Donec id elit non mi porta gravida at eget metus.</p>
+    </div>
+  </div>
+
+</div>
+

           
Demo

 
           
-          

 
-            

-              
-              

-                
Thumbnail label

-                
Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

-              

-            

+          
 
+            

+              
+              

+                
Thumbnail label

+                
Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

+              

+            

+
           

 
-
-
         

       

     
diff --git a/lib/thumbnails.less b/lib/thumbnails.less
index ae2e6c94e9..181cca6817 100644
--- a/lib/thumbnails.less
+++ b/lib/thumbnails.less
@@ -33,10 +33,26 @@ a.thumbnail:hover {
   padding: 9px;
 }
 
-.carousel .item {
-  display: none;
-}
+// carousel
+.carousel {
+  position: relative;
 
-.carousel .active {
-  display: block;
+  .item { display: none; }
+  .active { display: block; }
+
+  .nav {
+    height: 50px;
+    position: absolute;
+    top: 50%;
+    margin: -25px 0 0;
+    cursor: pointer;
+    background: rgba(0, 0, 0, 0.7);
+    color: white;
+    font-size: 42px;
+    left: 5px;
+    font-weight: 100;
+    padding: 0 15px;
+    &.right { right: 5px; left: auto; }
+    &:hover { text-decoration: none; background: rgba(0, 0, 0, 0.8); }
+  }
 }
\ No newline at end of file