root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
4,111 Commits 111 Branches 92 Tags 670 MiB
Commit Graph

385 Commits

Author SHA1 Message Date
Mark Otto cf693b5632 Add in responsive for 1200px+ layout; increase padding for that viewport size 2013-01-16 14:48:25 -08:00
Mark Otto 13a80f33c8 fix up sidenav and components page 2013-01-16 14:10:33 -08:00
Mark Otto 3e40e7dfbf mo betta sidenav for responsive hotness 2013-01-16 13:20:32 -08:00
Mark Otto beb2c13f4d Prevent grids from collapsing, fix affixed side nav for docs 2013-01-16 13:11:45 -08:00
Mark Otto c18b5b9735 restore glyphicons docs styles and then overhaul the shit out of them 2013-01-16 13:02:15 -08:00
Mark Otto eb3cd5d7d2 Restore responsive docs 2013-01-16 12:44:25 -08:00
Mark Otto 992e0d922a Re-add and update form styles: 
* Restore forms.less file
* Overhaul .radio.inline .checkbox.inline to be .radio-inline or .checkbox-inline
* Update docs to reflect changes
 2013-01-16 12:23:05 -08:00
Mark Otto b6b8633542 twerk docs code examples 2013-01-16 12:02:45 -08:00
Mark Otto 6ac6be2a5e more subhead/jumbotron tweaks for docs 2013-01-16 11:45:16 -08:00
Mark Otto 0df7411362 Derp on type styles a bit more; bring back and fix up more more docs styles 2013-01-16 11:38:34 -08:00
Mark Otto 81a22e189a add back docs footer 2013-01-16 11:03:54 -08:00
Mark Otto 8fd26040d8 Port over temp responsive styles to bootstrap.less; readd buttons 2013-01-16 10:52:33 -08:00
Mark Otto 85db846b65 mobile-first navs, navbar, grids, and type 2013-01-15 17:55:14 -08:00
Mark Otto 094767fbfe code changes 2013-01-15 14:34:04 -08:00
Mark Otto 267690eb1b docs changes, more type improvements, add grid system basics back 2013-01-15 14:30:00 -08:00
Mark Otto 09696143e0 type and stuff 2013-01-15 10:14:12 -08:00
Mark Otto 25c9b6b59a nuke and flatten and stuff 2013-01-14 22:05:55 -08:00
Mark Otto d247f71217 Reset docs jumbotron button to blue defaults 2013-01-13 04:27:51 -08:00
Mark Otto 7d8d5c7838 Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/components.html
	docs/css.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/extend.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/buttons.less
	less/forms.less
	less/navbar.less
	less/popovers.less
	less/responsive-767px-max.less
	less/responsive.less
	less/tables.less
	less/tooltip.less
	less/type.less
	less/variables.less
	package.json
 2013-01-13 04:26:52 -08:00
Mark Otto 0b31cfc90e Fix up .brand in navbar of docs 2013-01-12 20:10:42 -08:00
Mark Otto 7bcd02c167 Tweak button 2013-01-12 19:02:48 -08:00
Mark Otto ff02043bbc Flatten navbar 2013-01-12 14:31:18 -08:00
Mark Otto a24e47b5b8 Update the examples index: 
* Retina ready screenshots
* Added screenshot and link to justified nav example (previously unlinked marketing-alternate.html)
 2012-12-20 15:08:05 -08:00
Mark Otto 65edc9cd6e Change .jumbotron usage in docs layout to .bs-docs-jumbotron 2012-12-19 21:42:36 -08:00
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 12916b06aa Fix up display of dropdown submenu examples on responsive views 2012-12-04 18:25:16 -08:00
Mark Otto 9c028ea54b follow button width 2012-12-01 18:51:03 -08:00
Mark Otto dd11d0a3fa move around social buttons 2012-12-01 13:47:07 -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 942f9c5df4 Fixes #6012: Updated docs sidenav media queries and reset width for exactly 980px 2012-11-28 00:37:55 -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 e0d0190803 fix image sizes on homepage 2012-11-22 12:26:54 -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 21957a3d9e set background size for docs jumbotron for retina 2012-11-04 13:24:06 -08:00
Mark Otto 25fded1ff4 responsive images, updated shadows on navbars, remove responsive file from docs 2012-11-04 00:31:43 -07:00
Mark Otto 3de6f3ff88 Swap old icons for new in docs 2012-11-03 16:18:02 -07:00
Mark Otto a56de2b84f Merge branch 'glyphicons_font' into exploratory 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	less/sprites.less
 2012-11-03 16:15:54 -07:00
Mark Otto c0eacca0db Navs refactor, restoring .nav-list 2012-11-03 16:14:44 -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 c9dbd2d601 Fixes #5458: Clarify fluid nesting 2012-11-03 13:28:48 -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 72198a59c0 removing glyphicons images, swapping in new icon font with new classes 2012-11-02 01:20:06 -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 e6d6c7a413 Merge branch '2.1.2-wip' into exploratory 
Conflicts:
	docs/assets/css/bootstrap.css
	less/navs.less
 2012-10-01 11:27:40 -07:00
