diff options
| author | Chris Rebert <[email protected]> | 2013-07-06 22:24:03 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2013-07-07 20:03:52 -0700 |
| commit | e40aee9c9e3e80b03ebe00e812262da09c43bc11 (patch) | |
| tree | 420f1a46c0565991ae405a00a77766102dbff49e | |
| parent | 95655e72754b9450d04108593f60647cf2e2241c (diff) | |
| download | bootstrap-e40aee9c9e3e80b03ebe00e812262da09c43bc11.tar.xz bootstrap-e40aee9c9e3e80b03ebe00e812262da09c43bc11.zip | |
code.less: cleanup styles that get immediately overriden later in the file
| -rw-r--r-- | docs/assets/css/bootstrap.css | 6 | ||||
| -rw-r--r-- | less/code.less | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d3bea53f3..d59e30e9f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -671,11 +671,7 @@ address { code, pre { - padding: 0 3px 2px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; - font-size: 12px; - color: #333333; - border-radius: 4px; } code { @@ -684,6 +680,7 @@ code { color: #c7254e; white-space: nowrap; background-color: #f9f2f4; + border-radius: 4px; } pre { @@ -692,6 +689,7 @@ pre { margin: 0 0 10px; font-size: 13px; line-height: 1.428571429; + color: #333333; word-break: break-all; word-wrap: break-word; background-color: #f5f5f5; diff --git a/less/code.less b/less/code.less index 63c255010..8dd34670a 100644 --- a/less/code.less +++ b/less/code.less @@ -6,11 +6,7 @@ // Inline and block code styles code, pre { - padding: 0 3px 2px; font-family: @font-family-monospace; - font-size: (@font-size-base - 2); - color: @gray-dark; - border-radius: 4px; } // Inline code @@ -20,6 +16,7 @@ code { color: #c7254e; background-color: #f9f2f4; white-space: nowrap; + border-radius: 4px; } // Blocks of code @@ -31,6 +28,7 @@ pre { line-height: @line-height-base; word-break: break-all; word-wrap: break-word; + color: @gray-dark; background-color: #f5f5f5; border: 1px solid #ccc; // IE8 fallback border: 1px solid rgba(0,0,0,.15); |
