aboutsummaryrefslogtreecommitdiff
path: root/less/code.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-14 16:46:40 -0800
committerMark Otto <[email protected]>2013-12-14 16:46:40 -0800
commit4c64c1eecdb52d943a50d2c181aeb915a3caed34 (patch)
tree93b556ef583bb6a327cad76804bbdf4c5a4c6f4c /less/code.less
parent2b56ff04614c4617355d16c14784654e841bcf4d (diff)
parentd79431ca02683c9d1c754201260f66e5dda15614 (diff)
downloadbootstrap-4c64c1eecdb52d943a50d2c181aeb915a3caed34.tar.xz
bootstrap-4c64c1eecdb52d943a50d2c181aeb915a3caed34.zip
Merge branch 'master' into pr/11302
Conflicts: dist/css/bootstrap.css dist/css/bootstrap.min.css
Diffstat (limited to 'less/code.less')
-rw-r--r--less/code.less10
1 files changed, 10 insertions, 0 deletions
diff --git a/less/code.less b/less/code.less
index 44e9e8937..3eed26c05 100644
--- a/less/code.less
+++ b/less/code.less
@@ -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;