Commit Graph

898 Commits

Author SHA1 Message Date
Mark Otto 51f5b7b8af cleanup accordion css and add comments 2012-01-17 23:24:59 -08:00
Mark Otto 9372fdbf97 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-17 23:19:50 -08:00
Mark Otto 41a410b8e6 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	bootstrap.min.css
	docs/javascript.html
	lib/accordion.less
2012-01-17 23:19:21 -08:00
Jacob Thornton 593b062c7a wrap transition 2012-01-17 10:32:25 -08:00
Mark Otto f1a88eede3 fix js link in docs nav, restyle accordion with new css 2012-01-16 17:27:30 -08:00
Jacob Thornton 7ec4e91324 reorder properties 2012-01-15 21:58:45 -08:00
Jacob Thornton 87bd0e0b88 do some trickery to get borders looking right 2012-01-15 21:54:58 -08:00
Jacob Thornton 036b985357 fix margin 2012-01-15 21:50:04 -08:00
Jacob Thornton 810bba97a4 make accordions little bit smoother 2012-01-15 21:48:58 -08:00
Mark Otto 1c734281c9 Merge pull request #1020 from lookfirst/fixtest
Fix typo in tables docs
2012-01-15 20:51:45 -08:00
Jon Stevens b4dd2b9a10 fix typo 2012-01-15 19:38:30 -08:00
Mark Otto f48278dac6 updated accordion and carousel; accordion still needs work 2012-01-15 18:40:17 -08:00
Mark Otto c02501e1b7 move carousel to separate stylesheet, update popovers to fix ie7 bug, fix pagination, fix alerts 2012-01-15 16:27:36 -08:00
Mark Otto 3d9298b04b fix the js alerts examples 2012-01-15 15:06:30 -08:00
Mark Otto 127c0d0b52 make dl and child elements less specific 2012-01-15 13:12:29 -08:00
Mark Otto f43f2c0ea2 fix grid sized horizontal form layout 2012-01-15 12:53:35 -08:00
Mark Otto 6077b7678c fix modal horizontal alignment 2012-01-15 11:41:46 -08:00
Mark Otto 9f732e90d4 make horizontal form labels map to default grid sizing 2012-01-15 11:33:30 -08:00
Mark Otto fe160261e4 normalize the alert classes to match last night's flip for form and table classes 2012-01-15 11:30:24 -08:00
Mark Otto 1385540d0a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-15 11:26:21 -08:00
Mark Otto 8ceea1f559 fix some ie7 bugs, improve dropdowns for ie due to lack of a shadow, fix pager example code 2012-01-15 11:26:06 -08:00
Mark Otto a63636a248 Merge pull request #1012 from pkauders/patch-1
Fix small typo in docs home page
2012-01-15 11:23:34 -08:00
Paul Kauders ed9903f797 Fix typo in Responsive design content 2012-01-15 07:46:25 -06:00
Mark Otto f989c6892f gray out links for active state on pagination 2012-01-14 23:33:42 -08:00
Mark Otto 16eccc43d9 dates updated to 2012 2012-01-14 23:28:48 -08:00
Mark Otto dab6d2b17c change up classes on tables and forms, fix nav list styles in example 2012-01-14 21:28:47 -08:00
Mark Otto 6d916763f8 adding the pager component after rewriting the pagination docs and css 2012-01-14 20:54:37 -08:00
Mark Otto 1c6048bac2 restore top bar on home page 2012-01-14 19:17:48 -08:00
Mark Otto 2c3365f99e allow btn-groups to work in navbars 2012-01-14 17:16:46 -08:00
Mark Otto 74c0fc17c8 fix duplicate icons 2012-01-14 16:56:47 -08:00
Mark Otto 55ea574f8a update preventing double border line for bordered tables by account for th elements in tr elements 2012-01-14 16:50:36 -08:00
Mark Otto 028726a9a3 add user-select mixin 2012-01-14 16:45:01 -08:00
Mark Otto a40b2a636c make inline and search form labels inline-block 2012-01-14 16:38:40 -08:00
Mark Otto ceb6836e03 move up alert message close icon 2012-01-14 16:24:23 -08:00
Mark Otto 7455dd6b45 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-14 16:18:39 -08:00
Mark Otto f587e81b7d rewrite alert messages to use less code, combine the look of default and block messages, simplify docs 2012-01-14 16:18:15 -08:00
Mark Otto 59673bf9f7 Merge pull request #1003 from cgunther/docs-fixes
Fix links in docs top bar and section ids
2012-01-14 13:08:39 -08:00
Chris Gunther ec7f8917b1 add Progress Bars to Components narbar dropdown 2012-01-14 15:24:35 -05:00
Chris Gunther 1f54ff91b2 fix section ID for thumbnails 2012-01-14 15:21:57 -05:00
Chris Gunther b723db1e42 fix section ID for pagination 2012-01-14 15:21:09 -05:00
Chris Gunther f82fb2a197 fix navbar links to base CSS > typography 2012-01-14 15:18:59 -05:00
Chris Gunther a4b107bf87 fix navbar links to scaffolding > grid system 2012-01-14 15:15:24 -05:00
Jacob Thornton 07530073dd Merge pull request #995 from renajohn/2.0-wip
Fix bug on tooltips placement when passed as a function
2012-01-14 10:21:08 -08:00
Renault John Lecoultre 2cea94e892 Fixed when placement is a function 2012-01-13 22:33:05 +01:00
Mark Otto fc053ac8b2 update dropdowns spacing and docs section spacing 2012-01-13 10:07:56 -08:00
Mark Otto b958ac77c1 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-13 09:55:43 -08:00
Mark Otto 8f09028cff updated js includes to make nav work everywhere 2012-01-13 09:55:15 -08:00
Jacob Thornton e27ae9c50f Merge pull request #986 from purwandi/2.0-wip
Fix id anchor javascript
2012-01-13 00:32:12 -08:00
Purwandi 7b321e9c1f Remove sidebar with icon from my own repo 2012-01-13 15:03:23 +07:00
Purwandi 2623f325ec Merge branch '2.0-wip' of github.com:purwandi/bootstrap into 2.0-wip 2012-01-13 14:58:13 +07:00