diff options
| author | Mark Otto <[email protected]> | 2013-12-08 01:45:42 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-08 01:45:42 -0800 |
| commit | 12500047f984cbd921e810f7f9628556f49a282e (patch) | |
| tree | 2fed37f042f5438be98680b511a7b4c9f394ce3e /less/code.less | |
| parent | b92bee99efd95a4c0ae469e3a5f4004da0164578 (diff) | |
| parent | 475bbd4d3855231c47ece7ccd27c72030efb7d08 (diff) | |
| download | bootstrap-12500047f984cbd921e810f7f9628556f49a282e.tar.xz bootstrap-12500047f984cbd921e810f7f9628556f49a282e.zip | |
Merge branch 'master' into pr/11750
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
Diffstat (limited to 'less/code.less')
| -rw-r--r-- | less/code.less | 10 |
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; |