Merge branch '2.0-wip'

Conflicts:
	.gitignore
	LICENSE
	Makefile
	bootstrap.css
	bootstrap.min.css
	docs/assets/js/application.js
	docs/assets/js/google-code-prettify/prettify.css
	docs/index.html
	docs/javascript.html
	examples/container-app.html
	examples/fluid.html
	examples/hero.html
	js/bootstrap-alerts.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tabs.js
	js/bootstrap-twipsy.js
	js/tests/index.html
	js/tests/unit/bootstrap-modal.js
	js/tests/unit/bootstrap-popover.js
	js/tests/unit/bootstrap-tabs.js
	lib/forms.less
	lib/mixins.less
	lib/patterns.less
	lib/scaffolding.less
	lib/tables.less

1 files changed, 0 insertions, 139 deletions

diff --git a/lib/scaffolding.less b/lib/scaffolding.less
deleted file mode 100644
index e99046253..000000000
--- a/lib/scaffolding.less
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Scaffolding
- * Basic and global styles for generating a grid system, structural layout, and page templates
- * ------------------------------------------------------------------------------------------- */
-
-
-// STRUCTURAL LAYOUT
-// -----------------
-
-body {
-  background-color: @white;
-  margin: 0;
-  #font > .sans-serif(normal,@basefont,@baseline);
-  color: @grayDark;
-}
-
-// Container (centered, fixed-width layouts)
-.container {
-  .fixed-container();
-}
-
-// Fluid layouts (left aligned, with sidebar, min- & max-width content)
-.container-fluid {
-  position: relative;
-  min-width: 940px;
-  padding-left: 20px;
-  padding-right: 20px;
-  .clearfix();
-  > .sidebar {
-    position: absolute;
-    top: 0;
-    left: 20px;
-    width: 220px;
-  }
-  // TODO in v2: rename this and .popover .content to be more specific
-  > .content {
-    margin-left: 240px;
-  }
-}
-
-
-// BASE STYLES
-// -----------
-
-// Links
-a {
-  color: @linkColor;
-  text-decoration: none;
-  line-height: inherit;
-  font-weight: inherit;
-  &:hover {
-    color: @linkColorHover;
-    text-decoration: underline;
-  }
-}
-
-// Quick floats
-.pull-right {
-  float: right;
-}
-.pull-left {
-  float: left;
-}
-
-// Toggling content
-.hide {
-  display: none;
-}
-.show {
-  display: block;
-}
-
-
-// GRID SYSTEM
-// -----------
-// To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
-
-.row {
-  .clearfix();
-  margin-left: -@gridGutterWidth;
-}
-
-// Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7)
-// Credit to @dhg for the idea
-.row > [class*="span"] {
-  .gridColumn();
-}
-
-// Default columns
-.span1     { .columns(1); }
-.span2     { .columns(2); }
-.span3     { .columns(3); }
-.span4     { .columns(4); }
-.span5     { .columns(5); }
-.span6     { .columns(6); }
-.span7     { .columns(7); }
-.span8     { .columns(8); }
-.span9     { .columns(9); }
-.span10    { .columns(10); }
-.span11    { .columns(11); }
-.span12    { .columns(12); }
-.span13    { .columns(13); }
-.span14    { .columns(14); }
-.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
-.row {
-  > .offset1   { .offset(1); }
-  > .offset2   { .offset(2); }
-  > .offset3   { .offset(3); }
-  > .offset4   { .offset(4); }
-  > .offset5   { .offset(5); }
-  > .offset6   { .offset(6); }
-  > .offset7   { .offset(7); }
-  > .offset8   { .offset(8); }
-  > .offset9   { .offset(9); }
-  > .offset10  { .offset(10); }
-  > .offset11  { .offset(11); }
-  > .offset12  { .offset(12); }
-}
-
-// Unique column sizes for 16-column grid
-.span-one-third     { width: 300px; }
-.span-two-thirds    { width: 620px; }
-.row {
-  > .offset-one-third   { margin-left: 340px; }
-  > .offset-two-thirds  { margin-left: 660px; }
-}
\ No newline at end of file