0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

59 Commits

Author SHA1 Message Date
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
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
Mark Otto
7e56e2265d Merge branch '2.2.2-wip' into exploratory
Conflicts:
	less/button-groups.less
2012-11-22 22:04:21 -08:00
Mark Otto
8df2811d49 Simpler footer for docs
* Remove back to top link (ya'll are lazy :P)
* Center text
* Decrease vertical padding
2012-11-21 23:29:20 -08:00
Mark Otto
05a2d37559 run make after removing responsive css file 2012-11-04 00:37:49 -07:00
Mark Otto
3de6f3ff88 Swap old icons for new in docs 2012-11-03 16:18:02 -07:00
Mark Otto
1477e081d4 Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
	less/accordion.less
	less/alerts.less
	less/breadcrumbs.less
	less/buttons.less
	less/code.less
	less/dropdowns.less
	less/forms.less
	less/navbar.less
	less/progress-bars.less
	less/responsive-navbar.less
	less/tables.less
	less/thumbnails.less
	less/tooltip.less
	less/wells.less
2012-11-02 09:36:51 -07:00
Mark Otto
d5697fcf6b fixes #5717: add retina favicon, recompile docs 2012-10-31 10:41:41 -07:00
Mark Otto
bf78333531 add in latest carousel example, reorg examples on getting started 2012-10-16 12:50:10 -05:00
Mark Otto
6203535d2f Changing title of docs pages to simply say 'Bootstrap' like the docs home page 2012-10-07 21:38:28 -07:00
Mark Otto
e73cd15fc8 copy and style changes to improve docs rendering on mobile devices 2012-10-02 17:01:18 -07:00
Mark Otto
bbd543db53 Merge branch '2.1.2-wip' into exploratory
Conflicts:
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
2012-09-30 22:45:39 -07:00
Mark Otto
a4a6244eb7 add sticky footer example per martin bean's suggestion, using the implementation by ryan fait 2012-09-30 22:09:51 -07:00
Mark Otto
b6ba717b75 fix getting started examples 2012-09-25 23:01:18 -07:00
Mark Otto
c59e5251e1 initial pass at removing navbar-inner from .navbar component 2012-09-25 22:48:02 -07:00
Mark Otto
f12946be5a thumbnails cleanup: no more UL or LI elements needed, instead just use standard grid markup 2012-09-25 22:40:48 -07:00
Mark Otto
6c4b276cd4 way cooler carousel example, along with updated screenshots for examples 2012-09-14 15:55:46 -07:00
Mark Otto
faa760f563 revert docs change 2012-09-14 10:30:55 -07:00
Martin Bean
2ead9a5bc3 Standardized spelling of 'JavaScript'; added icons to file trees 2012-09-14 14:06:15 +01:00
Mark Otto
595e1a189c fixes #5119: javascript in navbar typo 2012-09-13 10:07:57 -07:00
Mark Otto
39791a8ea8 fixes #5059 manually: include media type in css getting started block 2012-09-10 22:44:08 -07:00
Ramiro Morales
138b5a8c05 Fix small documentatio typos. 2012-09-05 23:07:52 -03:00
Mark Otto
e8c5b3c9a5 fixes #4869: typo in getting started 2012-08-31 23:51:48 -07:00
Mark Otto
72f176d1f5 fixes #4748: document jquery dependency better 2012-08-27 09:17:20 -07:00
Mark Otto
eb8aad85b8 fixes #4734 manually: doctype in getting started in examples 2012-08-26 22:29:40 -07:00
Mark Otto
535dfc2153 fixes #4561: typo 2012-08-22 09:51:41 -07:00
Mark Otto
6160667b19 fixes #4564 manually: typo in getting started jumbotron 2012-08-22 09:48:57 -07:00
Mark Otto
a667fd93ab pre font-size increase; revert static top navbar, undo contents section for now 2012-08-19 23:01:24 -07:00
Mark Otto
4e979f084d fix static navbar container issues, clean up docs presentation by unfixing the top navbar in favor of static one, start adding table of contents for longer sections of docs 2012-08-19 21:12:52 -07:00
Mark Otto
bb85bbc657 compy edits to docs 2012-08-19 12:04:41 -07:00
Mark Otto
7ed82c1223 font-size change on examples in getting started 2012-08-19 11:59:28 -07:00
Jacob Thornton
dee57462e2 get affix actually working and update docs 2012-08-14 21:06:08 -07:00
Mark Otto
c2e899f2a0 remove the canvas slider doodad 2012-08-01 19:00:25 -07:00
Mark Otto
9795e9bbe6 place chevrons first in sidenav in docs, fix ie7 bugs for said sidenav 2012-07-30 23:48:26 -07:00
Mark Otto
0e62011da0 fix download page links 2012-07-30 15:52:38 -07:00
Mark Otto
a30045daef reverse navbar styles to save code 2012-07-29 00:30:15 -07:00
Mark Otto
f75277e62d indenting and such 2012-07-26 21:45:19 -07:00
Mark Otto
b7b4fd5c82 wrap footer in bs docs canvas for scrolling doodad 2012-07-24 01:53:32 -07:00
Jacob Thornton
e38fa4b1f4 fix scroll thinggg 2012-07-24 00:30:58 -07:00
Mark Otto
f085dbadd1 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Conflicts:
	docs/assets/css/docs.css
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/getting-started.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/javascript.mustache
	docs/templates/pages/scaffolding.mustache
2012-07-23 23:01:38 -07:00
Mark Otto
0dda2c4659 make docs scroll over jumbotrons, but only for 980px up 2012-07-23 22:36:08 -07:00
Jacob Thornton
dcf75697ec some progress on affix plugin 2012-07-22 18:28:39 -07:00
Mark Otto
b9105b98f9 move from downloads.html to customize.html to better match purpose of page, fix up customize page layout to match other docs, link style refinement to jumbotrons 2012-07-20 22:06:47 -07:00
Mark Otto
c8fa2600f2 copy change 2012-07-17 23:38:29 -07:00