diff --git a/bootstrap.css b/bootstrap.css index 3de652f55a..62690e42fe 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: Tue Jan 24 20:30:11 PST 2012 + * Date: Tue Jan 24 20:44:12 PST 2012 */ article, aside, @@ -2953,13 +2953,21 @@ a.thumbnail:hover { font-size: 60px; font-weight: 100; line-height: 30px; - color: #ccc; + color: #fff; text-align: center; - background: #999999; - background: rgba(0, 0, 0, 0.5); - -webkit-border-radius: 20px; - -moz-border-radius: 20px; - border-radius: 20px; + background: #222222; + border: 3px solid #fff; + -webkit-border-radius: 23px; + -moz-border-radius: 23px; + border-radius: 23px; + filter: alpha(opacity=50); + -moz-opacity: 0.5; + opacity: 0.5; + -webkit-transition: all 0.2s linear; + -moz-transition: all 0.2s linear; + -ms-transition: all 0.2s linear; + -o-transition: all 0.2s linear; + transition: all 0.2s linear; } .carousel-control.right { left: auto; @@ -2968,8 +2976,9 @@ a.thumbnail:hover { .carousel-control:hover { color: #ffffff; text-decoration: none; - background: #333333; - background: rgba(0, 0, 0, 0.75); + filter: alpha(opacity=90); + -moz-opacity: 0.9; + opacity: 0.9; } .carousel-caption { position: absolute; diff --git a/bootstrap.min.css b/bootstrap.min.css index 9b3bdc74b8..15d4f23613 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -530,8 +530,8 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, .carousel .next.left,.carousel .prev.right{left:0;} .carousel .active.left{left:-100%;} .carousel .active.right{left:100%;} -.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ccc;text-align:center;background:#999999;background:rgba(0, 0, 0, 0.5);-webkit-border-radius:20px;-moz-border-radius:20px;border-radius:20px;}.carousel-control.right{left:auto;right:15px;} -.carousel-control:hover{color:#ffffff;text-decoration:none;background:#333333;background:rgba(0, 0, 0, 0.75);} +.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;filter:alpha(opacity=50);-moz-opacity:0.5;opacity:0.5;-webkit-transition:all 0.2s linear;-moz-transition:all 0.2s linear;-ms-transition:all 0.2s linear;-o-transition:all 0.2s linear;transition:all 0.2s linear;}.carousel-control.right{left:auto;right:15px;} +.carousel-control:hover{color:#ffffff;text-decoration:none;filter:alpha(opacity=90);-moz-opacity:0.9;opacity:0.9;} .carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);} .carousel-caption h4,.carousel-caption p{color:#ffffff;} .pull-right{float:right;} diff --git a/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg b/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg new file mode 100644 index 0000000000..a5c7bb9009 Binary files /dev/null and b/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg differ diff --git a/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg b/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg new file mode 100644 index 0000000000..2f795e18f1 Binary files /dev/null and b/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg differ diff --git a/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg b/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg new file mode 100644 index 0000000000..911e64f897 Binary files /dev/null and b/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg differ diff --git a/docs/base-css.html b/docs/base-css.html index 6847c0616a..27251d8244 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -368,7 +368,7 @@
<pre class="prettyprint">
Using the google-code-prettify library, your blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
+Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
<div> <h1>Heading</h1> <p>Something right hereā¦</p> diff --git a/docs/javascript.html b/docs/javascript.html index cc9c0d9eb7..425d347cb8 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1215,21 +1215,21 @@ $('#myCollapsible').on('hidden', function () {