sharpetronics/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-06-04 00:02:59 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
This commit is contained in:
Mark Otto 2012-01-27 14:49:02 -08:00
commit 91e9f6fa91
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/css/bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Fri Jan 27 14:48:21 PST 2012 * Date: Fri Jan 27 14:48:53 PST 2012
*/ */
article, article,
aside, aside,

2
docs/build/index.js vendored
View File

@ -14,6 +14,8 @@ pages = fs.readdirSync(__dirname + '/../templates/pages')
// iterate over pages // iterate over pages
pages.forEach(function (name) { pages.forEach(function (name) {
if (!name.match(/\.mustache$/)) return
var page = fs.readFileSync(__dirname + '/../templates/pages/' + name, 'utf-8') var page = fs.readFileSync(__dirname + '/../templates/pages/' + name, 'utf-8')
, context = {} , context = {}