root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity
1,731 Commits 111 Branches 92 Tags 671 MiB
Commit Graph

1024 Commits

Author SHA1 Message Date
Jacob Thornton c8c4d5b392 fix alert tests + add show option back to modals 2012-02-06 00:17:31 -08:00
Chris Rebert 98cffdbf46 parallel fix to mustache template 2012-02-05 23:02:16 -08:00
Aditya Panchal 8a8daca71e Fixed a typo in base-css.html which allows the user icon to be shown on the example button 2012-02-05 22:04:46 -06:00
Mark Otto 85e401a656 add label hover style for ability to make it a link 2012-02-05 02:36:21 -08:00
Mark Otto 546332d85d resolve #1602 and add table hover style 2012-02-05 02:28:42 -08:00
Mark Otto f8c2d9b53d remove 940px from default grid heading 2012-02-05 02:24:14 -08:00
Mark Otto 59b32586af close #1628 to add padding to all inline checkboxes/radios 2012-02-05 02:16:46 -08:00
Mark Otto 91475c865d fix #1631 by adding focus to radio buttons 2012-02-05 02:14:25 -08:00
Mark Otto 4a09cf04d8 clean up labels per #1656 2012-02-05 02:01:28 -08:00
Mark Otto 2a192468d3 address #1722 by finishing incomplete sentence on responsive 2012-02-05 01:59:16 -08:00
Mark Otto d92523f329 fix for #1658 to give .label-success proper text 2012-02-05 01:57:09 -08:00
Mark Otto ff91b233eb fix #1665 by correcting tabs example markup 2012-02-05 01:50:55 -08:00
Mark Otto 53da88e561 add mixin for text-overflow 2012-02-05 01:49:36 -08:00
Mark Otto f59b7ce8ea add mention of required classes to horizontal forms 2012-02-05 01:43:22 -08:00
Mark Otto abf4ecac4d add another code example for horizontal forms 2012-02-05 01:41:45 -08:00
Mark Otto 83cb105317 adding code snippets to form examples 2012-02-05 01:36:11 -08:00
Mark Otto 9b5b8460b4 Merge branch 'noahblon-master' into 2.0.1-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-05 01:26:44 -08:00
Mark Otto 2f42f35c69 manually resolve #1684 2012-02-05 00:35:13 -08:00
Mark Otto 6661639b37 #1693: manual fix of the pull request to add class name changes to pills/tabs to upgrade guide 2012-02-05 00:29:19 -08:00
Mark Otto 0336f1e644 #1695: manually fix broken primary button instances 2012-02-05 00:27:08 -08:00
Mark Otto dfcb2d1ed8 #1697: update upgrading docs to include mention of no more secondary class in modals 2012-02-05 00:25:40 -08:00
Mark Otto f29e3263b0 follow up to #1702, add callout on component alignment in tabs/pills 2012-02-05 00:16:25 -08:00
Mark Otto cdb1ad1a52 #1702: add callout to navbar for component alignment 2012-02-05 00:11:21 -08:00
Mark Otto 31abeec0f2 manually handle #1703 for note on horizontal forms 2012-02-05 00:05:01 -08:00
Mark Otto 125368d4db update docs with call on meta tag for responsive 2012-02-04 23:57:15 -08:00
Mark Otto a2848ebb00 fix meta tag for viewport in examples and shims 2012-02-04 23:53:24 -08:00
Chris Rebert 93fea1f1cf The < and > escapes have nothing to do with Unicode. 2012-02-04 23:21:56 -08:00
Mark Otto 35fdddbc4f correct css selector for .control-label, required in the docs but not in the CSS files 2012-02-04 22:55:47 -08:00
Mark Otto 418bf5221a #1712: fix typo in js docs 2012-02-04 22:50:26 -08:00
Mark Otto 87a8c9b677 #1707: remove rgba() background override on navbar active items for customization 2012-02-04 22:40:50 -08:00
Mark Otto 679cd5ea02 #1706: protocol independent html5shim added, and moved after the CSS for loading time's sake 2012-02-04 22:38:49 -08:00
Mark Otto 6d8ac203e5 fix broken alert example with data-dismiss 2012-02-04 22:32:04 -08:00
Mark Otto b297a61f82 #1732: make examples of alerts in docs components page dismissable 2012-02-04 22:31:09 -08:00
Mark Otto 468688638d #1715: strip code of styles when in a pre 2012-02-04 22:23:20 -08:00
Mark Otto 7e81f84b29 buttons and icons updated for improved placement and variable support for icon paths 2012-02-04 22:22:19 -08:00
Mark Otto 81d1f3b96e remove max-width on dropdown menus 2012-02-04 18:52:25 -08:00
Mark Otto 9259e24f73 fix cutoff follow button 2012-02-04 18:27:05 -08:00
Mark Otto ac98cee609 allow alternate form layouts to hide inputs with .hide on them 2012-02-04 18:26:04 -08:00
Noah Blon f922a0800b Fixes typo on download page 
Changed chose to choose spelling error on download template
 2012-02-03 10:34:03 -06:00
