mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

move carousel to separate stylesheet, update popovers to fix ie7 bug, fix pagination, fix alerts

Browse Source
This commit is contained in:
Mark Otto
2012-01-15 16:27:36 -08:00
parent 3d9298b04b
commit c02501e1b7
9 changed files with 174 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/alerts.less
+4 -4
View File
@@ -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;
}
}
lib/bootstrap.less
Vendored
+1
View File
@@ -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
lib/carousel.less
+54
View File
@@ -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); }
}
}
lib/pagination.less
+7 -5
View File
@@ -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
lib/popovers.less
+2 -2
View File
@@ -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));
}
lib/thumbnails.less
-53
View File
@@ -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); }
}
}