adding temp theme file to help with customization; still needs work

diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css
index 07b74d2335b9d5354781287ddb4ec88200c78ec0..58ed9a1070a2e8449012a3185d6b1a6c1d9186a6 100644 (file)
--- a/bootstrap-1.2.0.css
+++ b/bootstrap-1.2.0.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: Fri Sep  2 23:27:24 PDT 2011
+ * Date: Sat Sep  3 15:53:45 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here      that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -265,6 +265,22 @@ textarea {
   border-color: #339bb9 #339bb9 #22697d;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
 }
+/* Theme.less
+ * Customizable set of settings and tweaks for Bootstrap development
+ * ----------------------------------------------------------------- */
+/*
+  Why Theme.less?
+  ---------------
+  Theme is a layer that has been added to Bootstrap to simplify the customization process for developers and designers. The goal of Theme is to provide a single point of customization within Bootstrap so you don't have to modify the core files.
+
+  How to use it
+  -------------
+  We repeat the default variables' values here for easy replacement. Simply modify any of these values and recompile Bootstrap for a more customize look and feel.
+
+  Extending it
+  ------------
+  Feel free to create and add new variables and mixins here. The goal is to make this your playground and keep the core files intact.
+*/
 /*
  * Scaffolding
  * Basic and global styles for generating a grid system, structural layout, and page templates
@@ -334,6 +350,30 @@ textarea {
 .row .span16 {
   width: 940px;
 }
+.row .span17 {
+  width: 1000px;
+}
+.row .span18 {
+  width: 1060px;
+}
+.row .span19 {
+  width: 1120px;
+}
+.row .span20 {
+  width: 1180px;
+}
+.row .span21 {
+  width: 1240px;
+}
+.row .span22 {
+  width: 1300px;
+}
+.row .span23 {
+  width: 1360px;
+}
+.row .span24 {
+  width: 1420px;
+}
 .row .offset1 {
   margin-left: 80px;
 }

diff --git a/bootstrap-1.2.0.min.css b/bootstrap-1.2.0.min.css
index 98ecb1771f87e5280fc464c4efe60233860f220d..1fc14f628f94c7bfda11b025543bb7cce685921a 100644 (file)
--- a/bootstrap-1.2.0.min.css
+++ b/bootstrap-1.2.0.min.css
@@ -47,6 +47,14 @@ textarea{overflow:auto;vertical-align:top;}
 .row .span14{width:820px;}
 .row .span15{width:880px;}
 .row .span16{width:940px;}
+.row .span17{width:1000px;}
+.row .span18{width:1060px;}
+.row .span19{width:1120px;}
+.row .span20{width:1180px;}
+.row .span21{width:1240px;}
+.row .span22{width:1300px;}
+.row .span23{width:1360px;}
+.row .span24{width:1420px;}
 .row .offset1{margin-left:80px;}
 .row .offset2{margin-left:140px;}
 .row .offset3{margin-left:200px;}

diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index c31bd725da330581341d7109ba035bf0419c33eb..ff17097dd5bbcc0fbc8db843c7b00cb2d8711240 100644 (file)
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -14,6 +14,7 @@
 
 // Core
 @import "preboot.less";
+@import "theme.less";
 @import "scaffolding.less";
 
 // Styled patterns and elements

diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 845c4d35536d03de35e53136188ad084bb4ce0a5..148e4e0d5f6ea1152199dae79524155c0f2b2df7 100644 (file)
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -37,6 +37,16 @@
   .span15    { .columns(15); }
   .span16    { .columns(16); }
 
+  // For optional 24-column grid
+  .span17    { .columns(17); }
+  .span18    { .columns(18); }
+  .span19    { .columns(19); }
+  .span20    { .columns(20); }
+  .span21    { .columns(21); }
+  .span22    { .columns(22); }
+  .span23    { .columns(23); }
+  .span24    { .columns(24); }
+
   // Offset column options
   .offset1   { .offset(1); }
   .offset2   { .offset(2); }

diff --git a/lib/theme.less b/lib/theme.less
new file mode 100644 (file)
index 0000000..84102ef
--- /dev/null
+++ b/lib/theme.less
@@ -0,0 +1,54 @@
+/* Theme.less
+ * Customizable set of settings and tweaks for Bootstrap development
+ * ----------------------------------------------------------------- */
+
+
+/*
+  Why Theme.less?
+  ---------------
+  Theme is a layer that has been added to Bootstrap to simplify the customization process for developers and designers. The goal of Theme is to provide a single point of customization within Bootstrap so you don't have to modify the core files.
+
+  How to use it
+  -------------
+  We repeat the default variables' values here for easy replacement. Simply modify any of these values and recompile Bootstrap for a more customize look and feel.
+
+  Extending it
+  ------------
+  Feel free to create and add new variables and mixins here. The goal is to make this your playground and keep the core files intact.
+*/
+
+
+// Font face, size, weight, and more
+----------------------------------------
+@baseFontSize:          13px; // base font-size
+@baseLineHeight:        18px; // base line-height of elements (incrementally increases with font-size)
+
+
+// Link color
+-----------------
+@linkColor:             #0069d6;
+// No need to specify a link hover color because we'll automatically do that for you in Preboot
+
+
+// Primary button color
+--------------------------------
+@primaryButtonColor:    #333;
+
+
+// Grid system
+------------------------------------
+// Griditude
+@gridColumns:       16;
+@gridColumnWidth:   40px;
+@gridGutterWidth:   20px;
+@siteWidth:         (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+
+
+/*
+TODO:
+- move primary button color here
+- add ability to set app/site-wide base font-face (need better variables: @baseFontSize, @baseFontFace, @baseLineHeight, etc)
+- make form inputs and tables apply the new global type changes (currently statically set)
+- add new docs section for examples
+- add new docs section for Theme.less
+*/
\ No newline at end of file