diff options
| author | Mark Otto <[email protected]> | 2011-08-21 20:33:54 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-08-21 20:33:54 -0700 |
| commit | 34a19915f4f8b53eb7a5f2ffa4c87f7d47853827 (patch) | |
| tree | b19acf3b786b3c4e0af9a1ffc44f3e08f82ed591 /lib/preboot.less | |
| parent | 027538e66d633b15c9074b14d206602ad8fb42a1 (diff) | |
| parent | 842ad01fce710c50dc9c0174ab790f91e66c46b1 (diff) | |
| download | bootstrap-34a19915f4f8b53eb7a5f2ffa4c87f7d47853827.tar.xz bootstrap-34a19915f4f8b53eb7a5f2ffa4c87f7d47853827.zip | |
resolve conflicts
Diffstat (limited to 'lib/preboot.less')
| -rw-r--r-- | lib/preboot.less | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/preboot.less b/lib/preboot.less index 40dae2cce..129acf6f7 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -189,8 +189,9 @@ color: @textColor; font-size: @fontSize; line-height: @baseline; - border: 1px solid @borderColor; - border-bottom-color: fadein(@borderColor, 15%); + border: 1px solid; + border-color: #ccc #ccc #bbb; + border-color: borderColor borderColor fadein(@borderColor, 15%); .border-radius(@borderRadius); @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); |