mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-02 16:04:07 +03:00
resolve conflicts
This commit is contained in:
+3
-2
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user