Jacob Thornton f68f7870ef Merge pull request #1603 from mikaelbr/master 
Fixed ID and for-attr in the doc forms
 2012-02-02 23:47:22 -08:00
Jacob Thornton 7f0a64106d its core (typo) 2012-02-02 23:31:03 -08:00
Hendy Tanata 906028abdb Fix alerts JavaScript code example. 2012-02-02 20:45:58 -08:00
Mark Otto 9ab843b936 add mention of classes to use for button sizes 2012-02-02 09:57:22 -08:00
Mark Otto e92e9f1138 add count to follow button, tweak links to fit on one line for 940px 2012-02-02 09:46:14 -08:00
Mark Otto ab4345332d Merge branch 'shama-master' into 2.0.1-wip 2012-02-02 09:38:21 -08:00
Mark Otto bd0e952003 fix inverted warning text and bg colors in less docs page 2012-02-02 09:36:33 -08:00
Mark Otto cf488c2800 fix incorrect uses of it's in the docs 2012-02-02 09:33:18 -08:00
Mark Otto dfdc63e872 fix incorrect use of 'caret' 2012-02-02 09:31:07 -08:00
Mikael Brevik 8c0b47a6a8 Fixed duplicate and wrong IDs and label fors in forms. 2012-02-02 14:09:27 +01:00
Kyle Robinson Young 99f395bcd7 Typo fixes 2012-02-01 23:30:37 -08:00
Mark Otto 9c3218c89b Merge branch 'mshafrir-master' into 2.0.1-wip 2012-02-01 23:12:17 -08:00
Mark Otto d86e77a256 Merge branch 'master' of https://github.com/mshafrir/bootstrap into mshafrir-master 2012-02-01 23:12:06 -08:00
Mark Otto 8dd2b3d3f8 follow up to #1501 to update notes in sprites.less 2012-02-01 23:10:37 -08:00
Mark Otto 1ec6628e80 add note for icon class usage per #1501 2012-02-01 23:10:00 -08:00
Mark Otto 25ffe14c1b add line item to docs on upgrading per #1488 2012-02-01 23:02:31 -08:00
Mark Otto aa8a7668cb Merge branch 'master' into 2.0.1-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-01 22:52:07 -08:00
Mark Otto 58fd0dea36 fixing some docs pages for i18n 2012-02-01 22:51:01 -08:00
Jacob Thornton e26da36b9a remove 2.0-wip ref 2012-02-01 22:30:51 -08:00
Mark Otto 43d797dfff #1566: add note about removal of secondary-nav in 2.0 2012-02-01 22:29:15 -08:00
Jacob Thornton e1deb4e767 fix makefile to reset zips 2012-02-01 22:27:46 -08:00
Mark Otto 4211f21e39 #1571: remove fixed width on file inputs 2012-02-01 22:27:11 -08:00
Jacob Thornton 6738042c61 rebuild with correct zip 2012-02-01 22:21:29 -08:00
Mark Otto c1f0da7cce Merge branch 'master' of github.com:twitter/bootstrap 2012-02-01 22:13:26 -08:00
ejain 1b8863f925 Import the responsive css *after* setting the body padding to fix the issue described in #1570. 2012-02-01 21:17:04 -08:00
Mark Otto f34ddb5c3f nuke all curly ticks 2012-02-01 18:27:38 -08:00
Mark Otto 94c2c70e6e fix spelling in examples page 2012-02-01 18:25:34 -08:00
Mark Otto 54bfdf1183 fix the makefile 2012-02-01 18:24:41 -08:00
Mark Otto 8a1769c9e2 fix missing ; in buttons.less 2012-02-01 18:18:39 -08:00
Mark Otto f2d3026de8 update scaffolding responsive section to reflect proper media query ranges 2012-02-01 18:12:14 -08:00
Mark Otto 1ebe51c834 fix mis-labeled label 2012-02-01 18:11:19 -08:00
Mark Otto 4d918beb26 fix js links in components 2012-02-01 18:06:52 -08:00
Mark Otto 2e1649410c remove twitter widgets js from examples 2012-02-01 18:00:40 -08:00
Mark Otto e36496fd84 Merge pull request #1490 from amenonsen/master 
Typo fix: Sprited => Striped
 2012-02-01 17:59:19 -08:00
