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
Mark Otto
c901287394
remove more mentions of theme
2014-11-29 15:01:44 -08:00
Mark Otto
55148d32cb
no more theme
2014-11-29 15:00:45 -08:00
Mark Otto
0988cfbf20
bump docs version
2014-11-29 15:00:04 -08:00
Mark Otto
01fa32e879
Merge pull request #15167 from vsn4ik/rem_blob_master_from_links
...
Remove redundant .../blob/master/ prefix in markdown.
2014-11-29 14:25:12 -08:00
Chris Rebert
b38e284e18
Merge pull request #15249 from dandv/patch-1
...
Fix copy/paste error
2014-11-28 12:54:21 -06:00
Dan Dascalescu
2c64fc2c4d
Fix copy/paste error
2014-11-28 04:30:04 -08:00
Peter Blazejewicz
c1885ef58b
Add CSS source maps reference to docs. Closes #15211
...
- update distribution file list with relevant files
- add a short reference to CSS source map purpose
- add link to Google Chrome developer network article
2014-11-27 22:03:32 +01:00
Catalin Zalog
8770f55f1e
Center .icon-prev and .icon-next
...
Center .icon-prev and .icon-next the same way .glyphicon icon are.
And this is the html markup:
<a class="left carousel-control" href="#carousel-main-menu" role="button" data-slide="prev">
<span class="icon-prev" aria-hidden="true"></span>
</a>
2014-11-27 13:06:42 +02:00
Mark Otto
12be9044f4
fix a bunch of padding and alignment things for forms
2014-11-25 18:00:52 -08:00
Mark Otto
15d98dc6b7
disable shadows on buttons for now
2014-11-25 17:47:32 -08:00
Mark Otto
6a810551d0
hide sections of homepage and quick start
2014-11-25 17:40:08 -08:00
Mark Otto
7ca73b7542
fix margin on .bs-example thumbs
2014-11-25 17:10:47 -08:00
Mark Otto
2ef6e02c01
alphabetize the ordering
2014-11-25 17:09:23 -08:00
Chris Rebert
d763e0e2a0
Merge pull request #15215 from twbs/input-date-chrome
...
Remove #12548 's entry from the Wall of Browser Bugs
[skip sauce]
2014-11-25 11:12:43 -08:00
Chris Rebert
c97d4d648f
Remove #12548 's entry from the Wall of Browser Bugs
...
Since https://crbug.com/346051 has been closed as WontFix.
Bug is now documented in MDN:
https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input$compare?locale=en-US&to=698785&from=693137
Refs #12548
[skip sauce]
2014-11-24 18:38:01 -08:00
Chris Rebert
44447eeefe
Give all embedded live docs examples data-example-id attrs
...
Refs #11410
2014-11-24 17:09:32 -08:00
Julian Thilo
c022d88ac5
Merge pull request #15108 from zacechola/irc_room
...
corrects IRC room
2014-11-24 15:46:14 +01:00
XhmikosR
7ea49019b8
Run grunt.
2014-11-24 09:53:42 +02:00
Julian Thilo
33c4a2f1d7
Merge pull request #15198 from twbs/fix-15194
...
Fix #15194 : Shrink media link area
2014-11-24 01:46:59 +01:00
Chris Rebert
ede9cf0037
Merge pull request #15200 from twbs/mdn
...
add documenting in MDN as a step in browser bug handling process
2014-11-23 16:28:06 -08:00
vsn4ik
992644ee34
Update links (.../blob/master prefix) in markdown.
2014-11-23 14:50:09 +03:00
Chris Rebert
8a4757dfb0
add documenting in MDN as a step in browser bug handling process
...
[skip sauce]
[skip validator]
2014-11-22 18:33:08 -08:00
