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

fix other instances of mixins, swap use of box-shadow everywhere, include border-radius and transition

Browse Source
This commit is contained in:
Mark Otto
2012-03-23 20:56:04 -07:00
parent 035b85eeba
commit c7afe382a2
7 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/button-groups.less
+5 -4
View File
@@ -93,8 +93,9 @@
.btn-group .dropdown-toggle {
padding-left: 8px;
padding-right: 8px;
@shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
.box-shadow(inset 1px 0 0 rgba(255,255,255,.125),
inset 0 1px 0 rgba(255,255,255,.2),
0 1px 2px rgba(0,0,0,.05));
*padding-top: 3px;
*padding-bottom: 3px;
}
@@ -127,8 +128,8 @@
.dropdown-toggle {
background-image: none;
@shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
.box-shadow(inset 0 1px 6px rgba(0,0,0,.15),
0 1px 2px rgba(0,0,0,.05));
}
}
less/buttons.less
+4 -4
View File
@@ -21,8 +21,8 @@
border: 1px solid @btnBorder;
border-bottom-color: darken(@btnBorder, 10%);
.border-radius(4px);
@shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
.box-shadow(inset 0 1px 0 rgba(255,255,255,.2),
0 1px 2px rgba(0,0,0,.05));
cursor: pointer;
// Give IE7 some love
@@ -50,8 +50,8 @@
.btn.active,
.btn:active {
background-image: none;
@shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
.box-shadow(inset 0 2px 4px rgba(0,0,0,.15),
0 1px 2px rgba(0,0,0,.05));
background-color: darken(@white, 10%);
background-color: darken(@white, 15%) e("\9");
outline: 0;
less/forms.less
+2 -2
View File
@@ -213,8 +213,8 @@ textarea {
input:focus,
textarea:focus {
border-color: rgba(82,168,236,.8);
@shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
.box-shadow(@shadow);
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075),
0 0 8px rgba(82,168,236,.6));
outline: 0;
outline: thin dotted \9; /* IE6-9 */
}
less/mixins.less
+10 -10
View File
@@ -190,10 +190,10 @@
// --------------------------------------------------
// Border Radius
.border-radius(@radius: 5px) {
-webkit-border-radius: @radius;
-moz-border-radius: @radius;
border-radius: @radius;
.border-radius(@radius: 5px, ...) {
-webkit-border-radius: @arguments;
-moz-border-radius: @arguments;
border-radius: @arguments;
}
// Drop shadows
@@ -204,12 +204,12 @@
}
// Transitions
.transition(@transition) {
-webkit-transition: @transition;
-moz-transition: @transition;
-ms-transition: @transition;
-o-transition: @transition;
transition: @transition;
.transition(@transition, ...) {
-webkit-transition: @arguments;
-moz-transition: @arguments;
-ms-transition: @arguments;
-o-transition: @arguments;
transition: @arguments;
}
// Transformations