diff options
| author | Mark Otto <[email protected]> | 2011-08-21 20:51:13 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-08-21 20:51:13 -0700 |
| commit | 23ec21d0498a4a5c18dcbef9ec835bb0ef80aa22 (patch) | |
| tree | e5e5f2ac156351d93f007fd9b399c0a6a6c01b5a /lib/preboot.less | |
| parent | b59b82b032b2ef868e113b40014f36ff0d22adcd (diff) | |
| parent | a98d2cccb8076b106e08e7ca76e59af013ab2851 (diff) | |
| download | bootstrap-23ec21d0498a4a5c18dcbef9ec835bb0ef80aa22.tar.xz bootstrap-23ec21d0498a4a5c18dcbef9ec835bb0ef80aa22.zip | |
resolve conflicts
Diffstat (limited to 'lib/preboot.less')
| -rw-r--r-- | lib/preboot.less | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/lib/preboot.less b/lib/preboot.less index 15f1c4c3c..bf20b53fe 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -145,43 +145,43 @@ // Border Radius .border-radius(@radius: 5px) { -webkit-border-radius: @radius; - -moz-border-radius: @radius; - border-radius: @radius; + -moz-border-radius: @radius; + border-radius: @radius; } // Drop shadows .box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) { -webkit-box-shadow: @shadow; - -moz-box-shadow: @shadow; - box-shadow: @shadow; + -moz-box-shadow: @shadow; + box-shadow: @shadow; } // Transitions .transition(@transition) { -webkit-transition: @transition; - -moz-transition: @transition; - transition: @transition; + -moz-transition: @transition; + transition: @transition; } // Background clipping .background-clip(@clip) { -webkit-background-clip: @clip; - -moz-background-clip: @clip; - background-clip: @clip; + -moz-background-clip: @clip; + background-clip: @clip; } // CSS3 Content Columns .content-columns(@columnCount, @columnGap: 20px) { -webkit-column-count: @columnCount; - -webkit-column-gap: @columnGap; - -moz-column-count: @columnCount; - -moz-column-gap: @columnGap; - column-count: @columnCount; - column-gap: @columnGap; + -moz-column-count: @columnCount; + column-count: @columnCount; + -webkit-column-gap: @columnGap; + -moz-column-gap: @columnGap; + column-gap: @columnGap; } // Buttons -.button(@color: #fff, @padding: 4px 14px, @textColor: #333, @textShadow: 0 1px 1px rgba(255,255,255,.75), @fontSize: 13px, @borderColor: rgba(0,0,0,.1), @borderRadius: 4px) { +/*.button(@color: #fff, @padding: 4px 14px, @textColor: #333, @textShadow: 0 1px 1px rgba(255,255,255,.75), @fontSize: 13px, @borderColor: rgba(0,0,0,.1), @borderRadius: 4px) { display: inline-block; #gradient > .vertical-three-colors(@color, @color, 0.25, darken(@color, 10%)); padding: @padding; @@ -200,7 +200,7 @@ color: @textColor; text-decoration: none; } -} +}*/ // Add an alphatransparency value to any background or border color (via Elyse Holladay) #translucent { @@ -262,6 +262,6 @@ .opacity(@opacity: 100) { filter: e(%("alpha(opacity=%d)", @opacity)); -khtml-opacity: @opacity / 100; - -moz-opacity: @opacity / 100; - opacity: @opacity / 100; + -moz-opacity: @opacity / 100; + opacity: @opacity / 100; }
\ No newline at end of file |