root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity
4,713 Commits 104 Branches 92 Tags 676 MiB
Commit Graph

85 Commits

Author SHA1 Message Date
Mark Otto 245ebda651 nuke the .col 2013-06-03 21:57:51 -07:00
Mark Otto 3160bd872e rearrange customizer content 2013-05-23 21:34:32 -07:00
Mark Otto a3cba92edd rejigger the customizer layout 2013-05-22 23:45:12 -07:00
Mark Otto acc0875259 fix up customizer js and classes; turn buttons into real buttons 2013-05-22 23:34:28 -07:00
Julian Thilo 52a348aa3f Bring the customizer up to speed 
I reworked the customizer to match the new docs layout and include all
newly added variables, etc.
Would be glad to keep an eye on Customize and update it as v3 changes.
Help blocks in my new version need some more work, too, so this is just
a basis.
 2013-05-23 02:30:58 +02:00
fat a4c16155a2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	Makefile
	docs/_site/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.min.js
	docs/customize.html
	docs/docs.html
 2013-05-16 11:08:46 -07:00
fat 14651035de a bunch javascript junk 2013-05-16 11:06:30 -07:00
Robert Burns d4546cbcc2 Fix buttons within examples 2013-05-12 22:04:22 -04:00
Mark Otto edb733ebc7 Super massive docs overhaul 
* Bring back the navbar up top
* Pull the docs content back into separate pages because a 6.6k line docs file is just crazy
* Recenter the page content and bring back affixed side nav (needs work)
 2013-05-08 21:56:08 -07:00
Mark Otto ee0789ff8f Fixes #7721: change @navbar-text to @navbar-color, along with inverse options 2013-05-03 15:29:32 -07:00
Mark Otto ab7070bb49 change var from @table-border to @table-border-color 2013-04-14 19:45:32 -07:00
Mark Otto 7bee10a5ef oops, restore customizer 2013-04-01 00:11:47 -07:00
Mark Otto 4b8b8d2e46 holy crap new docs layout separate from home, no more top navbar 2013-03-28 01:08:14 -07:00
Mark Otto 081c061281 new subnav on all pages 2013-03-28 00:21:21 -07:00
Mark Otto 5b298a2aaf docs fixes with new .bs-docs-container; fixing some lingering grid classes 2013-03-26 23:54:17 -07:00
Mark Otto ca31f060a8 New grid classes 2013-03-26 17:12:17 -07:00
Mark Otto 0dea8b0c74 Fixes #6897: Print styles get own .less file 2013-02-28 19:42:51 -08:00
Mark Otto ce21926704 All Glyphicons now require a base class, e.g. .glyphicon.glyphicon-star 2013-02-16 01:26:43 -08:00
Mark Otto e45f12ad42 rearrange jekyll and docs 2013-02-12 12:44:41 -08:00
Mark Otto 8b9733b288 nuke what we don't need for jekyll 2013-02-12 12:25:05 -08:00
Mark Otto 0b4668368b Merge branch '2.3.0-wip' into 3.0.0-wip 2013-02-05 22:47:00 -08:00
Mark Otto 2fa77bf197 Update link to changelog 2013-02-05 22:46:45 -08:00
Mark Otto 5e5670a1b4 Remove gallery link from navbar; add to homepage examples section instead 2013-01-31 18:00:11 -08:00
Mark Otto 1b128b3431 comment tweaks and updating starter template 2013-01-17 20:28:05 -08:00
Mark Otto fd89531f6a Update commenting and structure of layout.mustache 2013-01-17 20:26:17 -08:00
Mark Otto d9b35c2602 Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/css.html
	docs/customize.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	less/navbar.less
 2013-01-17 20:23:33 -08:00
Mark Otto b30b8c2c12 Restore nav tabs, pills, justified variation, disabled links, and a few more things. Still need to add the dropdowns back though. 2013-01-17 17:02:35 -08:00
Mark Otto f6226c9b91 Update Getting Started page to include mention of Respond 2013-01-17 14:49:52 -08:00
Mark Otto 5c76518f7d Add respond.js to main docs pages, but only for IE8 and down 2013-01-17 14:00:03 -08:00
Mark Otto 7e46b6f636 Update nav and add bounds for tablet container 2013-01-17 00:58:34 -08:00
Mark Otto f9ee99cf6f Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing 2013-01-14 00:11:55 -08:00
Mark Otto 65edc9cd6e Change .jumbotron usage in docs layout to .bs-docs-jumbotron 2012-12-19 21:42:36 -08:00
Mark Otto 33e14fe5bf Merge branch '2.2.2-wip' into 3.0.0-wip 
Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less
 2012-12-05 11:05:10 -08:00
Mark Otto b3019d7aab add gallery page, fill with a few screenshots to start 2012-12-04 20:30:21 -08:00
Mark Otto 0f2a423b8d Once more, update all the favicons to retina 2012-12-03 13:25:56 -08:00
Mark Otto 15a4399015 Align the touch icons attributes 2012-12-03 13:22:10 -08:00
Mark Otto dd11d0a3fa move around social buttons 2012-12-01 13:47:07 -08:00
Mark Otto ebd2215e49 remove deleted css files, run make 2012-11-30 16:31:24 -08:00
Mark Otto adc2c779a0 grid vars updated 2012-11-30 15:43:07 -08:00
Mark Otto e34b3730b7 form state vars 2012-11-30 15:38:31 -08:00
Mark Otto 0a93bc143d hero unit and pagination vars 2012-11-30 15:36:16 -08:00
Mark Otto 62a2220035 navbar vars 2012-11-30 15:33:56 -08:00
Mark Otto 01421ecd62 remove sprites vars, change zindex vars 2012-11-30 15:23:13 -08:00
Mark Otto 12a00f62a9 remove color variables, swap others were appropro 2012-11-30 15:18:49 -08:00
Mark Otto 0ef347706c more vars changing 2012-11-30 15:09:57 -08:00
Mark Otto 9239bfbc7b more vars changed, remove @white var 2012-11-30 15:05:23 -08:00
Mark Otto b0e2b5813d more consistent variable naming patterns 2012-11-30 14:45:25 -08:00
Mark Otto 7a3d15eb21 Part 1 of unCamelCasing variables 2012-11-30 14:37:24 -08:00
Mark Otto fca35c0dba Merge branch '2.2.2-wip' into exploratory 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/alerts.less
	less/button-groups.less
	less/buttons.less
	less/tests/css-tests.html
 2012-11-30 00:13:30 -08:00
Mark Otto acc037de15 add holder and replace placehold.it 2012-11-29 20:59:14 -08:00