rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Code Issues Actions Packages Releases Activity
1,665 Commits 108 Branches 89 Tags 547 MiB
575b82473f
Commit Graph

971 Commits

Author SHA1 Message Date
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
Mark Otto
9cfae03fd4 fix typo in base css docs 2012-01-31 09:37:44 -08:00
Mark Otto
cc5415b889 fix js docs typo 2012-01-31 09:37:14 -08:00
nkryptic
d70ba6c5e6 add form help-* documentation 2012-01-31 03:54:07 -05:00
Mark Otto
a6253f0937 fix disabled button docs 2012-01-31 00:15:43 -08:00
Mark Otto
bd9221ddc0 Merge pull request #1457 from nkryptic/2.0-wip 
[2.0-wip] added missing nav- prefixes to docs
 2012-01-31 00:12:34 -08:00
Mark Otto
b7713b83fa chance icon class 2012-01-31 00:11:19 -08:00
nkryptic
d633dbb44e add nav- prefix to rest of docs 2012-01-31 02:54:10 -05:00
Mark Otto
4d93b63916 disable cursor on disabled and active pagination links 2012-01-30 23:27:58 -08:00
Mark Otto
d533310bd2 once more, overhaul the icons and use the css regex selector on our icons 2012-01-30 23:24:35 -08:00
Mark Otto
de994efac7 fix the other disabled button style 2012-01-30 23:17:05 -08:00
Mark Otto
5c9a687665 fix button styles on active and disabled 2012-01-30 23:16:27 -08:00
Mark Otto
61b47e91b8 update layout docs 2012-01-30 23:10:29 -08:00
Mark Otto
1cff29c33f restore a few commented out responsive items 2012-01-30 23:02:24 -08:00
Mark Otto
47a68ae3aa update icons everywhere to be scoped per other components, fix broken elements on js docs page 2012-01-30 22:57:00 -08:00
Mark Otto
31911659a2 refactor the navs to use prefixed classes, because you know, consistency is beast mode 2012-01-30 21:29:50 -08:00
Mark Otto
0f3a073b8d *really* refactor the buttons and update them all over the docs 2012-01-30 21:15:57 -08:00
Mark Otto
21bebe77fe refactor buttons.less 2012-01-30 20:50:51 -08:00
Jacob Thornton
155047c3e6 speed up topbar animation for responsive 2012-01-30 13:59:05 -08:00
Mark Otto
74f2a89611 fix wrong value in grid column width in download page 2012-01-30 10:01:02 -08:00
Mark Otto
e94e0f1cf9 implement @textColor for body text 2012-01-30 09:41:31 -08:00
Mark Otto
ac581eebac large carousel images and margin bottom added 2012-01-30 09:19:25 -08:00
Mark Otto
774904464d fix docs: move .pull-left from search input to search form in navbar 2012-01-30 08:58:40 -08:00
Mark Otto
3722c34b50 account for floated inputs in the .navbar-form 2012-01-30 08:20:37 -08:00
Mark Otto
2d40b07afc adding warning (orange) button, fix responsive navbar problem 2012-01-30 08:15:28 -08:00
Mark Otto
a29dee44ac remove all new dropdown button stuff 2012-01-30 08:04:48 -08:00
Mark Otto
a8400009da testing out button dropdown group 2012-01-30 07:59:24 -08:00
Mark Otto
2c8ca4f5e2 add skew mixin 2012-01-30 07:54:47 -08:00
Mark Otto
9f5b619094 add in regular button dropdowns, rejigger the button dropdowns section to reflect change 2012-01-30 07:49:28 -08:00
Mark Otto
9ba70796e2 remove top 5px padding from first inline radio/checkbox 2012-01-30 07:40:24 -08:00
Mark Otto
33a969dd0c update vars in less and download pages 2012-01-30 01:34:59 -08:00
Mark Otto
175fd98a7c fix forms typo on error state 2012-01-30 01:25:02 -08:00
Mark Otto
144789788f updated upgrade page to reflect popover changes 2012-01-30 01:24:02 -08:00
Mark Otto
f4e5bc1c53 namespace popover values 2012-01-30 01:20:51 -08:00
Mark Otto
8f448610a9 rename vertical-divider to divider-vertical, add more space around the divider 2012-01-30 01:09:34 -08:00
Mark Otto
dc3d2b1044 update js docs page to clarify usage of images on carousel 2012-01-30 00:44:27 -08:00
Mark Otto
0f088af855 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/bootstrap.zip
	less/responsive.less
 2012-01-30 00:43:57 -08:00
Mark Otto
ae7f94eeff overhaul grid mixins and variables, standardize fluid grid system and enable it across responsive layouts 2012-01-30 00:39:44 -08:00
Jacob Thornton
0de951f4f4 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-29 19:07:14 -08:00
Jacob Thornton
fae04c8ac1 add license for responsive and rebuild 2012-01-29 19:04:26 -08:00
Mark Otto
2ba1b01f8d subnav adjustments 2012-01-29 17:03:05 -08:00
Mark Otto
fda77e69eb move vars and mixins for default grid back to appropriate files 2012-01-29 16:58:51 -08:00
Mark Otto
b078050702 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-29 16:55:56 -08:00
Mark Otto
0301d469e8 remove .collapse from navbar responsive docs 2012-01-29 16:54:51 -08:00
Jacob Thornton
90f2e8e196 rebuild zip 2012-01-29 16:46:40 -08:00
Mark Otto
882bb9dbd3 reran make 2012-01-29 16:43:03 -08:00
Mark Otto
b0976bb379 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-29 16:42:37 -08:00
Mark Otto
702d3b6dfe fix broken navbar collapse 2012-01-29 16:35:55 -08:00
Jacob Thornton
298e637d00 remove dist dir 2012-01-29 16:33:29 -08:00
Jacob Thornton
f622822459 check in dist dir for hb5 + update images to point to correct spot for builder 2012-01-29 16:19:41 -08:00
Mark Otto
d637db1a23 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-29 14:23:06 -08:00
Mark Otto
e493f7fc19 update navbar collapse everywhere and remake 2012-01-29 14:22:51 -08:00
Mark Otto
9e7f5025b4 update collapsible nav in navbar 2012-01-29 14:07:58 -08:00
Mark Otto
391661f14b Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-29 13:25:36 -08:00