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

10806 Commits

Author SHA1 Message Date
Mark Otto
d0cffbb680 grunt dist 2014-12-04 01:03:54 -08:00
Mark Otto
6fe75ead07 no need for .container's max-width: 100% since we use max-width now on all containers 2014-12-04 01:03:41 -08:00
Mark Otto
248e0e4059 fix heading margins 2014-12-04 01:03:23 -08:00
Mark Otto
95e27d0034 fix nav for grid template 2014-12-04 01:00:15 -08:00
Mark Otto
c7c46acf48 update starter template to use new navbar 2014-12-04 00:59:36 -08:00
Mark Otto
4474630d77 restore px to base font size var 2014-12-04 00:10:24 -08:00
Mark Otto
c213ff820a fix the variables i broke, temporarily disabling line-height-computed 2014-12-04 00:09:37 -08:00
Mark Otto
bad40d5c4a Merge pull request #1 from twbs/scss
Move to Sass
2014-12-03 18:15:37 -08:00
Mark Otto
bafd0b057e fix broken textarea.form-control reported by @thomas-mcdonald 2014-12-03 11:23:53 -08:00
Mark Otto
c80b7e468a bit of cleanup 2014-12-02 14:03:43 -08:00
Mark Otto
27df020852 convert to scss 2014-12-02 14:02:35 -08:00
Mark Otto
6bd84210ff remove broken examples link 2014-12-02 02:04:37 -08:00
Mark Otto
67c9d9e185 add examples description, remove browser bugs description 2014-12-01 16:51:48 -08:00
Mark Otto
8fdac3d3a2 move examples index again, clean up nav 2014-12-01 16:51:31 -08:00
Mark Otto
af30e237c7 rearrange examples 2014-12-01 16:12:15 -08:00
Mark Otto
75943868be update home and side nav to use new navbar structure 2014-12-01 15:41:11 -08:00
Mark Otto
639a211344 add new album example 2014-12-01 15:19:15 -08:00
Mark Otto
9180e15e33 Clean up navbar to remove .navbar-toggle, .navbar-collapse, and .navbar-header as they are no longer used; Add .navbar-toggler to .navbar-inverse 2014-12-01 15:03:09 -08:00
Mark Otto
19d15476d8 nav tweaks 2014-12-01 02:06:30 -08:00
Mark Otto
72d1761256 Merge branch 'master' into v4
Conflicts:
	docs/_includes/js/collapse.html
2014-12-01 01:41:10 -08:00
Mark Otto
a17f23c022 nuke the other incomplete example per @ianw 2014-12-01 01:39:31 -08:00
Mark Otto
7a799af939 fixes and grunt 2014-11-30 21:01:50 -08:00
Mark Otto
4bba2d0e0c fix more broke shit, run grunt 2014-11-30 20:29:47 -08:00
Mark Otto
b648a77ed3 Merge branch 'master' into v4
Conflicts:
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/fonts/glyphicons-halflings-regular.eot
	dist/fonts/glyphicons-halflings-regular.svg
	dist/fonts/glyphicons-halflings-regular.ttf
	dist/fonts/glyphicons-halflings-regular.woff
	docs/_data/glyphicons.yml
	docs/_includes/components/alerts.html
	docs/_includes/components/badges.html
	docs/_includes/components/button-dropdowns.html
	docs/_includes/components/button-groups.html
	docs/_includes/components/dropdowns.html
	docs/_includes/components/glyphicons.html
	docs/_includes/components/input-groups.html
	docs/_includes/components/labels.html
	docs/_includes/components/media.html
	docs/_includes/components/navbar.html
	docs/_includes/components/navs.html
	docs/_includes/components/pagination.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/css/responsive-utilities.html
	docs/_includes/css/sass.html
	docs/_includes/css/tables.html
	docs/_includes/css/type.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/community.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/whats-included.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/overview.html
	docs/_includes/js/tabs.html
	docs/_includes/nav/components.html
	docs/_includes/nav/css.html
	docs/_includes/nav/javascript.html
	docs/_includes/nav/main.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/fonts/glyphicons-halflings-regular.eot
	docs/dist/fonts/glyphicons-halflings-regular.svg
	docs/dist/fonts/glyphicons-halflings-regular.ttf
	docs/dist/fonts/glyphicons-halflings-regular.woff
	docs/examples/carousel/index.html
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/navbar/index.html
	docs/examples/non-responsive/index.html
	docs/examples/non-responsive/non-responsive.css
	docs/examples/sticky-footer-navbar/index.html
	docs/examples/theme/index.html
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	less/_carousel.less
	less/_forms.less
	less/glyphicons.less
