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

305 Commits

Author SHA1 Message Date
vsn4ik
aed83c4b96 Use https on herokuapp.com 2015-04-25 21:05:49 +03:00
Mark Otto
95a8a06f10 Link slack badge 2015-04-25 00:00:39 -07:00
Mark Otto
71f4abc201 Add slack badge, link to join, and update copy 2015-04-24 13:20:56 -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
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
CC: @mdo
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
Chris Rebert
5d8880fdfa move Grunt info from README into HTML docs
Fixes #13470
2014-05-07 19:38:27 -07:00
Chris Rebert
21feb7c58e README: Authors => Creators 2014-04-23 14:08:25 -07:00
Chris Rebert
b882a63ff7 the master branch is the relevant one for current build status 2014-04-23 14:01:40 -07:00
XhmikosR
9863344e9a README.md: switch to SVG badges. 2014-04-08 18:05:15 +03:00
XhmikosR
00943d0ecb Update Jekyll to 1.5.0.
The 1.4.3 Windows bug is fixed, plus the encoding workaround isn't needed anymore.
2014-03-25 10:03:45 +02:00
Zlatan Vasović
874bb1b9b5 Remove redundant <code> styling
npm shouldn't have `<code>` styling.
2014-03-20 21:54:14 +01:00
Zlatan Vasović
d985e5bf56 Correct the page name
"Getting started" is used in the docs.
2014-03-10 08:31:55 +01:00
Mark Otto
88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08:00
Chris Rebert
f2d45fd2f8 add Bower badge to README 2014-02-01 21:25:19 -08:00
Mark Otto
1409cde7e8 Bump versions, run grunt 2014-01-30 08:30:37 -08:00
Chris Rebert
9ec1e8694b README: use Bootstrap v3-specific StackOverflow tag 2014-01-25 16:38:47 -08:00
Chris Rebert
c658e4e926 fix typo in README 2014-01-21 00:55:56 -08:00
Mark Otto
e5d6ab9b31 link to docs license 2014-01-18 14:50:45 -08:00
Chris Rebert
8dc1d00dd4 add a couple commas 2014-01-15 13:44:23 -08:00
Julian Thilo
00239f6034 Set Jekyll encoding and tweak Windows notes 2014-01-15 22:18:35 +01:00
Zlatan Vasović
8c85e1b5a3 Use absolute instead of relative URLs 2014-01-09 20:33:13 +01:00
Waynn Lue
f116106bf6 missing a period after "Twitter, Inc" 2014-01-09 00:11:01 -08:00
Julian Thilo
7fcfe61f4d Update copyright notices in all places
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
2014-01-07 01:05:24 +01:00
Chris Rebert
aed56fc0a6 New Year 2014-01-05 23:45:15 -08:00
XhmikosR
5cb8510a81 README.md: switch to the shields.io dependency badges theme. 2013-12-26 19:52:39 +02:00
Mark Otto
679c786237 roll back version numbers to avoid broken links in docs and readme (fixes #12000) 2013-12-24 12:16:17 -08:00
Mark Otto
146800ef43 Merge pull request #11979 from ZDroid/fix-old-links
Fix old links
2013-12-22 17:30:35 -08:00
Zlatan Vasović
28adcbe439 Fix old links
Replace recess with less.
2013-12-22 16:26:05 +01:00
Mark Otto
5f9695ae7c readme typo from #11965 2013-12-21 09:36:51 -08:00
tomByrer
c84688fc4f https://github.com/twbs/bootstrap/pull/11950#issuecomment-31033824 2013-12-21 09:39:34 -07:00
Mark Otto
81b1e6801f correct jsbin link 2013-12-19 19:28:22 -08:00
Chris Rebert
07da1d731a mention core team maintenance & community contributors 2013-12-18 18:54:07 -08:00
Mark Otto
629a4743f0 remove license readme mention 2013-12-18 15:08:38 -08:00
Mark Otto
e8e60ae4bc version bump 2013-12-18 14:56:08 -08:00
Mark Otto
cb40a2ee8c Punt Apache license information and stick with MIT 2013-12-18 14:54:24 -08:00
Mark Otto
56c36346c1 drop the the, it's cleaner 2013-12-18 14:38:10 -08:00
Mark Otto
79e97fef40 derp 2013-12-18 14:37:30 -08:00
Mark Otto
0a955844ab rewrite readme to restore lost information, only with a bit more formatting consistency 2013-12-18 14:24:59 -08:00
Julian Thilo
2b312bf3c1 Revert commits
Bootstrap is being relicensed from Apache 2.0 to MIT so that more of our community can use the free and open source software we lovely create together. As commits are copyright their original authors, the commits of any individual not agreeing to relicense their contributions are being removed to be later rewritten by the @twbs/team.

This undoes the changes introduced by the following commits:
7ea34ae0ef , 7376eef378 , 303ba1326b , 7d1c8c2a0c , 11319f6da9 , 110fc88601 , ced08f6935
2013-12-18 22:58:13 +01:00
XhmikosR
6355832e90 Clarify Windows workarounds. 2013-12-11 12:57:18 +02:00
Mark Otto
2bc08190ec Combine updates to Windows Jekyll stuff 2013-12-10 19:43:52 -08:00
Mark Otto
f32ef36daf Merge pull request #11830 from XhmikosR/jekyll-windows
Update Jekyll on Windows info
2013-12-10 19:40:51 -08:00
Julian Thilo
1d56211653 Help Windows users install Jekyll 2013-12-11 00:13:02 +01:00
XhmikosR
b9f12a5637 README.md: mention an alternative workaround for the jekyll issue on Windows. 2013-12-11 00:06:25 +02:00
XhmikosR
fc3e7433c2 Update README.md.
Mention that Python needs to be in PATH for Pygments to work and thus jekyll not fail.
2013-12-11 00:06:25 +02:00
Mark Otto
73da46c8bb Fixes #11760: Remove mailing list links from readme and about pages
Links are dead now since Google blacklisted the group for massive spam,
which they could be of no help in resolving. We’ll have a new official
forum for discussions soon folks <3.
2013-12-07 11:22:38 -08:00
Chris Rebert
bd9332a58a switch to Sauce Labs for our cross-browser JS unit testing needs
Fixes #11087
2013-12-03 21:57:22 -08:00
Mark Otto
8a74264344 bump version numbers to 3.0.3 2013-12-01 19:31:52 -08:00
Mark Otto
98acdaeb00 bump links to 3.0.2; change readme download to release URL format 2013-11-06 13:09:35 -08:00
Bogdan
bb54ce0db6 Update README.md
Row 13 link update to tag v3.0.1
2013-11-01 19:30:27 +01:00
Zlatan Vasović
8a9e1af18d Continue tag way implementation 2013-10-20 18:50:14 +02:00
Zlatan Vasović
d2ad1dc88f (Not HTML) tag way is much better 2013-10-18 21:34:18 +02:00