mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-28 07:39:57 +02:00
Code Issues Releases Wiki Activity

Merge branch 'bartt-master' into 2.0.3-wip

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap.css
	less/button-groups.less
This commit is contained in:
Mark Otto
2012-03-23 20:56:48 -07:00
parent f87e4c60e9 c7afe382a2
commit f9f03d8976
6 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
less/mixins.less
View File

@@ -192,26 +192,26 @@
// --------------------------------------------------
// 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
.box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) {
-webkit-box-shadow: @shadow;
-moz-box-shadow: @shadow;
box-shadow: @shadow;
.box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25), ...) {
-webkit-box-shadow: @arguments;
-moz-box-shadow: @arguments;
box-shadow: @arguments;
}
// 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
@@ -253,18 +253,18 @@
// Background clipping
// Heads up: FF 3.6 and under need "padding" instead of "padding-box"
.background-clip(@clip) {
-webkit-background-clip: @clip;
-moz-background-clip: @clip;
background-clip: @clip;
.background-clip(@clip, ...) {
-webkit-background-clip: @arguments;
-moz-background-clip: @arguments;
background-clip: @arguments;
}
// Background sizing
.background-size(@size){
-webkit-background-size: @size;
-moz-background-size: @size;
-o-background-size: @size;
background-size: @size;
.background-size(@size, ...){
-webkit-background-size: @arguments;
-moz-background-size: @arguments;
-o-background-size: @arguments;
background-size: @arguments;
}