2014-11-30 20:17:45 -08:00
Mark Otto
0eb2c922d8 Merge branch 'master' of github.com:twbs/bootstrap 2014-11-30 17:11:24 -08:00
Mark Otto
88ec5152da clarify collapse example with link and button triggers; also mention classes 2014-11-30 17:10:13 -08:00
Mark Otto
ced63b0a02 Merge pull request #15244 from zalog/patch-2
Center .icon-prev and .icon-next in carousel
2014-11-30 14:20:21 -08:00
Mark Otto
20ddded9f8 Merge pull request #15258 from Quy/media-object
Add .media-object in docs
2014-11-30 12:38:01 -08:00
Quy Ton
a6950ce276 Add .media-object in docs 2014-11-30 07:44:14 -08:00
XhmikosR
2a1a3e6806 Example: minor image compression improvements.
[ci skip]
2014-11-30 13:16:27 +02:00
XhmikosR
d5a4db48cc Merge pull request #15183 from twbs/deps
Update devDependencies
2014-11-30 12:51:49 +02:00
XhmikosR
61bbe74df1 Update devDependencies. 2014-11-30 12:51:16 +02:00
XhmikosR
4e2db80cbf Merge pull request #15134 from twbs/docs-gh
Add a target to generate the gh-pages files.
2014-11-30 12:50:24 +02:00
Mark Otto
e6fc081c91 Merge branch 'master' of github.com:twbs/bootstrap 2014-11-30 01:32:03 -08:00
Mark Otto
bcb90ef3a0 Bump Glyphicons to v1.9 2014-11-30 01:31:49 -08:00
Mark Otto
d74fd9af2f Fixes #15096: Fix navbar forms in the non-responsive example 2014-11-30 00:54:43 -08:00
Mark Otto
65f72ff095 Merge pull request #15133 from patrickhlauke/docs-table-fixes
Fixes to scope
2014-11-29 23:17:36 -08:00
Mark Otto
9928144dc4 Fixes #15241: Add simple example to docs for collapse plugin 2014-11-29 23:03:47 -08:00
Mark Otto
23bdfc45eb grunt 2014-11-29 21:40:04 -08:00
Mark Otto
7e27e749d1 Fixes #15140: Restore more missing .media styles from shipping #14801 2014-11-29 21:36:57 -08:00
Mark Otto
149f32d9d3 Alternate fix for #15250 with a more descriptive theme jumbotron 2014-11-29 21:18:05 -08:00
Mark Otto
9c049c99e2 grunt 2014-11-29 20:58:14 -08:00
Mark Otto
7c71b4874b Fixes #15074: Fix the nesting problem with form control size variants 2014-11-29 20:57:04 -08:00
Mark Otto
80d7be1126 grunt 2014-11-29 18:36:21 -08:00
Mark Otto
c2d868cfbe Fixes #15124: Restore .media-object 2014-11-29 18:33:20 -08:00
Mark Otto
c22b8dca14 Fixes #15148: make the dropdown and dropup menus have the same margins 2014-11-29 18:31:09 -08:00
Mark Otto
1de638f830 fixes #15164: wrap disable pagination spans in another span 2014-11-29 18:27:51 -08:00
Mark Otto
c9289691ba fix the run-on 2014-11-29 16:53:37 -08:00
Mark Otto
a35ee9d218 Merge pull request #15238 from peterblazejewicz/docs/dist-update
Add CSS source maps reference to docs. Closes #15211
2014-11-29 16:51:38 -08:00
Mark Otto
b53ad74d47 clean up navbar examples 2014-11-29 15:07:13 -08:00