From: Jacob Thornton <jacobthornton@gmail.com>
Date: Tue, 31 Jan 2012 21:18:34 +0000 (-0800)
Subject: Merge branch '2.0-wip'
X-Git-Tag: v2.0.0~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0bfbe5058d61ae93d82b09f1dff7eb30dc22426e;p=thirdparty%2Fbootstrap.git

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
---

0bfbe5058d61ae93d82b09f1dff7eb30dc22426e
diff --cc .gitignore
index 6bc915a8ee,72b1d2772a..19700fef06
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,36 +1,33 @@@
+ # Numerous always-ignore extensions
+ *.diff
+ *.err
+ *.orig
+ *.log
+ *.rej
+ *.swo
+ *.swp
+ *.vi
  *~
+ *.sass-cache
+ 
+ # OS or Editor folders
  .DS_Store
- thumbs.db
- js/min
+ Thumbs.db
+ .cache
+ .project
+ .settings
+ .tmproj
+ *.esproj
+ nbproject
+ *.sublime-project
+ *.sublime-workspace
+ 
+ # Komodo
+ *.komodoproject
+ .komodotools
+ 
+ # Folders to ignore
+ .hg
+ .svn
+ .CVS
 -.idea
 -
 -# Misc
 -js/min
++.idea
diff --cc docs/assets/bootstrap.zip
index 0000000000,358ac17ab4..d2f0faa218
mode 000000,100644..100644
Binary files differ
diff --cc docs/build/node_modules/.bin/hulk
index 0000000000,b1a9816534..dd5c4a60d0
mode 000000,120000..100755
--- a/docs/build/node_modules/.bin/hulk
+++ b/docs/build/node_modules/.bin/hulk
@@@ -1,0 -1,1 +1,93 @@@
 -../hogan.js/bin/hulk
++#!/usr/bin/env node
++
++/*
++ *  Copyright 2011 Twitter, Inc.
++ *  Licensed under the Apache License, Version 2.0 (the "License");
++ *  you may not use this file except in compliance with the License.
++ *  You may obtain a copy of the License at
++ *
++ *  http://www.apache.org/licenses/LICENSE-2.0
++ *
++ *  Unless required by applicable law or agreed to in writing, software
++ *  distributed under the License is distributed on an "AS IS" BASIS,
++ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ *  See the License for the specific language governing permissions and
++ *  limitations under the License.
++ */
++
++var hogan = require('../lib/hogan.js'),
++    path = require('path'),
++    fs = require('fs');
++
++var specials = ['/', '.', '*', '+', '?', '|','(', ')', '[', ']', '{', '}', '\\'],
++    specialsRegExp = new RegExp('(\\' + specials.join('|\\') + ')', 'g'),
++    templates;
++
++
++// Escape special regexp characters
++function esc(text) {
++  return text.replace(specialsRegExp, '\\$1');
++}
++
++
++// Check for dirs and correct ext (<3 for windows)
++function extractFiles(args) {
++  var usage = 'USAGE: hulk ./templates/*.mustaches\n' +
++              'NOTE:  hulk supports the "*" wildcard and allows you to target specific extensions too',
++      files = [];
++
++  if (!args.length) {
++    console.log(usage);
++    process.exit(-1);
++  }
++
++  args.forEach(function (arg) {
++
++    if (/\*/.test(arg)) {
++      arg = arg.split('*');
++      return files = files.concat(
++        fs.readdirSync(arg[0] || '.')
++          .map(function (f) {
++            return new RegExp(esc(arg[1]) + '$').test(f) && path.join(arg[0], f);
++          })
++          .filter(function (f) {
++            return f;
++          })
++      );
++    }
++
++    files.push(arg);
++
++  })
++
++  return files;
++}
++
++
++// Remove utf-8 byte order mark, http://en.wikipedia.org/wiki/Byte_order_mark
++function removeByteOrderMark(text) {
++  if (text.charCodeAt(0) === 0xfeff) {
++    return text.substring(1);
++  }
++  return text;
++}
++
++
++// Write a template foreach file that matches template extension
++templates = extractFiles(process.argv.slice(2))
++  .map(function (file) {
++    var openedFile = fs.readFileSync(file, 'utf-8'), name;
++    if (!openedFile) return;
++    name = file.replace(/\..*$/, '');
++    openedFile = removeByteOrderMark(openedFile.trim());
++    return 'templates.' + name + ' = new Hogan.Template(' + hogan.compile(openedFile, { asString: 1 }) + ');';
++  })
++  .filter(function (t) {
++    return t;
++  });
++
++
++// Output templates
++if (!templates.length) return;
++console.log('var templates = {};');
++console.log(templates.join('\n'));