aboutsummaryrefslogtreecommitdiff
path: root/scss/_code.scss
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-02-06 20:33:26 -0800
committerMark Otto <[email protected]>2016-02-06 20:33:26 -0800
commitd7d0e186bdfb52856a455c438538582fe95324e6 (patch)
tree43484b5b58471431662e0a8be2b3bb9eb7f00d31 /scss/_code.scss
parentf6ad665c26f8a376a806721feaf3f38ceadc7e79 (diff)
parentcb7b78087690e756e33b6f6abdb3548f73f8bb1b (diff)
downloadbootstrap-d7d0e186bdfb52856a455c438538582fe95324e6.tar.xz
bootstrap-d7d0e186bdfb52856a455c438538582fe95324e6.zip
Merge branch 'v4-dev' into v4-split-buttons
Diffstat (limited to 'scss/_code.scss')
-rw-r--r--scss/_code.scss3
1 files changed, 1 insertions, 2 deletions
diff --git a/scss/_code.scss b/scss/_code.scss
index 60bbcae81..e32351698 100644
--- a/scss/_code.scss
+++ b/scss/_code.scss
@@ -22,7 +22,7 @@ kbd {
color: $kbd-color;
background-color: $kbd-bg;
@include border-radius($border-radius-sm);
- @include box-shadow(inset 0 -.1rem 0 rgba(0,0,0,.25));
+ @include box-shadow($kbd-box-shadow);
kbd {
padding: 0;
@@ -38,7 +38,6 @@ pre {
margin-top: 0;
margin-bottom: 1rem;
font-size: 90%;
- line-height: $line-height;
color: $pre-color;
// Account for some code outputs that place code tags in pre tags