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
74ae498800
Fix #16117 more permanently/generically
2015-03-21 15:33:13 -07:00
vsn4ik
a07bc07889
Increment quick start options to six
...
[skip validator]
[skip sauce]
2015-03-21 08:21:39 +03:00
Rodrigo Prado
fbe0836a8f
Add docs on how to install Bootstrap via composer
...
Closes #16113
Closes #16114
[skip sauce]
2015-03-20 18:42:03 -07:00
Chris Rebert
4d652035dc
v3.3.2 => v3.3.4
2015-03-16 08:39:31 -07:00
Jan-Paul Kleemans
ad5c64a24f
Increment quick start options to five
2015-03-10 18:57:02 +01:00
Chris Rebert
64ca888cbc
Merge pull request #15999 from twbs/kkirsche-includeTestsReadme
...
Document JS test suite basics
2015-03-06 23:28:30 -08:00
Kevin Kirsche
ba2f7e92d0
[ Fixes #15951 ] Document JS test suite basics
...
X-Ref: #15953
Closes #15952 by merging a tweaked version of it.
[skip sauce]
[skip validator]
2015-03-06 23:27:00 -08:00
Kevin Kirsche
673cd67798
Fix URL to match the keyword
...
Fix URL to match the keyword
2015-03-01 16:44:13 -05:00
Mark Otto
c16fee5efd
Merge branch 'master' into v4
...
Conflicts:
.travis.yml
Gruntfile.js
bower.json
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.js
dist/js/bootstrap.min.js
docs/_data/glyphicons.yml
docs/_includes/components/breadcrumbs.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/labels.html
docs/_includes/components/list-group.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/components/panels.html
docs/_includes/components/progress-bars.html
docs/_includes/components/thumbnails.html
docs/_includes/components/wells.html
docs/_includes/css/buttons.html
docs/_includes/css/forms.html
docs/_includes/css/helpers.html
docs/_includes/css/images.html
docs/_includes/css/less.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/examples.html
docs/_includes/getting-started/grunt.html
docs/_includes/getting-started/license.html
docs/_includes/getting-started/template.html
docs/_includes/header.html
docs/_includes/js/affix.html
docs/_includes/js/alerts.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/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/_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/assets/js/vendor/FileSaver.js
docs/assets/js/vendor/autoprefixer.js
docs/assets/js/vendor/uglify.min.js
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/js/bootstrap.min.js
docs/examples/blog/index.html
docs/examples/carousel/index.html
docs/examples/cover/index.html
docs/examples/dashboard/index.html
docs/examples/narrow-jumbotron/narrow-jumbotron.css
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/non-responsive/index.html
docs/examples/non-responsive/non-responsive.css
docs/examples/theme/index.html
grunt/configBridge.json
js/affix.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/tooltip.js
less/badges.less
less/glyphicons.less
less/type.less
less/variables.less
package.json
scss/_dropdown.scss
scss/_forms.scss
test-infra/npm-shrinkwrap.json
2015-03-01 13:44:10 -08:00
Chris Rebert
a415b91558
Merge pull request #15828 from kkirsche/patch-20
...
Add plugin package keyword recommendation
2015-02-24 16:26:39 -08:00
Chris Rebert
9e0f94b632
Add Ruby Gem badge to README
2015-02-24 14:41:26 -08:00
Kevin Kirsche
114d1cf76c
Add plugin package keyword recommendation
...
Related to #15823 , I would be interested in officially recommending a keyword such as `twbs-bootstrap` so that we can more easily showcase plugins and extensions for Bootstrap without requiring additional curation by the admins / collabs of TWBS
specificity
Add additional comment to docs
Fix capitalization
Update tag per @mdo's recommendation
2015-02-23 13:53:01 -05:00
Luca Mussi
90e7fc418b
Added package.js for Meteor integration
...
Closes #15716 by merging it.
2015-02-19 13:11:58 -08:00
vsn4ik
1bb3ef3e0b
Use https://www.npmjs.com (new site).
2015-02-17 10:01:58 +03:00
Chris Rebert
e7de01eeed
Update Twitter handle: @twbootstrap => @getbootstrap
...
Refs 1c94b7791f
2015-02-06 11:54:07 -08:00
Mark Otto
6ebf68296a
Merge pull request #61 from twbs/clear-out-fonts
...
remove unused font files
2015-01-20 15:40:37 -08:00
Mark Otto
260378411d
Update README.md
2015-01-20 15:40:32 -08:00
Mark Otto
c683e7dea7
bump versions
2015-01-19 08:32:13 -08:00
Chris Rebert
8ce8cd992e
remove more Glyphicon references from the docs
2015-01-09 12:33:34 -08:00
Zlatan Vasović
576230b92a
Happy New Year 🎅
2015-01-01 01:23:48 +01:00
Heinrich Fenkart
c3e6111eef
Switch to shields.io for badges in README
...
Closes #15380
[ci skip]
2014-12-30 11:48:08 -08:00
Bastien
9e5697a14f
Add woff2 font in readme.md
2014-12-15 10:00:19 +01:00
vsn4ik
215fc93096
Update source maps info in README.md.
2014-12-05 20:00:19 +03: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
vsn4ik
992644ee34
Update links (.../blob/master prefix) in markdown.
2014-11-23 14:50:09 +03:00
vsn4ik
e2520b8bd9
Use npm instead NPM and update twbs team link.
2014-11-18 18:46:28 +03:00
Mark Otto
9a7e365c2c
bump version to v3.3.1
2014-11-12 09:03:16 -08:00
XhmikosR
1764c6e509
Bump Jekyll to v2.5.1.
2014-11-10 08:06:45 +02:00
XhmikosR
7d8bacb817
Merge pull request #14746 from twbs/gems-bump
...
Update Jekyll to v2.4.0 and rouge to v1.7.2.
2014-11-01 10:02:16 +02:00
Mark Otto
94b59b57d6
version bump
2014-10-29 08:56:20 -07:00
XhmikosR
c6d1aa76fc
Update Jekyll to v2.4.0 and rouge to v1.7.2.
2014-10-23 09:17:54 +03:00
vsn4ik
ca7c75d978
README.md: Add npm install info.
2014-09-13 12:50:36 +04:00
XhmikosR
ac132da789
Update Ruby dependencies.
2014-08-26 13:54:22 +03:00
Siecje
22edcc8d50
Updating IRC channel
2014-08-25 12:14:11 -04:00
Julian Thilo
1517bea4e2
Update link to Run Jekyll on Windows guide
2014-08-25 02:18:58 +02:00
vsn4ik
b6fe7c43e3
README.md: Аmendment links to use HTTPS.
2014-08-14 14:26:47 +04:00
Julian Thilo
7f359666c4
Fix that @mdo nightlife <3
2014-07-08 13:33:21 +02:00
Mark Otto
bb939f0004
Switch to Rogue over Pygments for speeeeeed
2014-07-07 18:20:18 -07:00
XhmikosR
1098453f83
Update to Jekyll 2.1.x.
2014-06-29 08:39:40 +03:00
Mark Otto
ff6b279b3c
bump to v3.2.0
2014-06-26 09:13:24 -07:00
Mark Otto
0e5ec1ab7a
Merge pull request #13574 from twbs/reinstate-13470
...
Delete redundant Grunt info in README (Merge before shipping)
2014-06-26 00:06:02 -07:00
vsn4ik
c503f7b66f
README.md: Refactoring bages.
2014-06-15 16:26:32 +04:00
XhmikosR
ff9ab6ce21
Update docs for Jekyll 2.x.
2014-06-10 08:14:09 +03:00
Chris Rebert
a6fac741ea
README: move badges to separate line
...
much badge, so wow
2014-06-09 17:05:01 -07:00
Chris Rebert
8b3d27e01c
Add npm version badge to README
...
Follow-up to #12857
[skip sauce] [skip validator]
2014-06-09 17:01:55 -07:00
Chris Rebert
47a0de9b93
replace SemVer summary with a link to its website; fixes #13650
...
[skip validator] [skip sauce]
2014-06-05 12:06:09 -07:00
Rustin Wollin
22cdf4ae94
Changed broken #authors anchor to #creators
2014-06-02 15:43:57 -04:00
Chris Rebert
ae80cdca24
Revert "Temporarily revert README deletions from #13470,"
...
This reverts commit 54284a13c6
2014-05-12 12:58:47 -07:00
Chris Rebert
54284a13c6
Temporarily revert README deletions from #13470 ,
...
pending the release of v3.2.0's updated hosted docs.
Fixes #13572 .
2014-05-12 12:54:10 -07:00
