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/scaffolding.less | |
| parent | 027538e66d633b15c9074b14d206602ad8fb42a1 (diff) | |
| parent | 842ad01fce710c50dc9c0174ab790f91e66c46b1 (diff) | |
| download | bootstrap-34a19915f4f8b53eb7a5f2ffa4c87f7d47853827.tar.xz bootstrap-34a19915f4f8b53eb7a5f2ffa4c87f7d47853827.zip | |
resolve conflicts
Diffstat (limited to 'lib/scaffolding.less')
| -rw-r--r-- | lib/scaffolding.less | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 5b41b64a4..864aea52f 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -101,6 +101,8 @@ a { #gradient > .vertical(@blue, @blueDark); color: #fff; text-shadow: 0 -1px 0 rgba(0,0,0,.25); + border-color: @blueDark @blueDark darken(@blueDark, 15%); + border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); &:hover { color: #fff; } @@ -115,12 +117,18 @@ a { padding-left: 9px; font-size: 11px; } - &:disabled, &.disabled { background-image: none; .opacity(65); cursor: default; } + + // this can't be included with the .disabled def because IE8 and below will drop it ;_; + &:disabled { + background-image: none; + .opacity(65); + cursor: default; + } &:active { @shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); |