aboutsummaryrefslogtreecommitdiff
path: root/less/code.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-08 02:00:37 -0800
committerMark Otto <[email protected]>2013-12-08 02:00:37 -0800
commitc37b710e85e379ddffb305af8a765013c0cd0333 (patch)
tree8c23e05b150a14a39c2be90b39d03343b8c994f7 /less/code.less
parentb5008ebf9ca1c9c90a6ec73ae12e55a8f155017f (diff)
parente43e87b2f30a9f4967818f1ce8d25a4f88a1f490 (diff)
downloadbootstrap-c37b710e85e379ddffb305af8a765013c0cd0333.tar.xz
bootstrap-c37b710e85e379ddffb305af8a765013c0cd0333.zip
Merge branch 'master' into pr/11744
Conflicts: 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;