Merge branch 'master' of http://git.local.twitter.com/bootstrap

8 files changed, 63 insertions, 76 deletions

diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index e0a619468..7aef916e0 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -1,13 +1,12 @@
-/*
- * Master Stylesheet
- * This file is only for importing all required stylesheets for LESS to include and then compile.
- * 
+/*!=========================================================
+ * Bookstrap v0.0.1
+ *
  * Copyright 2011 Twitter, Inc
- * Open-sourced under Apache License v2.0: http://www.apache.org/licenses/LICENSE-2.0
+ * Open-sourced under Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built @twitter by @mdo and @fat, like bosses.
- */
-
+ * ========================================================== */
 
 // CSS Reset
 @import "reset.less";
diff --git a/lib/forms.less b/lib/forms.less
index 6052978c6..d0f6b0384 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -1,11 +1,9 @@
-/*
- * Forms.less
+/* Forms.less
  * Base styles for various input types, form layouts, and states
- */
+ * ------------------------------------------------------------- */
 
-
-/* Global form styles
--------------------------------------------------- */
+// Global form styles
+// ------------------
 
 form {
   margin-bottom: @baseline;
diff --git a/lib/patterns.less b/lib/patterns.less
index 668179ba4..4d183c6f5 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -1,11 +1,9 @@
-/*
- * Patterns.less
+/* Patterns.less
  * Repeatable UI elements outside the base styles provided from the scaffolding
- */
+ * ---------------------------------------------------------------------------- */
 
-
-/* Top bar
--------------------------------------------------- */
+// Topbar
+// ------
 
 // Topbar for Branding and Nav
 div.topbar {
@@ -230,8 +228,8 @@ div.topbar {
   }
 }
 
-/* Page Headers
--------------------------------------------------- */
+// Page Headers
+// ------------
 
 div.page-header {
   margin-bottom: @baseline - 1;
@@ -243,8 +241,8 @@ div.page-header {
 }
 
 
-/* Error Styles
--------------------------------------------------- */
+// Error Styles
+// ------------
 
 // One-liner alert bars
 div.alert-message {
@@ -336,8 +334,8 @@ div.block-message {
 }
 
 
-/* Navigation
--------------------------------------------------- */
+// Navigation
+// ----------
 
 // Common tab and pill styles
 ul.tabs,
@@ -403,8 +401,8 @@ ul.pills {
 }
 
 
-/* Pagination
--------------------------------------------------- */
+// Pagination
+// --------------------------------------------------
 
 div.pagination {
   height: @baseline * 2;
@@ -442,8 +440,8 @@ div.pagination {
 }
 
 
-/* Wells
--------------------------------------------------- */
+// Wells
+// -----
 
 div.well {
   background: #f5f5f5;
@@ -456,8 +454,8 @@ div.well {
 }
 
 
-/* Modals
--------------------------------------------------- */
+// Modals
+// ------
 
 div.modal-backdrop {
   background-color: rgba(0,0,0,.5);
diff --git a/lib/preboot.less b/lib/preboot.less
index cad8605b6..fdad65859 100644
--- a/lib/preboot.less
+++ b/lib/preboot.less
@@ -1,11 +1,9 @@
-/*
- * Preboot.less
+/* Preboot.less
  * Variables and mixins to pre-ignite any new web development project
- */
+ * ------------------------------------------------------------------ */
 
-
-/* Variables
--------------------------------------------------- */
+// Variables
+// ---------
 
 // Links
 @linkColor:         #0069d6;
@@ -40,8 +38,8 @@
 @siteWidth:         (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
 
 
-/* Color Scheme
--------------------------------------------------- */
+// Color Scheme
+// ------------
 
 @baseColor:         @blue;                  // Set a base color
 @complement:        spin(@baseColor, 180);  // Determine a complementary color
@@ -55,8 +53,8 @@
 @analog2:           spin(@baseColor, -22);
 
 
-/* Mixins
--------------------------------------------------- */
+// Mixins
+// ------
 
 // Clearfix for clearing floats like a boss
 .clearfix {
diff --git a/lib/reset.less b/lib/reset.less
index 0a3901b4d..7cb642824 100644
--- a/lib/reset.less
+++ b/lib/reset.less
@@ -1,7 +1,8 @@
-/*
- * 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).
- */
+/* 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 (dfn, samp, etc).
+ * ----------------------------------------------------------------- */
 
 // Eric Meyer reset
 html, body { margin: 0; padding: 0; }
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 629c52e47..a8b67e460 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -1,10 +1,9 @@
-/*
- * Scaffolding
+/* Scaffolding.less
  * Basic and global styles for generating a grid system, structural layout, and page templates
- */
+ * ------------------------------------------------------------------------------------------- */
 
-/* Baseline Grid System
--------------------------------------------------- */
+// Baseline Grid System
+// --------------------
 
 div.row {
   .clearfix();
@@ -27,8 +26,8 @@ div.row {
 }
 
 
-/* Structural Layout
--------------------------------------------------- */
+// Structural Layout
+// -----------------
 
 html, body {
   background-color: #fff;
@@ -62,8 +61,8 @@ div.container-fluid {
 }
 
 
-/* Base Styles
--------------------------------------------------- */
+// Base Styles
+// -----------
 
 // Links
 a {
diff --git a/lib/tables.less b/lib/tables.less
index 9a23c42d6..3bbb3aa07 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -1,11 +1,9 @@
-/*
- * Tables.less
+/* Tables.less
  * Tables for, you guessed it, tabular data
- */
+ * ---------------------------------------- */
 
-
-/* Baseline styles
--------------------------------------------------- */
+// Baseline styles
+// ---------------
 
 table {
   width: 100%;
@@ -27,9 +25,8 @@ table {
   }
 }
 
-
-/* Zebra-striping
--------------------------------------------------- */
+// Zebra-striping
+// --------------
 
 // Default zebra-stripe styles (alternating gray and transparent backgrounds)
 table.zebra-striped {
diff --git a/lib/type.less b/lib/type.less
index 22eb47780..cc18bff60 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -1,11 +1,10 @@
-/*
- * Typography.less
+/* Typography.less
  * Headings, body text, lists, code, and more for a versatile and durable typography system
- */
+ * ---------------------------------------------------------------------------------------- */
 
 
-/* Body text
--------------------------------------------------- */
+// Body text
+// ---------
 
 p {
   #font > .shorthand(normal,@basefont,@baseline);
@@ -16,9 +15,8 @@ p {
   }
 }
 
-
-/* Headings
--------------------------------------------------- */
+// Headings
+// --------
 
 h1, h2, h3, h4, h5, h6 {
   font-weight: bold;
@@ -68,8 +66,8 @@ h6 {
 
 
 
-/* Colors
--------------------------------------------------- */
+// Colors
+// ------
 
 // Unordered and Ordered lists
 ul, ol {
@@ -110,9 +108,8 @@ dl {
   }
 }
 
-
-/* Misc
--------------------------------------------------- */
+// Misc
+// ----
 
 // Horizontal rules
 hr {