aboutsummaryrefslogtreecommitdiff
path: root/less/code.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-14 16:20:19 -0800
committerMark Otto <[email protected]>2013-12-14 16:20:19 -0800
commit83c60ef3eec234b3dac94c841fd1f13f94aab36f (patch)
tree0d896dedbbd47723ab769b139b63a5a58778e578 /less/code.less
parent3bfa630d2afe70452861b2466daab78daa47dda8 (diff)
parent4afcebe0e71aafd0cfb501548a6591effdbe2e70 (diff)
downloadbootstrap-83c60ef3eec234b3dac94c841fd1f13f94aab36f.tar.xz
bootstrap-83c60ef3eec234b3dac94c841fd1f13f94aab36f.zip
Merge branch 'master' into pr/11107
Conflicts: docs-assets/js/raw-files.js
Diffstat (limited to 'less/code.less')
-rw-r--r--less/code.less14
1 files changed, 12 insertions, 2 deletions
diff --git a/less/code.less b/less/code.less
index e12835401..3eed26c05 100644
--- a/less/code.less
+++ b/less/code.less
@@ -1,11 +1,11 @@
//
-// Code (inline and blocK)
+// Code (inline and block)
// --------------------------------------------------
// Inline and block code styles
code,
-kdb,
+kbd,
pre,
samp {
font-family: @font-family-monospace;
@@ -21,6 +21,16 @@ code {
border-radius: @border-radius-base;
}
+// User input typically entered via keyboard
+kbd {
+ padding: 2px 4px;
+ font-size: 90%;
+ color: @kbd-color;
+ background-color: @kbd-bg;
+ border-radius: @border-radius-small;
+ box-shadow: inset 0 -1px 0 rgba(0,0,0,.25);
+}
+
// Blocks of code
pre {
display: block;