separate code from type css files

diff --git a/bootstrap.css b/bootstrap.css
index 6970487e01a7c71fe65bd82c964192adaee61a18..f3ea6d0b92e4d63ad14dc8128ee69e0b03bdadce 100644 (file)
--- 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 dc158adcf48b5d545cf2c4dbf193bf47e8bb1975..711e5c01efd8c27c779f689ddb1611ae941a1d94 100644 (file)
--- 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 40ebd7f2f8e0b63387d6d7562724a3988274106c..ede31c03571a479d39809e72ccc36485c1f46a1f 100644 (file)
--- 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 (file)
index 0000000..0cc3db8
--- /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 3eced0ef0978a39875a7c2dfb8a62c6e6057bc97..3c1826830ebbf9b82ac70cfbd0017198a4a778f2 100644 (file)
--- 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 548c222f1c3cff70c7fddecbb5ec34f4ea35fc9b..087224fd0c812cb462ec9be65c421ab495c06a51 100644 (file)
--- 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;
 }