diff options
| author | Mark Otto <[email protected]> | 2011-08-21 20:47:24 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-08-21 20:47:24 -0700 |
| commit | a98d2cccb8076b106e08e7ca76e59af013ab2851 (patch) | |
| tree | 2ccfcdd3f3adf195ba49a80fe9a832bfaa2320a8 /lib/scaffolding.less | |
| parent | 5cc933ccccfdc56b3cc0e440ea0022e43a1c3f84 (diff) | |
| download | bootstrap-a98d2cccb8076b106e08e7ca76e59af013ab2851.tar.xz bootstrap-a98d2cccb8076b106e08e7ca76e59af013ab2851.zip | |
merge in master, 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 4d170f78b..735c2b129 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -132,6 +132,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; } @@ -146,12 +148,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); |