Mark Otto 3ea3950225 fix icon-bar class in exampless 2012-02-01 17:57:39 -08:00
Mark Otto 2fd6a2e9f6 remove excess td in less docs 2012-02-01 17:55:32 -08:00
Mark Otto 3a2f0765bf fix hover state on .nav-list for active links 2012-02-01 17:54:21 -08:00
Mark Otto 73238701bd fixing jquery links in examples 2012-02-01 17:41:24 -08:00
Mark Otto 5c1527abc5 remove unused css files and add scaffolding and hero-unit to the builder 2012-02-01 17:06:40 -08:00
Mark Otto f166c5a35b Merge branch 'master' of github.com:twitter/bootstrap 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-01 16:45:25 -08:00
Mark Otto 9b9e1d309b fix that jank hack 2012-02-01 16:44:07 -08:00
Jacob Thornton 87df230408 rebuild 2012-02-01 16:39:15 -08:00
Jacob Thornton 59016d2198 only add the anyalytics to production 2012-02-01 16:38:58 -08:00
Michael Shafrir b96e80cf39 Fix broken named anchor link for LESS compiling instructions. 2012-02-01 09:58:08 -08:00
Abhijit Menon-Sen 140d90db63 Typo fix 2012-02-01 13:21:37 +05:30
Mark Otto 7f32d15fbb fix links and rebuild 2012-01-31 19:32:42 -08:00
Jacob Thornton fd49d4a44f move examples into docs... 2012-01-31 17:35:23 -08:00
Jacob Thornton bdfb05dbac Merge branch '2.0-wip' 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-31 17:27:01 -08:00
Mark Otto c8fad25902 update upgrade page 2012-01-31 17:24:20 -08:00
Jacob Thornton cabba91c7c Merge branch '2.0-wip' 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-31 14:38:06 -08:00
Mark Otto c84b5cf5f5 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-31 14:30:07 -08:00
Mark Otto 6cf79a5b8e remove unused examples, update examples docs page, add starter template to examples, remove warning alert banner, add screenshots 2012-01-31 14:29:44 -08:00
Mark Otto 013de18e6b remove warning alert on less docs 2012-01-31 14:00:26 -08:00
Jacob Thornton fd700e358d Merge branch '2.0-wip' 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-31 13:59:40 -08:00
Jacob Thornton e75bc5eb5f Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-31 13:59:08 -08:00
Jacob Thornton 390a9af936 move js stuff into assets 2012-01-31 13:58:28 -08:00
Mark Otto aec0cb3303 fix broken nav on less page 2012-01-31 13:57:43 -08:00
Jacob Thornton b9de88890e Merge branch '2.0-wip' 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-31 13:23:29 -08:00
Jacob Thornton 0bfbe5058d 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
 2012-01-31 13:18:34 -08:00
Mark Otto cfc1c8a8cd clean up responsive media queries and docs css 2012-01-31 13:16:11 -08:00
Mark Otto 09b9b8a586 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-31 09:40:11 -08:00