0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Commit Graph

1688 Commits

Author SHA1 Message Date
Mark Otto
f4f7296fa8 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/less.html
	docs/templates/pages/less.mustache
2012-01-25 01:23:50 -08:00
Mark Otto
b8fa6cfacf move css builder and downloader to dedicated page, start to update remaining sections on LESS docs page 2012-01-25 01:22:29 -08:00
Mark Otto
c5103d0ad1 Merge pull request #1181 from jwieland/updatelessdoc
Minor doc changes about less.js version
2012-01-25 00:41:05 -08:00
Jason Wieland
64f85e0371 caught another old reference to 1.1.3 2012-01-25 00:02:37 -08:00
Mark Otto
b0fb31be5e fix js link on chop shop 2012-01-24 23:45:48 -08:00
Mark Otto
ae70d2a8b6 refine spacing on fixed subnav 2012-01-24 23:44:59 -08:00
Mark Otto
e555f38ae4 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/less.html
2012-01-24 23:36:39 -08:00
Mark Otto
6ab56051fd fix up docs css for responsive and subnav, fix forms error states 2012-01-24 23:35:34 -08:00
Jason Wieland
6be91368c0 minor doc updates to inform user they need the current less.js 1.2.1 or they will be hit by this bug #952 2012-01-24 23:24:46 -08:00
Jacob Thornton
5d3175e84b fix sub navs fer the otherrzz 2012-01-24 22:48:30 -08:00
Jacob Thornton
5a54a98925 subnav spy scrolls blaawerh 2012-01-24 22:37:35 -08:00
Jacob Thornton
5e5e87fbd0 scrollspy working for sub navs 2012-01-24 22:33:33 -08:00
Mark Otto
f2fe2b1798 remove top margin from alert close, chance close line height to 18px (baseLineHeight) 2012-01-24 21:11:20 -08:00
Mark Otto
9602248ad5 Merge branch 'fix-alert-close-line-height' of https://github.com/pokonski/bootstrap into pokonski-fix-alert-close-line-height 2012-01-24 21:09:28 -08:00
Mark Otto
a5c1d1f182 adding actual images to carousel to ensure you can see things are animating; updated styles of carousel controls to work on light and dark backgrounds and use opacity for effects 2012-01-24 20:45:38 -08:00
Mark Otto
aa59f123c0 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-24 20:30:39 -08:00
Mark Otto
a03fbc18cb allow for text in progress bars 2012-01-24 20:30:26 -08:00
Mark Otto
731821b78f updated docs css to fix subnav on iOS 2012-01-24 20:26:54 -08:00
Mark Otto
8ce9b3a676 Merge pull request #1175 from Xaro/2.0-wip
Typo in pre type section
2012-01-24 20:16:33 -08:00
Roberto Poo
74b5dc8d3b Fixed typo 2012-01-25 02:06:50 -02:00
Mark Otto
c1dd1f586d Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-24 19:57:48 -08:00
Mark Otto
c6d5dcd872 remove link from transitions on js page 2012-01-24 19:50:18 -08:00
Mark Otto
da1906b037 Merge pull request #1140 from mchung/patch-1
Fixed typo in Makefile
2012-01-24 19:49:39 -08:00
Mark Otto
bacb05608f redo the form examples to enable better responsive layout 2012-01-24 19:43:52 -08:00
Mark Otto
4a6d9106b8 fix the thumbnails more examples section 2012-01-24 19:36:42 -08:00
Mark Otto
672ba4c2fd update the subnav on all pages 2012-01-24 19:19:50 -08:00
Mark Otto
f70895a605 remove rogue html elements 2012-01-24 19:01:38 -08:00
Mark Otto
8804860898 fix typo on js docs 2012-01-24 18:45:23 -08:00
Mark Otto
d362223535 refine fixed docs bar 2012-01-24 18:29:17 -08:00
Mark Otto
9ef4171d03 lighten alert on less page 2012-01-24 18:26:45 -08:00
Mark Otto
26ed8202ee modify the scaffolding page to fix the language around preboot/grid variables 2012-01-24 18:24:38 -08:00
Mark Otto
4793a6f8fa Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-24 17:14:34 -08:00
Mark Otto
805a965f2e finish updating form state and alert variables in less docs page 2012-01-24 17:14:19 -08:00
Jacob Thornton
a40d4993ed make subnav fix 2012-01-24 17:13:02 -08:00
Mark Otto
40e92221a6 revamp alert message and error state color/text/bg to be variables 2012-01-24 16:54:35 -08:00
Mark Otto
c2312220e4 fix code type size 2012-01-24 16:19:01 -08:00
Mark Otto
b9bd5c65e7 fix mailto link 2012-01-24 16:18:12 -08:00
Mark Otto
7e6797880a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/index.html
	docs/templates/pages/index.mustache
2012-01-24 16:09:32 -08:00
Mark Otto
03d2128f50 Merge pull request #1149 from Calvein/2.0-wip
[base-css] Fixed a nasty "mailto" typo and added jquery.tablesorter
2012-01-24 16:08:09 -08:00
Mark Otto
8ff621aa26 fix broken index page heading, update variables and less pages 2012-01-24 16:07:30 -08:00
Jacob Thornton
655a96869c typo with i18n 2012-01-24 15:51:28 -08:00
Jacob Thornton
3a840075dd rebuild 2012-01-24 15:42:16 -08:00
Jacob Thornton
4c5497bfcc Merge pull request #1158 from pokonski/wrap-stuff
Wrap stuff in components.mustache
2012-01-24 15:03:30 -08:00
Piotrek Okoński
ef869776e5 Wrap stuff in components.mustache 2012-01-25 00:00:35 +01:00
Jacob Thornton
5f209ed810 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	docs/templates/pages/index.mustache
2012-01-24 14:33:52 -08:00
Jacob Thornton
fbc1ab14cc Merge branch '2.0-wip' of https://github.com/MGaetan89/bootstrap into 2.0-wip
Conflicts:
	docs/templates/pages/index.mustache
2012-01-24 14:31:10 -08:00
Mark Otto
58f7fd308a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/templates/pages/index.mustache
2012-01-24 14:28:14 -08:00
Mark Otto
fecd4ddd13 docs updates to make the getting started section more responsive, updated the benefits to be clearer and swap x for checkmark 2012-01-24 14:25:30 -08:00
Gaëtan Muller
fea1dc906e i18n for index page 2012-01-24 23:23:43 +01:00
Jacob Thornton
a800d6ceac i18n index 2012-01-24 14:22:02 -08:00