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

103 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
adc2c779a0 grid vars updated 2012-11-30 15:43:07 -08:00
Mark Otto
e34b3730b7 form state vars 2012-11-30 15:38:31 -08:00
Mark Otto
0a93bc143d hero unit and pagination vars 2012-11-30 15:36:16 -08:00
Mark Otto
62a2220035 navbar vars 2012-11-30 15:33:56 -08:00
Mark Otto
01421ecd62 remove sprites vars, change zindex vars 2012-11-30 15:23:13 -08:00
Mark Otto
12a00f62a9 remove color variables, swap others were appropro 2012-11-30 15:18:49 -08:00
Mark Otto
0ef347706c more vars changing 2012-11-30 15:09:57 -08:00
Mark Otto
9239bfbc7b more vars changed, remove @white var 2012-11-30 15:05:23 -08:00
Mark Otto
b0e2b5813d more consistent variable naming patterns 2012-11-30 14:45:25 -08:00
Mark Otto
7a3d15eb21 Part 1 of unCamelCasing variables 2012-11-30 14:37: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
1a4ce9ba18 Merge branch '2.2.2-wip' into exploratory 2012-11-09 10:09:04 -08:00
Mark Otto
cf7d7a7b5d remove ; from customizer 2012-11-08 23:46:40 -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
a249d1c8ee Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache
2012-11-03 13:44:01 -07:00
Mark Otto
fc42ac6a56 fixes #5756: duplicate media CSS in compiled builds 2012-11-02 09:47:42 -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
9352fe1750 add a ton of the new vars to the customizer 2012-10-29 21:30:39 -07:00
Mark Otto
81c3c1c68c add media.less to customizer page 2012-10-29 21:02:05 -07: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
c59e5251e1 initial pass at removing navbar-inner from .navbar component 2012-09-25 22:48:02 -07:00
Mark Otto
783f4885ab add the media css to customizer 2012-09-17 18:17:22 -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
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
Jacob Thornton
ae9a2bd93a Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-08-14 21:06:39 -07:00
Jacob Thornton
dee57462e2 get affix actually working and update docs 2012-08-14 21:06:08 -07:00
Mark Otto
e1659b2c4e add affix plugin to downloads page 2012-08-14 18:57:27 -07:00
kylase
d96047f45f Changed placeholders value of @baseFontSize and @baseLineHeight to the values specified in variables.less 2012-08-14 11:57:13 +08:00
Mark Otto
08e4475f00 reorg vars fields on customize page to ensure they are all in three columns for time being 2012-08-07 23:11:23 -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
a30045daef reverse navbar styles to save code 2012-07-29 00:30:15 -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
Mark Otto
5b8838aeac more alignment fixes for customize page 2012-07-23 12:51:48 -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