From c02501e1b714ebb44c560483316ac36c4f709c50 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jan 2012 16:27:36 -0800 Subject: [PATCH] move carousel to separate stylesheet, update popovers to fix ie7 bug, fix pagination, fix alerts --- bootstrap.css | 165 ++++++++++++++++++++++--------------------- bootstrap.min.css | 39 +++++----- docs/javascript.html | 2 +- lib/alerts.less | 8 +-- lib/bootstrap.less | 1 + lib/carousel.less | 54 ++++++++++++++ lib/pagination.less | 12 ++-- lib/popovers.less | 4 +- lib/thumbnails.less | 53 -------------- 9 files changed, 174 insertions(+), 164 deletions(-) create mode 100644 lib/carousel.less diff --git a/bootstrap.css b/bootstrap.css index b5f7949e5c..aabc868d2e 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: Sun Jan 15 13:11:42 PST 2012 + * Date: Sun Jan 15 16:27:00 PST 2012 */ html, body { margin: 0; @@ -2084,8 +2084,6 @@ i { *zoom: 1; margin-left: 0; margin-bottom: 0; - border: 1px solid #ddd; - border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -2101,8 +2099,8 @@ i { padding: 0 14px; line-height: 34px; text-decoration: none; - border-right: 1px solid #ddd; - border-right: 1px solid rgba(0, 0, 0, 0.15); + border: 1px solid #ddd; + border-left-width: 0; } .pagination a:hover, .pagination .active a { background-color: #f5f5f5; @@ -2115,8 +2113,16 @@ i { background-color: transparent; cursor: default; } +.pagination li:first-child a { + border-left-width: 1px; + -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; + border-radius: 3px 0 0 3px; +} .pagination li:last-child a { - border: 0; + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; } .pagination-centered { text-align: center; @@ -2383,8 +2389,8 @@ i { padding: 3px; width: 280px; overflow: hidden; - background-color: #000000; - background-color: rgba(0, 0, 0, 0.8); + background: #000000; + background: rgba(0, 0, 0, 0.8); -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -2667,7 +2673,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { opacity: 0.75; } .alert { - position: relative; padding: 8px 35px 8px 14px; margin-bottom: 18px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); @@ -2680,11 +2685,12 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .alert, .alert-heading { color: #c09853; } -.alert > .close { +.alert .close { *margin-top: 3px; /* IE7 spacing */ - margin-right: -21px; + position: relative; + right: -21px; } .alert-success { background-color: #dff0d8; @@ -2722,7 +2728,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .thumbnails { margin-left: -20px; - margin-bottom: 0; list-style: none; zoom: 1; } @@ -2764,74 +2769,6 @@ a.thumbnail:hover { .thumbnail .caption { padding: 9px; } -.carousel { - position: relative; -} -.carousel .carousel-inner { - overflow: hidden; - width: 100%; - position: relative; -} -.carousel .item { - display: none; - position: relative; - -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; -} -.carousel .active, .carousel .next, .carousel .prev { - display: block; -} -.carousel .active { - left: 0; -} -.carousel .next, .carousel .prev { - position: absolute; - top: 0; - width: 100%; -} -.carousel .next { - left: 100%; -} -.carousel .prev { - left: -100%; -} -.carousel .next.left, .carousel .prev.right { - left: 0%; -} -.carousel .active.left { - left: -100%; -} -.carousel .active.right { - left: 100%; -} -.carousel .nav { - width: auto; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - 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); -} .label { padding: 1px 3px 2px; font-size: 9.75px; @@ -2999,6 +2936,74 @@ a.thumbnail:hover { background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } +.carousel { + position: relative; +} +.carousel .carousel-inner { + overflow: hidden; + width: 100%; + position: relative; +} +.carousel .item { + display: none; + position: relative; + -webkit-transition: 0.6s ease-in-out left; + -moz-transition: 0.6s ease-in-out left; + -ms-transition: 0.6s ease-in-out left; + -o-transition: 0.6s ease-in-out left; + transition: 0.6s ease-in-out left; +} +.carousel .active, .carousel .next, .carousel .prev { + display: block; +} +.carousel .active { + left: 0; +} +.carousel .next, .carousel .prev { + position: absolute; + top: 0; + width: 100%; +} +.carousel .next { + left: 100%; +} +.carousel .prev { + left: -100%; +} +.carousel .next.left, .carousel .prev.right { + left: 0%; +} +.carousel .active.left { + left: -100%; +} +.carousel .active.right { + left: 100%; +} +.carousel .nav { + width: auto; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + 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); +} .pull-right { float: right; } diff --git a/bootstrap.min.css b/bootstrap.min.css index 2cd9ad8374..91c6553f6c 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -402,13 +402,14 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou .breadcrumb .divider{padding:0 5px;color:#999999;} .breadcrumb .active a{color:#333333;} .pagination{height:36px;margin:18px 0;} -.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} +.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} .pagination li{display:inline;} -.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border-right:1px solid #ddd;border-right:1px solid rgba(0, 0, 0, 0.15);} +.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0;} .pagination a:hover,.pagination .active a{background-color:#f5f5f5;} .pagination .active a{color:#999999;} .pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;} -.pagination li:last-child a{border:0;} +.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} .pagination-centered{text-align:center;} .pagination-right{text-align:right;} .pager{margin-left:0;margin-bottom:18px;list-style:none;text-align:center;zoom:1;}.pager:before,.pager:after{display:table;*display:inline;content:"";zoom:1;} @@ -446,7 +447,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou .popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} .popover .arrow{position:absolute;width:0;height:0;} -.popover .inner{padding:3px;width:280px;overflow:hidden;background-color:#000000;background-color:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} +.popover .inner{padding:3px;width:280px;overflow:hidden;background:#000000;background:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} .popover .title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;} .popover .content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} .btn.danger,.btn.danger:hover,.btn.success,.btn.success:hover,.btn.info,.btn.info:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;} @@ -478,9 +479,9 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);} .btn .caret{margin-top:6px;margin-left:0;} .primary .caret,.danger .caret,.info .caret,.success .caret{border-top-color:#fff;filter:alpha(opacity=75);-moz-opacity:0.75;opacity:0.75;} -.alert{position:relative;padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #f3edd2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #f3edd2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .alert,.alert-heading{color:#c09853;} -.alert>.close{*margin-top:3px;margin-right:-21px;} +.alert .close{*margin-top:3px;position:relative;right:-21px;} .alert-success{background-color:#dff0d8;border-color:#cfe8c4;} .alert-success,.alert-success .alert-heading{color:#468847;} .alert-danger,.alert-error{background-color:#f2dede;border-color:#e9c7c7;} @@ -490,25 +491,13 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .alert-block{padding-top:14px;padding-bottom:14px;} .alert-block>p,.alert-block>ul{margin-bottom:0;} .alert-block p+p{margin-top:5px;} -.thumbnails{margin-left:-20px;margin-bottom:0;list-style:none;zoom:1;}.thumbnails:before,.thumbnails:after{display:table;*display:inline;content:"";zoom:1;} +.thumbnails{margin-left:-20px;list-style:none;zoom:1;}.thumbnails:before,.thumbnails:after{display:table;*display:inline;content:"";zoom:1;} .thumbnails:after{clear:both;} .thumbnails>li{float:left;margin:0 0 20px 20px;} .thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);} a.thumbnail:hover{border-color:#0088cc;-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{position:relative;}.carousel .carousel-inner{overflow:hidden;width:100%;position:relative;} -.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;} -.carousel .active,.carousel .next,.carousel .prev{display:block;} -.carousel .active{left:0;} -.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;} -.carousel .next{left:100%;} -.carousel .prev{left:-100%;} -.carousel .next.left,.carousel .prev.right{left:0%;} -.carousel .active.left{left:-100%;} -.carousel .active.right{left:100%;} -.carousel .nav{width:auto;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;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);} .label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;} .label.warning{background-color:#f89406;} .label.success{background-color:#46a546;} @@ -524,6 +513,18 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, .progress.success.striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} .progress.info .bar{background-color:#339bb9;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);} .progress.info.striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.carousel{position:relative;}.carousel .carousel-inner{overflow:hidden;width:100%;position:relative;} +.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;} +.carousel .active,.carousel .next,.carousel .prev{display:block;} +.carousel .active{left:0;} +.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;} +.carousel .next{left:100%;} +.carousel .prev{left:-100%;} +.carousel .next.left,.carousel .prev.right{left:0%;} +.carousel .active.left{left:-100%;} +.carousel .active.right{left:100%;} +.carousel .nav{width:auto;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;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);} .pull-right{float:right;} .pull-left{float:left;} .hide{display:none;} diff --git a/docs/javascript.html b/docs/javascript.html index 2d7b74dd3a..015f451428 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -908,7 +908,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

The alerts plugin works on regular alert messages, and block messages.

× -

Holy guacamole! Best check yo self, you’re not looking too good.

+ Holy guacamole! Best check yo self, you’re not looking too good.
× diff --git a/lib/alerts.less b/lib/alerts.less index a338f502a1..53a43c6e4f 100644 --- a/lib/alerts.less +++ b/lib/alerts.less @@ -3,7 +3,6 @@ // Base alert styles .alert { - position: relative; padding: 8px 35px 8px 14px; margin-bottom: @baseLineHeight; text-shadow: 0 1px 0 rgba(255,255,255,.5); @@ -17,9 +16,10 @@ } // Adjust close link position -.alert > .close { +.alert .close { *margin-top: 3px; /* IE7 spacing */ - margin-right: -21px; + position: relative; + right: -21px; } // Alternate styles @@ -66,4 +66,4 @@ } .alert-block p + p { margin-top: 5px; -} \ No newline at end of file +} diff --git a/lib/bootstrap.less b/lib/bootstrap.less index db6a192f59..db5ed61f7f 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -52,6 +52,7 @@ @import "thumbnails.less"; @import "labels.less"; @import "progress-bars.less"; +@import "carousel.less"; // Utility classes @import "utilities.less"; // Has to be last to override when necessary diff --git a/lib/carousel.less b/lib/carousel.less new file mode 100644 index 0000000000..0cfb0127a0 --- /dev/null +++ b/lib/carousel.less @@ -0,0 +1,54 @@ +// CAROUSEL +// -------- + +.carousel { + + position: relative; + + .carousel-inner { + overflow: hidden; + width: 100%; + position: relative; + } + + .item { + display: none; + position: relative; + .transition(.6s ease-in-out left); + } + + .active, .next, .prev { display: block; } + + .active { left: 0 } + + .next, .prev { + position: absolute; + top: 0; + width: 100%; + } + + .next { left: 100%; } + .prev { left: -100%; } + .next.left, .prev.right { left: 0% } + + .active.left { left: -100% } + .active.right { left: 100% } + + .nav { + width: auto; + .border-radius(0); + 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 diff --git a/lib/pagination.less b/lib/pagination.less index 064362b7bc..8ecb2a4015 100644 --- a/lib/pagination.less +++ b/lib/pagination.less @@ -10,8 +10,6 @@ .ie7-inline-block(); margin-left: 0; margin-bottom: 0; - border: 1px solid #ddd; - border: 1px solid rgba(0,0,0,.15); .border-radius(3px); .box-shadow(0 1px 2px rgba(0,0,0,.05)); } @@ -23,8 +21,8 @@ padding: 0 14px; line-height: (@baseLineHeight * 2) - 2; text-decoration: none; - border-right: 1px solid #ddd; - border-right: 1px solid rgba(0,0,0,.15); + border: 1px solid #ddd; + border-left-width: 0; } .pagination a:hover, .pagination .active a { @@ -39,8 +37,12 @@ background-color: transparent; cursor: default; } +.pagination li:first-child a { + border-left-width: 1px; + .border-radius(3px 0 0 3px); +} .pagination li:last-child a { - border: 0; + .border-radius(0 3px 3px 0); } // Centered diff --git a/lib/popovers.less b/lib/popovers.less index 9ecdf5fd98..6de314d860 100644 --- a/lib/popovers.less +++ b/lib/popovers.less @@ -25,8 +25,8 @@ padding: 3px; width: 280px; overflow: hidden; - background-color: @black; - background-color: rgba(0,0,0,.8); + background: @black; // has to be full background declaration for IE fallback + background: rgba(0,0,0,.8); .border-radius(6px); .box-shadow(0 3px 7px rgba(0,0,0,0.3)); } diff --git a/lib/thumbnails.less b/lib/thumbnails.less index 3d1d5bc246..4f9c5f76d3 100644 --- a/lib/thumbnails.less +++ b/lib/thumbnails.less @@ -3,7 +3,6 @@ .thumbnails { margin-left: -20px; - margin-bottom: 0; list-style: none; .clearfix(); } @@ -32,55 +31,3 @@ a.thumbnail:hover { .thumbnail .caption { padding: 9px; } - -.carousel { - - position: relative; - - .carousel-inner { - overflow: hidden; - width: 100%; - position: relative; - } - - .item { - display: none; - position: relative; - .transition(.6s ease-in-out left); - } - - .active, .next, .prev { display: block; } - - .active { left: 0 } - - .next, .prev { - position: absolute; - top: 0; - width: 100%; - } - - .next { left: 100%; } - .prev { left: -100%; } - .next.left, .prev.right { left: 0% } - - .active.left { left: -100% } - .active.right { left: 100% } - - .nav { - width: auto; - .border-radius(0); - 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