kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

Merge pull request #8415 from cvrebert/code.less-cleanup 

code.less: cleanup styles that get immediately overriden later in the file
This commit is contained in:
Mark Otto 2013-07-08 06:57:37 -07:00
parent f69afc1b23 e40aee9c9e
commit 1045226544
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/assets/css/bootstrap.css vendored
View File

@ -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;

6
less/code.less
View File

@ -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);