From f82db4b95bf12bc6c04a5ecc3d4a649ba9800db0 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Thu, 26 Jan 2012 14:53:35 -0800
Subject: [PATCH] separate code from type css files
---
bootstrap.css | 14 +++++++-------
bootstrap.min.css | 4 ++--
lib/bootstrap.less | 1 +
lib/code.less | 44 ++++++++++++++++++++++++++++++++++++++++++++
lib/scaffolding.less | 1 -
lib/type.less | 43 +------------------------------------------
6 files changed, 55 insertions(+), 52 deletions(-)
create mode 100644 lib/code.less
diff --git a/bootstrap.css b/bootstrap.css
index 6970487e01..f3ea6d0b92 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Thu Jan 26 14:50:34 PST 2012
+ * Date: Thu Jan 26 14:52:24 PST 2012
*/
article,
aside,
@@ -414,6 +414,12 @@ address {
line-height: 18px;
font-style: normal;
}
+small {
+ font-size: 100%;
+}
+cite {
+ font-style: normal;
+}
code, pre {
padding: 0 3px 2px;
font-family: Menlo, Monaco, "Courier New", monospace;
@@ -452,12 +458,6 @@ pre code {
padding: 0;
background-color: transparent;
}
-small {
- font-size: 100%;
-}
-cite {
- font-style: normal;
-}
form {
margin: 0 0 18px;
}
diff --git a/bootstrap.min.css b/bootstrap.min.css
index dc158adcf4..711e5c01ef 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -83,12 +83,12 @@ blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:
blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
q:before,q:after,blockquote:before,blockquote:after{content:"";}
address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;}
+small{font-size:100%;}
+cite{font-style:normal;}
code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
code{padding:3px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;}
pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;}
pre code{padding:0;background-color:transparent;}
-small{font-size:100%;}
-cite{font-style:normal;}
form{margin:0 0 18px;}
fieldset{padding:0;margin:0;border:0;}
legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;-webkit-margin-collapse:separate;}
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index 40ebd7f2f8..ede31c0357 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -23,6 +23,7 @@
// Base CSS
@import "type.less";
+@import "code.less";
@import "forms.less";
@import "tables.less";
diff --git a/lib/code.less b/lib/code.less
new file mode 100644
index 0000000000..0cc3db857a
--- /dev/null
+++ b/lib/code.less
@@ -0,0 +1,44 @@
+// Code.less
+// Code typography styles for the <code> and <pre> elements
+// --------------------------------------------------------
+
+// Inline and block code styles
+code,
+pre {
+ padding: 0 3px 2px;
+ #font > #family > .monospace;
+ font-size: @baseFontSize - 1;
+ color: @grayDark;
+ .border-radius(3px);
+}
+code {
+ padding: 3px 4px;
+ color: #d14;
+ background-color: #f7f7f9;
+ border: 1px solid #e1e1e8;
+}
+pre {
+ display: block;
+ padding: (@baseLineHeight - 1) / 2;
+ margin: 0 0 @baseLineHeight / 2;
+ font-size: 12px;
+ line-height: @baseLineHeight;
+ background-color: #f5f5f5;
+ border: 1px solid #ccc; // fallback for IE7-8
+ border: 1px solid rgba(0,0,0,.15);
+ .border-radius(4px);
+ white-space: pre;
+ white-space: pre-wrap;
+ word-break: break-all;
+
+ // Make prettyprint styles more spaced out for readability
+ &.prettyprint {
+ margin-bottom: @baseLineHeight;
+ }
+
+ // Account for some code outputs that place code tags in pre tags
+ code {
+ padding: 0;
+ background-color: transparent;
+ }
+}
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 3eced0ef09..3c1826830e 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -1,4 +1,3 @@
-//
// Scaffolding
// Basic and global styles for generating a grid system, structural layout, and page templates
// -------------------------------------------------------------------------------------------
diff --git a/lib/type.less b/lib/type.less
index 548c222f1c..087224fd0c 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -197,51 +197,10 @@ address {
font-style: normal;
}
-// Inline and block code styles
-code,
-pre {
- padding: 0 3px 2px;
- #font > #family > .monospace;
- font-size: @baseFontSize - 1;
- color: @grayDark;
- .border-radius(3px);
-}
-code {
- padding: 3px 4px;
- color: #d14;
- background-color: #f7f7f9;
- border: 1px solid #e1e1e8;
-}
-pre {
- display: block;
- padding: (@baseLineHeight - 1) / 2;
- margin: 0 0 @baseLineHeight / 2;
- font-size: 12px;
- line-height: @baseLineHeight;
- background-color: #f5f5f5;
- border: 1px solid #ccc; // fallback for IE7-8
- border: 1px solid rgba(0,0,0,.15);
- .border-radius(4px);
- white-space: pre;
- white-space: pre-wrap;
- word-break: break-all;
-
- // Make prettyprint styles more spaced out for readability
- &.prettyprint {
- margin-bottom: @baseLineHeight;
- }
-
- // Account for some code outputs that place code tags in pre tags
- code {
- padding: 0;
- background-color: transparent;
- }
-}
-
+// Misc
small {
font-size: 100%;
}
-
cite {
font-style: normal;
}
--
GitLab