diff options
| author | Mark Otto <[email protected]> | 2014-03-08 20:34:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-08 20:34:29 -0800 |
| commit | ef5d8e98e2e9aa87496eef8359667f7e052ae636 (patch) | |
| tree | 0d202235247562f094df841960170b1245ea728b /less/code.less | |
| parent | dc5917bedfda321b72310209d2807ea10347f7ed (diff) | |
| parent | e4d13e238d0d6ea241f4e77328f6551206d17362 (diff) | |
| download | bootstrap-ef5d8e98e2e9aa87496eef8359667f7e052ae636.tar.xz bootstrap-ef5d8e98e2e9aa87496eef8359667f7e052ae636.zip | |
Merge branch 'master' into sr-only-focusable
Conflicts:
dist/css/bootstrap.css
Diffstat (limited to 'less/code.less')
| -rw-r--r-- | less/code.less | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/less/code.less b/less/code.less index 3eed26c05..4d0eadc6d 100644 --- a/less/code.less +++ b/less/code.less @@ -17,7 +17,6 @@ code { font-size: 90%; color: @code-color; background-color: @code-bg; - white-space: nowrap; border-radius: @border-radius-base; } |