Mark Otto
|
169d2a4a78
|
Merge branch 'master' into v4
|
2015-06-18 23:56:43 -07:00 |
|
Mark Otto
|
83bfff7f07
|
bump version
|
2015-06-16 09:10:22 -07:00 |
|
Mark Otto
|
58082cd83e
|
Merge branch 'master' into v4
Conflicts:
.gitignore
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/js/bootstrap.js
dist/js/bootstrap.min.js
docs/_includes/components/navbar.html
docs/_includes/components/progress-bars.html
docs/_includes/css/grid.html
docs/_includes/css/overview.html
docs/_includes/customizer-variables.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/disabling-responsiveness.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/examples.html
docs/_includes/getting-started/license.html
docs/_includes/getting-started/third-party-support.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/popovers.html
docs/_includes/js/scrollspy.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/js/transitions.html
docs/_includes/nav/javascript.html
docs/_includes/nav/main.html
docs/about.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/assets/js/src/customizer.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/js/bootstrap.js
docs/dist/js/bootstrap.min.js
docs/migration.html
js/affix.js
js/alert.js
js/button.js
js/carousel.js
js/collapse.js
js/dropdown.js
js/modal.js
js/popover.js
js/scrollspy.js
js/tab.js
js/tests/unit/affix.js
js/tests/unit/button.js
js/tests/unit/carousel.js
js/tests/unit/modal.js
js/tests/unit/tooltip.js
js/tests/visual/modal.html
js/tooltip.js
less/component-animations.less
less/jumbotron.less
less/mixins/background-variant.less
less/mixins/buttons.less
less/mixins/responsive-visibility.less
less/mixins/text-emphasis.less
less/navbar.less
less/navs.less
less/scaffolding.less
less/tooltip.less
less/utilities.less
less/variables.less
package.json
scss/_buttons.scss
scss/_forms.scss
scss/_modal.scss
|
2015-03-29 00:08:54 -07:00 |
|
Chris Rebert
|
312e527cb0
|
BootstrapCDN: v3.3.2 => v3.3.4
|
2015-03-16 08:41:00 -07:00 |
|
Chris Rebert
|
8dbdb8f977
|
Sass: v3.3.3 => v3.3.4
|
2015-03-16 08:40:34 -07:00 |
|
Chris Rebert
|
4d652035dc
|
v3.3.2 => v3.3.4
|
2015-03-16 08:39:31 -07:00 |
|
Chris Rebert
|
d74608b934
|
Bump bootstrap-sass download link to Sass-specific v3.3.3
bootstrap-sass v3.3.2 is broken.
Refs https://github.com/twbs/bootstrap-sass/issues/862
Refs https://github.com/twbs/bootstrap-sass/releases/tag/v3.3.3
Refs daeb43dcc7
|
2015-03-15 05:07:48 -07:00 |
|
Mark Otto
|
325748ff68
|
Merge branch 'master' into v4
Conflicts:
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.min.js
docs/_includes/components/thumbnails.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/customizer-variables.html
docs/_includes/footer.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/template.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/assets/css/docs.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/assets/js/src/customizer.js
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
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/js/bootstrap.js
docs/dist/js/bootstrap.min.js
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/non-responsive/index.html
docs/examples/theme/index.html
grunt/configBridge.json
less/alerts.less
less/badges.less
less/jumbotron.less
less/panels.less
less/tables.less
less/theme.less
less/variables.less
package.json
scss/_button-group.scss
scss/_buttons.scss
scss/_forms.scss
|
2015-01-19 14:48:12 -08:00 |
|
Mark Otto
|
c683e7dea7
|
bump versions
|
2015-01-19 08:32:13 -08:00 |
|
Mark Otto
|
438b8aa97f
|
don't ignore the assets/js/src/ because then it doesn't make it to the generated site
|
2014-12-19 00:36:16 -08:00 |
|
Mark Otto
|
d1a766494e
|
fix paths and baseurl action
|
2014-12-19 00:24:09 -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
|
0988cfbf20
|
bump docs version
|
2014-11-29 15:00:04 -08:00 |
|
Mark Otto
|
9a7e365c2c
|
bump version to v3.3.1
|
2014-11-12 09:03:16 -08:00 |
|
Mark Otto
|
8611ed4dbd
|
baseurl
|
2014-11-09 23:54:13 -08:00 |
|
Mark Otto
|
86af1f39ab
|
Merge branch 'master' into derp
Conflicts:
Gruntfile.js
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/button-groups.html
docs/_includes/components/jumbotron.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/customizer-variables.html
docs/_includes/footer.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/js/carousel.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/_includes/nav/getting-started.html
docs/_includes/nav/javascript.html
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
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/examples/justified-nav/index.html
less/_forms.less
less/_tooltip.less
less/navs.less
less/theme.less
|
2014-11-09 22:02:53 -08:00 |
|
Chris Rebert
|
505171ef5d
|
Revert "Use jsDelivr CDN until BootstrapCDN gets updated"
This reverts commit ea23969150.
BootstrapCDN has now uploaded Bootstrap v3.3.0
|
2014-10-30 17:38:40 -07:00 |
|
Heinrich Fenkart
|
ea23969150
|
Use jsDelivr CDN until BootstrapCDN gets updated
|
2014-10-30 07:20:41 +01:00 |
|
Mark Otto
|
94b59b57d6
|
version bump
|
2014-10-29 08:56:20 -07:00 |
|
XhmikosR
|
3908235e0f
|
Remove baseurl as it doesn't serve any real purpose.
|
2014-10-27 19:35:59 +02:00 |
|
Mark Otto
|
dc7f92a0d4
|
ignore some files from jekyll compilation
|
2014-09-17 20:11:07 -07:00 |
|
Mark Otto
|
089d434895
|
Merge branch 'master' into derp
Conflicts:
_config.yml
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/glyphicons.html
docs/_includes/css/forms.html
docs/_includes/css/tables.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/header.html
docs/_includes/js/affix.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/dropdowns.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/_includes/nav/javascript.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/examples/blog/index.html
docs/examples/carousel/index.html
docs/examples/cover/index.html
docs/examples/dashboard/index.html
docs/examples/grid/index.html
docs/examples/jumbotron-narrow/index.html
docs/examples/jumbotron/index.html
docs/examples/justified-nav/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/offcanvas/index.html
docs/examples/signin/index.html
docs/examples/starter-template/index.html
docs/examples/sticky-footer-navbar/index.html
docs/examples/sticky-footer/index.html
docs/examples/theme/index.html
docs/examples/tooltip-viewport/index.html
less/code.less
less/panels.less
less/variables.less
|
2014-08-02 18:30:59 -07:00 |
|
Chris Rebert
|
0fe4fe328c
|
Use HTTPS in CDN URLs in _config.yml
For consistency with the rest of the docs and per our code guidelines.
|
2014-07-18 14:26:14 -07:00 |
|
Mark Otto
|
20349df3e7
|
markdownify browser bugs, add config vars for shorthand urls
|
2014-07-13 01:43:26 -07:00 |
|
Mark Otto
|
4993ab6e00
|
start markdowning getting started and moving things to separate pages
|
2014-07-10 17:54:06 -07:00 |
|
Mark Otto
|
57c709becd
|
jquery links
|
2014-07-10 10:23:15 -07:00 |
|
Mark Otto
|
bb939f0004
|
Switch to Rogue over Pygments for speeeeeed
|
2014-07-07 18:20:18 -07:00 |
|
Mark Otto
|
c068162161
|
maxcdn urls
|
2014-06-26 09:36:48 -07:00 |
|
Mark Otto
|
ff6b279b3c
|
bump to v3.2.0
|
2014-06-26 09:13:24 -07:00 |
|
Mark Otto
|
c7783f5ad8
|
Fixes #13587: Switch to Kramdown for Markdown compiler in Jekyll
|
2014-06-09 22:24:51 -07:00 |
|
XhmikosR
|
d0fca8aaad
|
Remove RTL leftovers.
|
2014-05-13 09:26:24 +03:00 |
|
Mark Otto
|
f5513fd30e
|
nuke rtl
|
2014-05-12 19:47:53 -07:00 |
|
Chris Rebert
|
d6104b1151
|
include RTL CSS CDN URL in Download docs
|
2014-05-04 02:09:34 -07:00 |
|
Zlatan Vasović
|
8ae48183b2
|
Fix #13138: use underscore prefix to ignore directories
|
2014-03-24 21:47:59 +01:00 |
|
Zlatan Vasović
|
dd9946e919
|
Remove redundant _config.yml quotes
|
2014-03-08 23:03:28 +01:00 |
|
Zlatan Vasović
|
3bdaa831e9
|
Remove ./ from _config.yml paths
|
2014-03-07 23:11:59 +01:00 |
|
Zlatan Vasović
|
d08bbdc6ec
|
Reorganize docs assets
|
2014-03-07 17:37:23 +01:00 |
|
XhmikosR
|
17722e5ef2
|
Add sitemap.xml and robots.txt files.
|
2014-02-27 17:05:52 +02:00 |
|
Mark Otto
|
88fdd45427
|
v3.1.1 bump
|
2014-02-13 01:12:26 -08:00 |
|
Zlatan Vasović
|
938779ca93
|
Move jade files to docs/jade/
|
2014-02-08 22:29:06 +01:00 |
|
Julian Thilo
|
a9567a9e0c
|
Apply eaa2b83 to master as well
|
2014-01-30 21:16:48 +01:00 |
|
Mark Otto
|
1409cde7e8
|
Bump versions, run grunt
|
2014-01-30 08:30:37 -08:00 |
|
XhmikosR
|
4bca3c79b3
|
Move docs third-party libraries to a separate folder.
|
2014-01-18 08:15:21 +02:00 |
|
Chris Rebert
|
208df78971
|
Merge pull request #12241 from twbs/jekyll-encoding
Set Jekyll encoding and tweak Windows notes
|
2014-01-15 13:43:12 -08:00 |
|
Julian Thilo
|
00239f6034
|
Set Jekyll encoding and tweak Windows notes
|
2014-01-15 22:18:35 +01:00 |
|
Mark Otto
|
ed5c7baaf1
|
Merge branch 'master' into docs_derp
|
2014-01-05 17:49:40 -08:00 |
|
Zlatan Vasović
|
f63cd94e43
|
Reorganize vars
|
2014-01-05 11:51:49 +01:00 |
|
Mark Otto
|
b253cb2c1e
|
Merge branch 'master' into docs_derp
Conflicts:
_config.yml
docs/_includes/footer.html
docs/_includes/nav-main.html
docs/_includes/old-bs-docs.html
docs/_layouts/default.html
docs/_layouts/home.html
docs/getting-started.html
docs/index.html
|
2013-12-31 13:53:33 -08:00 |
|
Mark Otto
|
a9c829bc0c
|
Rearrange repository contents because muahahahahahaha
|
2013-12-28 22:47:03 -08:00 |
|
Mark Otto
|
5b02dbd97a
|
Merge branch 'master' into docs_derp
Conflicts:
_config.yml
|
2013-12-26 21:40:15 -08:00 |
|