Mark Otto a90334eebb fix docs sidenav width for ie8-9 2012-10-01 11:11:33 -07:00
Mark Otto d1affe6154 restore gradient to navbars 2012-09-25 22:53:41 -07:00
Mark Otto f8efc75a66 increase padding on navbar links, remove font-size override on .navbar from docs css 2012-09-25 22:51:05 -07:00
Mark Otto c59e5251e1 initial pass at removing navbar-inner from .navbar component 2012-09-25 22:48:02 -07:00
Mark Otto ce19e63d5b Merge branch '2.1.2-wip' into box-sizing-exercise 
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/base-css.html
	docs/templates/pages/base-css.mustache
	less/forms.less
	less/mixins.less
 2012-09-25 22:00:41 -07:00
Mark Otto a6206c98d5 increase padding on homepage button 2012-09-19 15:18:14 -07:00
Mark Otto 7e29581210 Merge branch '2.1.2-wip' into box-sizing-exercise 
Conflicts:
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache
 2012-09-07 22:34:51 -07:00
Mark Otto bc4ecd9984 regrettably remove the animated button for download on homepage to improve page performance in some browsers 2012-09-04 20:13:27 -07:00
Mark Otto 69d4c3f9a1 fixes #4925: ensure docs examples don't use fixed font-size and line-height for .lead 2012-09-02 20:54:41 -07:00
Mark Otto 010a5dd84d Merge pull request #4816 from desimone/master 
Fixed a typo in docs/assets/css/docs.css
 2012-08-29 10:48:04 -07:00
Bobby DeSimone 8878facc67 Fixed a typo in docs/assets/css/docs.css 2012-08-29 11:13:55 -03:00
Mark Otto cb46ddee72 grid docs changes 2012-08-28 13:46:13 -07:00
Mark Otto 17d8c78e52 fix docs horizontal scroll on tablet viewports 2012-08-27 20:32:42 -07:00
Mark Otto 8610fd9b2b remove min-height from .span3 in docs since we no longer need it 2012-08-27 15:12:55 -07:00
Jacob Thornton 9e0d87a4dd fix afffix 2012-08-20 16:43:49 -07:00
Mark Otto 6cf3752b9b fix ie7 dropdowns examples in docs 2012-08-20 12:16:15 -07:00
Mark Otto e59642838f remove relative and top positioning from docs sidenav at narrow layout 2012-08-20 11:28:30 -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 47cf3cc62f copy edits to base css page 2012-08-19 12:07:23 -07:00
Mark Otto bb85bbc657 compy edits to docs 2012-08-19 12:04:41 -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 b14d946afb add animation to docs download btn for firefox 2012-08-14 15:12:22 -07:00
Mark Otto 03eee23952 speed up animation and brightness on docs download 2012-08-07 23:02:01 -07:00
Mark Otto 33c6ab9b20 decrease docs nav padding 2012-08-01 23:21:06 -07:00
Mark Otto 86a577d76b decrease box-shadow 2012-08-01 20:34:19 -07:00
Mark Otto 3c742fc08b add test for textarea at .span12, really fix docs footer 2012-08-01 19:25:50 -07:00
Mark Otto 72323051c3 increase padding on navbar responsive nav links, fix footer margins 2012-08-01 19:18:42 -07:00
Mark Otto c2e899f2a0 remove the canvas slider doodad 2012-08-01 19:00:25 -07:00
Mark Otto e8fd7e6c96 fix jank button on docs homepage 2012-08-01 16:15:21 -07:00
Mark Otto 5637c6fb70 pulsing download button on homepage 2012-08-01 11:52:48 -07:00
Mark Otto e191964ff8 reorder docs css 2012-07-31 00:01:04 -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 84a9c74efd fix footer in responsive 2012-07-29 23:51:18 -07:00
Mark Otto a30045daef reverse navbar styles to save code 2012-07-29 00:30:15 -07:00
Mark Otto 1e9b450619 add image styles, for now to scaffolding (soon to own file) 2012-07-27 00:06:43 -07:00
Mark Otto 6474190746 increase height of homepage jumbotron, update vars and styles of popovers 2012-07-26 23:42:36 -07:00
Mark Otto f75277e62d indenting and such 2012-07-26 21:45:19 -07:00
Mark Otto 880bdbc4dd simplify styles for bs docs nav 2012-07-24 16:07:25 -07:00
Mark Otto 7590e65f6f fix search form, mostly in navbar 2012-07-24 01:44:12 -07:00
Jacob Thornton 5b2f2ed821 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 
Conflicts:
	docs/assets/css/docs.css
	docs/javascript.html
	docs/templates/pages/javascript.mustache
 2012-07-24 00:24:25 -07:00
Jacob Thornton 4ea7c47235 slightly fix side bar 2012-07-24 00:21:40 -07:00
Mark Otto 6245886b26 tweak docs shadows 2012-07-23 23:54:26 -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
Mark Otto ee750bbce1 tweak docs masthead links hover 2012-07-20 21:38:28 -07:00
Mark Otto 6c23fff4d6 misc docs content changes 2012-07-18 01:06:52 -07:00
Mark Otto aac3736eea fixes #3845: add .btn-link for transparent buttons styled as links 2012-07-17 23:32:52 -07:00
Mark Otto 62f6368344 center masthead bg pattern 2012-07-17 20:22:55 -07:00
Mark Otto 4008d666a5 new pattern for masthead 2012-07-17 19:54:29 -07:00
Mark Otto e20d2dfe9d docs cleanup and blockquote cleanup for .pull-right option 2012-07-15 16:13:25 -07:00