Skip to content

Commit

Permalink
Squashed 'subtrees/bootstrap/' changes from 68c6dee..4120aad
Browse files Browse the repository at this point in the history
4120aad Merge pull request #12306 from twbs/raw-files.min.js
336f5f1 rename raw-files.js to raw-files.min.js
06a7bdd grunt build-raw-files dist
adda5d5 Merge pull request #12304 from Quy/master
0d153fa Replace page.base_url with relative url
0349fe0 Merge pull request #12295 from ZDroid/types
937e067 grunt build-customizer-vars-form
04cfca2 s3_cache.py: fix name in USAGE message
956064e Improve grunt config and vars
a77fba3 Merge pull request #12302 from Quy/master
3e9ba3f More "LESS" to "Less" changes
2a75e55 Merge pull request #12297 from Quy/master
f2d37cc Additional changes to #12275 and #12292
0dc26b2 Make head elements order uniform across templates and examples
4f1852d Merge pull request #12292 from ZDroid/meta
cf8f1ec Improve <meta> tags
7e145a1 Merge pull request #12288 from twbs/x-ua-compat
60298dd add X-UA-Compatible <meta> to basic template
b67cba2 make WP8 device-width hack code fully consistent between docs HTML & docs JS
2077246 grammar: fix plural possessive
0be0090 fix anomalous indentation
3a1aa33 Dustin' the docs: Typos, Grammar, etc. in css.html
a73dacf Added WAI-ARIA roles to examples/theme/index.html (document, main)
2179f9d Merge pull request #12287 from Quy/master
9e8afcc Add table's .info variant to migration guide
e5d6ab9 link to docs license
b790ea9 Merge pull request #12219 from ZDroid/rn
032869a Merge pull request #12248 from twbs/bg-variant
10a158f Fix typos, sentences in getting-started.html
2115ac5 Run grunt dist after adding 'a' requirement to the text emphasis classes
3b6ab50 Merge branch 'master' into bg-variant
572e6a9 Merge pull request #12286 from watilde/fixes-panel
b32d92e Merge pull request #12249 from twbs/modal-md
9c9a2f3 Merge pull request #12247 from twbs/text-emphasis-variant
cfe38a4 Merge branch 'master' into modal-md
cd1bea0 Merge branch 'master' into bg-variant
689e75e Merge branch 'master' into text-emphasis-variant
b1721f4 Merge branch 'master' of github.com:twbs/bootstrap
c322612 move migration docs to new separate page, leave callout on getting started page; fixes #12244
67594cb Fix holder.js links in examples
6856c9f remove border radius when it's not both ends in panel
a521e98 Merge pull request #12281 from XhmikosR/vendor
7b42103 kill bottom margin on last docs section
a56cf75 Make spelling of Less uniform throughout the docs
092b1a4 Fix typo in index.html
4bca3c7 Move docs third-party libraries to a separate folder.
dcdf716 copy
172de46 present browser compatibility info in a table
d8c87dd fix #12277
084f0fb add namespace `.bs` also to the event `dismiss.modal`
d6e8006 Merge pull request #12276 from twbs/grunt-contrib-qunit
58c4a8c bump grunt-contrib-qunit to v0.4.0
ffdc18c fix #12274
c5bed1a Merge pull request #12275 from ZDroid/ncss
93ab926 Replace Normalize with Normalize.css
af5cebf Merge pull request #12271 from tlindig/modal_remove_needless_space
7fab3c3 remove needless space character
6af0013 Revert "Add tooltip `viewport` option, respect bounds of the viewport"
faa783e Merge pull request #12267 from twbs/ie-10
03f4534 Merge branch 'bo-tooltip-viewport' of https://github.com/benogle/bootstrap into benogle-bo-tooltip-viewport
8eef0a4 Merge branch 'master' of github.com:twbs/bootstrap
380019c Split box-sizing reset for faster rendering
ee396ae enable IE10 for Sauce tests
bd8ef99 temporarily disable OS X Chrome Sauce test since it's being flaky
600f62d Merge pull request #12265 from twbs/ie-11
ecf8148 Merge pull request #12264 from twbs/mavericks-safari-7
4a50ac0 enable IE11 in Sauce tests
60fb8b7 Merge pull request #12262 from twbs/osx-firefox
d07e8fe grunt
ded7008 upgrade to Safari 7 in Sauce tests
1ca0f8d re-enable OS X Firefox in Sauce tests
4bd6a52 add missing paren
82ff4e2 tooltip subpixel test fixes
3b2418e remove flaky pos bottom test which is effect by unit scroll pos
2f76821 new qunit
bc074d5 Merge pull request #12260 from patricker/patch-1
47f786e Update javascript.html
190ae7b Merge pull request #12258 from ibash/master
ad64b0a Fixing js error in IE9 where no transition is supported
81610c6 Merge pull request #12252 from browserstack/browserstack-runner
2bdf99f add debug for browserstack-runner
a8e14bf update browserstack-runner package
96a9e1b Merge pull request #12245 from twbs/footer-links
b2e88d1 add & use @modal-md Less var for uniformity
b121207 refactoring: add & use .bg-variant() mixin
b886fd2 refactoring: add & use .text-emphasis-variant() mixin
47ff604 add Issues & Releases links back to footer
0ef8d1b reassert #12231 & #12232 (merge went badly?)
78e81a1 Merge branch 'master' of github.com:twbs/bootstrap
7e7264e fix ad placement
95f24dc Fix customizer's toggle buttons' margin
5ac8dca Adapt about.html lead to latest changes
fa052c9 Fix footer links
47bbc30 increase Sauce concurrency
fcb78bc Merge pull request #12243 from twbs/cleanup-about
53bcb82 move Community & Translations docs sections from About to Getting Started
9bd5979 Merge pull request #12242 from twbs/sass-contributing
4c9433d Adhere to MailChimp's brand guidelines ;)
bb964b1 Remove popovers from components.html lead
a624981 add link to Sass CONTRIBUTING file in the About page
9039a5e remove inaccurate comment
0335b8d Merge branch 'master' of github.com:twbs/bootstrap
6986bdb Fix page headers
91c6419 Getting Started: fix ID of heading so matches TOC
8dc1d00 add a couple commas
208df78 Merge pull request #12241 from twbs/jekyll-encoding
14975e4 indentation and page header changes
00239f6 Set Jekyll encoding and tweak Windows notes
a633fc0 Merge branch 'master' into docs_derp
1facbf6 Merge pull request #12232 from twbs/mixing-docs
96031c1 Merge pull request #12231 from twbs/callouts
b93ce03 Merge branch 'master' of github.com:twbs/bootstrap
413c8a6 Fixes #12210: badges in xs buttons
9ebd8d3 clarify docs regarding non-mixable components
488443c downgrade .img-responsive cross-reference callout from warning to info
76e226b upgrade form-group + input-group callout from info to warning
811639c downgrade <label>-related callouts from danger to warning
2ba15c3 upgrade tooltip/popover-in-groups callout from info to warning
5ead87d revert unnecessary customizations of Blob.js & FileSaver.js
e2a1843 Merge pull request #12213 from twbs/browserstack
c1a81f7 Merge pull request #12229 from twbs/richer-results
b260d93 more detailed QUnit test results in Sauce
edb221a Add tooltip `viewport` option, respect bounds of the viewport
cae6320 Merge branch 'master' into docs_derp
edd0b97 Don't copy-pasta all the Sass docs because fuck keeping that up to date. Instead, point to https://github.com/twbs/bootstrap-sass/blob/master/README.md.
8fb75ee add missing semicolon
3a97697 tests: run BrowserStack in parallel with Sauce Labs
2a6b6f8 Merge pull request #12224 from twbs/raw-files-banner
46b0874 add copyright notice to raw-files.js
027af6d Merge pull request #12220 from ZDroid/link
c11f78d Link the blog post instead of main blog page
d1fd917 Merge pull request #12218 from ZDroid/docs.js
4f58356 Rename docs/LICENSE-DOCS to docs/LICENSE
c335104 Rename uglify.js to uglify.min.js for consistency
c4b41ce header masthead changes
b776749 make page headers like masthead
eca8193 Merge branch 'master' into docs_derp
8c0cb80 Merge pull request #12215 from twbs/attribution-comments
ea59174 sort out attribution banners of docs assets; fixes #11976
aff64cf avoid redundant banner in minified docs CSS
2d03818 add a title/description to customizer.js's attribution comment
df70e8d Merge pull request #12214 from twbs/slightly-newer-qunit
dde3828 upgrade to QUnit v1.0.0
bfe74f7 Revert accidental overzealousness from 16eccc43d9
b9216a2 update to Holder.js 5b79144fa
685fe72 preserve third-party attribution comments when minifying docs JS
d62d7b0 document subheading syntax
b17dca2 Merge branch 'master' into docs_derp
80bed83 grunt dist build-customizer
f972331 update to FileSaver.js version 2013-12-27 / 0055d054ac
4b5e73b add Blob.js separate from filesaver.js
ef22ab5 update less.js to v1.6.1 & use accurate filename; refs #12196
77ff387 update holder.js to v2.3; refs #12196
4b1ff7f Formatting and docs changes
36aa3af Improve spacing and alignment of sections and their headings
613a95d brand guidelines cleanup
79c18da homepage improvements
bacfd65 Merge branch 'master' into docs_derp
80c9c14 rm lingering reference to Recess in the docs
e290897 Merge branch 'master' of github.com:twbs/bootstrap
1127cd6 grunt dist
e68d3b9 Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets
8e41961 Merge pull request #12193 from ZDroid/migration
62fe50d Update docs per `.container-fluid` addition - Remove `.container-fluid` from "removed classes". - Container isn't fluid by default (`.container`) and `.row` isn't percentage-based, so update docs.
7a2c352 Don't test Linux browsers since we don't support them officially and they're failing our tests
8a04ed4 Merge branch 'master' of github.com:twbs/bootstrap
3a8e99e Fixes #12171: Ensure panel groups have a bottom margin since we nuke it on child panels
b192d29 refer to correct component
17f2ef4 docs mention for #12188
e8cabf3 use height adjectives for greater clarity
46f5bbc document #11675
c6a5e6a rm outdated `<select>` references from comments in forms.less
831bbb8 Clarify that the focus docs styles are not in the repo, per https://github.com/twbs/bootstrap-sass/issues/497
ea20f44 Merge branch 'master' into docs_derp
7f15397 Fixes #11990 and #12159: Make range inputs block level and 100% wide by default
99b66c1 grunt dist
04161a8 more derp
1c66664 Merge pull request #12175 from waynn/patch-3
82eccef mixins.less: fix typo in comment
cba9d81 use periods for consistency in each line
6645e5d Merge pull request #12174 from ZDroid/absolute-urls
8c85e1b Use absolute instead of relative URLs
fc62379 grunt dist
1276503 Merge pull request #12164 from thomaswelton/issue-12162
1fc68c3 Merge pull request #12163 from ZDroid/wrong-paths
4896141 Merge pull request #12160 from waynn/patch-2
431c544 Update paths in bower.json
04ba67d Add new varaible @icon-font-svg-id and set it to be the correct SVG font ID, used new variable in glyphicons.less
f116106 missing a period after "Twitter, Inc"
7ba6daa bump grunt-contrib-jade to v0.9.1
29547a2 JSHint is on crack?
8a10bd5 grunt build-customizer
72ff8ff grunt dist
9443044 Merge pull request #11158 from twbs/templated-customizer
db829f8 add support for '//===' for <h3>s in bs-lessdoc
3986171 Use JS & Jade to generate the customizer variables form HTML from variables.less; fixes #11095
c9ba678 JSCS can be dumb sometimes
1736bcb Merge pull request #12150 from twbs/extract-from-gruntfile
24c16d9 Merge pull request #12155 from Dudytz/master
9f0afd5 updated path docs-assets to docs/assets
d06d61d Use single quotes in the jqueryCheck too.
d7bf937 Remove extra newline from banner.
016d573 Use the docs banner for all the docs generated files.
9b71314 Turn advanced optimizations off until it's fixed in clean-css.
f00bbdd Minify docs CSS too.
ebf7807 docs-assets: concatenate and minify all javascript files.
692eb55 Merge pull request #12151 from wangsai/no-preboot
7e16425 no preboot
d7a128c extract glyphicons.yml generator out of Gruntfile into separate module
d1c29af extract raw-files.js generator out of Gruntfile into separate module
b67fc69 Merge pull request #12149 from twbs/bump-grunt-contrib-less
9ae5d32 bump grunt-contrib-less to v0.9.0
a712abd enable CSSLint in test suite; fixes #12094
c891be5 adjust filename to indicate that customize JS is minified
ef7bf0a grunt dist build-customizer
c635d8f have customizer output Bootstrap Theme too; fixes #12003
07309ed make customizer compilation code more generic
bf5017c fix #12143
9eab6ff Merge pull request #12147 from ZDroid/double
ec59488 Drop redundant 'the'
8fd177b Fix #12073: Consistent order of variations
5f328dc Merge pull request #12057 from ZDroid/nl
5e39e6c Merge pull request #12135 from leoj3n/patch-2
3661c4b Improve wording in CONTRIBUTING.md
0a09dd4 Merge pull request #12133 from leoj3n/patch-1
4839746 Fix bad anchor link in CONTRIBUTING.md
158a239 Merge branch 'master' of https://github.com/twbs/bootstrap
8d903fb duh, missed one more file
c42b6a3 missed a file
7fcfe61 Update copyright notices in all places
f389111 justify text
99338ca Merge pull request #12125 from juniorconte/input-block-level
7722ab5 notes from .input-block-level
aed56fc New Year
bbe5041 Merge pull request #12116 from twbs/pacify-csslint
a5e29a8 link
745bec5 Move homepage examples to data file
9421f0a Merge branch 'master' into docs_derp
5b7f508 Merge pull request #12107 from twbs/same-footer-links
3e54be9 Merge branch 'master' into docs_derp
422bdc5 Merge pull request #12118 from wangsai/fix-out-container
ed8ef84 fix the paragraph outside of '.bs-docs-section'
9fa2c95 make CSSLint happier; refs #12094
0593a20 grammarghhhhhhhhhhhh
12dacee copy
938bc12 add /docs/assets JS to JSCS Grunt task config
34566f4 Merge pull request #12115 from Quy/master
c613143 Delete reference to a non-existent class
7653b84 Merge pull request #12082 from kevinsawicki/use-dollar-instead-of-jquery
78e6036 Merge branch 'master' into docs_derp
ed5c7ba Merge branch 'master' into docs_derp
990303a Merge pull request #12110 from twbs/one-control-per-input-group
6684005 document single .form-control per .input-group limitation; fixes #12109
5fc434c harmonize footer links on homepage & docs pages
1d0bf58 Use mix of medium and small grid clases on dashboard example
9af8692 Merge pull request #12105 from twbs/navbar-containers
ae25544 add .container(-fluid) to remaining navbar examples for consistency/accuracy
41257fe Merge pull request #12104 from ghoullier/master
a53cf55 Replace getElementsByTag by querySelector for IE10 Mobile plateform.
711d0b8 Merge pull request #12099 from Quy/master
3e92ab0 Fix typos
c7eac32 Merge pull request #12098 from ZDroid/reorg
0557057 Merge pull request #12097 from ZDroid/deprecated
f63cd94 Reorganize vars
78eb8cc Replace @screen-sm with @screen-sm-min
b9d779a Merge pull request #12095 from Quy/master
82ed81f Fix typo
72d4faf Merge pull request #12092 from Quy/master
7ca113b Merge pull request #12090 from nschonni/patch-2
a617c80 Fix anchor links
11f56bb Use relative URLs
8662323 Quote Node 0.10 so correct version is printed
84c33a8 Replace lingering page.url instance with site.baseurl
5141e4d Use $ instead of jQuery
0b75e2d Merge branch 'master' into docs_derp
007d61c flip order so sentence reads better
56b5f5b de-emphasize /docs/assets and docs HTML now that they're outside of the root dir
096a72d Merge pull request #12081 from Quy/master
63df2ce Update source code download structure
7168806 Merge pull request #12080 from Quy/master
a53779d Refer to popovers instead of tooltips.
9f44f17 updates to homepage
60e6e7d Merge pull request #12063 from ZDroid/tc
0cc4fe6 Drop trailling comma
70459c1 Merge branch 'master' into docs_derp
c583b79 Merge pull request #12055 from wangsai/fix-assets-links-of-examples
8113717 Merge pull request #12056 from ZDroid/ny
0f060e7 'use strict' on new line
1c83d68 New Year
e4508bb fix assets links in all examples
50cf0b1 Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030: navbar toggle focus state
83d26de Fix broken JS
bab2402 Merge branch 'master' into docs_derp
e3aa358 derp
905adb5 fix homepage images
b253cb2 Merge branch 'master' into docs_derp
8812856 Merge pull request #12037 from twbs/docs_dir
05cc208 Merge branch 'master' into docs_dir
ac3f48b Fixes #12046: move .csscomb.json and .csslintrc to less/ folder
295736a Merge pull request #12049 from ZDroid/update-de
78e1af5 typo
b43371c @nschonni's feedback <3
1e4540f @cvrebert's feedback
0df96d8 Merge branch 'master' into docs_dir
17fb7ae Update dependencies (again)
a1b5458 Merge pull request #12043 from supergibbs/fixed_typo_in_customize.html
df16f9f Fixed typo
6ecdb31 Sauce now supports latest Firefox on OS X Mavericks
0fe777b default to latest Firefox version on OS X
0e412dc fix capitalization of iOS
7f20eff Merge pull request #12041 from twbs/mv-sauce-into-infra
990c239 mv sauce_browsers.yml out of the project root
d18ba50 add note about ios dropdown compat
1fea965 Merge branch 'master' of github.com:twbs/bootstrap
3d3e2f2 Merge pull request #12036 from ZDroid/grunt-fs-minify
2a0b991 Merge branch 'dropdown-aria-roles' of git://github.com/plumlee/bootstrap into plumlee-dropdown-aria-roles
8a62f21 fixes #11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active')
76f0d0f fixes #11373 - adds related target to dropdown events
162d9e1 Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top
9d73d9c Merge branch 'master' of github.com:twbs/bootstrap
ce4a2e4 fixes #11288 - Vertical scroll position of modal saves between openings
70b8b33 no more page.base_url
f10cf21 Streamline copy process by not bringing over full files into docs/dist/, only take minified ones
a9c829b Rearrange repository contents because muahahahahahaha
ea40e79 Merge pull request #11203 from jasny/patch-1
5bf1391 fixes #10658 jQuery Popover content loses bound events on second setContent call.
6405442 drop the title
0680104 Merge pull request #12035 from tomByrer/master
0016b50 Merge two fs variable declarations into one
120dce4 fixed .clearfix example, + doc link
9e1153d spacing
adab81d Merge branch 'master' into docs_derp
a2aaf80 grunt on last merge
84326a3 big brand update
140d24c Merge pull request #12028 from moshevds/deprecated-screen-md
dd9c5fd Small fix: I noticed the use of a deprecated variable. This seems to be the only occurrence.
87288da more nav changes
a73767e the final frontier
5b02dbd Merge branch 'master' into docs_derp
201088c update accordion-group to panel
c595db1 fixes #10911 - add loading event for use with remote option :|
499cca2 Merge branch 'master' of github.com:twbs/bootstrap
d21369c fixes #10890
d43eb0a less fun to address #12008
ca7498f Merge branch 'master' of github.com:twbs/bootstrap
567dc12 Fixes #12012: Use correct banner in docs js
cd0ad94 rebuild
3c73904 update tool/pop destroy placement
6baf266 Merge pull request #10761 from jochenberger/dont-create-tooltip-for-destroy
39091b0 nope
bf3c525 Merge pull request #11496 from satazor/patch-1
34fb576 fixes #10798
37bfd8f Merge pull request #10801 from Travesty3/master
bea46fc Merge pull request #10834 from Prinzhorn/master
0bcc5a2 add Python indentation style to editorconfig; refs #12023
be6ad3f Merge pull request #12009 from ZDroid/no-utf8-py
e0268c3 Merge pull request #12022 from ZDroid/update-deps
2426a2a Update dependencies
d8e4c15 Merge pull request #12010 from ZDroid/wrong-indent
e4b036d Merge pull request #12021 from XhmikosR/master
1e938f1 Merge pull request #12019 from XhmikosR/badge
1e6ae57 Merge pull request #12020 from XhmikosR/package
b590b26 Update dependencies.
5cb8510 README.md: switch to the shields.io dependency badges theme.
5eab9cb Add docs-assets/css/docs.css to csslint too.
fc7049b fixes #10675
3161acd build js
c25fa06 Merge branch 'tooltip-events-fix' of git://github.com/lukaszfiszer/bootstrap into lukaszfiszer-tooltip-events-fix
1e05029 Fix wrong indent in .jscs.json
d381771 Replace UTF-8 characters in s3_cache.py with ASCII characters
dffd4ff Merge branch 'master' of github.com:twbs/bootstrap
394e0fa fixes #11788 - focusin focusout instead of focus/blur
0fab6e7 Merge pull request #11722 from DocX/patch-1
d9266ae add docs for affix events
c77740b fixes #11720 - Add events trigger to affix
073f8c0 Merge branch 'master' of github.com:twbs/bootstrap
f689a26 note for #10486 add note about data-toggle dropdown dependency
139b395 Merge pull request #10359 from ixti/patch-1
a93a753 fixes #10134 – dont use jquery offset directly because it uses sub pixel rendering
fe7fffe Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide-event-reset
0a75e4c fixes #10283
558b6a4 Merge branch 'master' of github.com:twbs/bootstrap
50bd4ed fixes #10236 if affixed top add scrollTop to it position.top calculate and cache pinnedoffset independent of scrolling for initial load
1da3a8c Merge pull request #12001 from soundarapandian/fix_typo_contributing
04ec435 don't roll back that comment
5c2dfbf Merge branch 'master' of github.com:twbs/bootstrap
679c786 roll back version numbers to avoid broken links in docs and readme (fixes #12000)
2539071 Reflect sass readme change in css.html
8b564f9 Use correct directory name for bootstrap contribution
237b85a Merge pull request #11933 from twbs/fat-10105
fe839e6 change where modal loads content -– fixes #10105, #9318, #9459
52a964d Merge pull request #11999 from XhmikosR/respond.js
3d65fc2 Update Respond.js to v1.4.2.
1fc08c1 fixes #10568 - kill hoverstate info once command has been executed
a87b150 fixes #10205 Scrollspy Doesn't Support Chinese ID Targets  http://mathiasbynens.be/notes/html5-id-class
71e9db4 add callout about justified button group borders to address #11964
340e2f5 Merge pull request #11970 from supergibbs/Better_10492_fix
f3ce6a9 Fixes #10492 better: - Made more generic. Applies to "> .table" and "> .table-responsive > .table" to support td/tr background colors too and not just .table-striped - Supports tfoot
0bd5bca Fixes #11975: Change from png to .ico for favicon
37bc0c2 Merge branch 'master' of github.com:twbs/bootstrap
4376ce8 Upgrade to CSScomb 1.2.1 and reset some ordering to ensure no rogue spaces
00850e2 Merge pull request #11989 from ZDroid/banner
608926e Improve banner
f327965 Merge pull request #11978 from XhmikosR/clean-up-_gh-pages
96b5ae8 grunt
6fda30e Merge branch 'master' of github.com:twbs/bootstrap
9fc0e20 Fixes #10492 and some of #11970: round the proper corner on table cells in panels
45a8a95 Merge pull request #11974 from XhmikosR/meta
90ba7fa Merge pull request #11972 from XhmikosR/comma
b505c85 fixes #11961: dropdown alignment docs improvements
6cde19f Merge pull request #11963 from twbs/sass_docs
fd15b00 space
8bc6aeb add what's included
906b0c5 Merge branch 'master' into sass_docs
cb7cdd0 Revert to CSScomb 1.1.0 because 1.2.0 and 1.2.1 fuck up our compiled CSS
ec13eb8 Remove timestamp on generated Glyhpicons
7ccb033 Merge branch 'master' of github.com:twbs/bootstrap
51628d2 grunt
146800e Merge pull request #11979 from ZDroid/fix-old-links
fa23807 Merge pull request #11982 from ZDroid/update-deps
88c3619 Update dependencies
28adcbe Fix old links
ea5a4ec Jekyll: exclude more files/folders.
a05a11e Get rid of JSHint's `laxcomma` option now that the comma is used on the right side.
b27fecb bower.json: sort by name.
29aaf66 Normalize package.json.
6e3ac8f js/.jscs.json: sort by name.
12980e7 link homepage sass and less
176e35d rework downloads to simplify and add sass
16ff01f remove dat
02c40ab Merge branch 'master' into docs_derp
c66924c add section for contents
2f56922 config url
bb644ee Team members on About page
86e6c86 remove some unintional code
0c49f84 Merge branch 'master' into sass_docs
5f9695a readme typo from #11965
b734a2a Merge pull request #11965 from tomByrer/md-tweaks
c84688f https://github.com/twbs/bootstrap/pull/11950#issuecomment-31033824
033476c more Less
66c280c Sass docs; LESS to Less because fuck caps
810c7ec Merge pull request #11956 from tlindig/tl_pagination_customizing
e1bd300 Merge pull request #11960 from ZDroid/no-leading-commas-json
b604c2f Drop remaining leading commas
f1d4a3b Merge pull request #11959 from ZDroid/update-grunt-csscomb
e95c396 Update grunt-csscomb dependency
7f599ce add new variables for "pagination" to improve support of customizing
2854c5c Fixes #11952: Refactor blockquote styles
81b1e68 correct jsbin link
2c5e5b2 Merge pull request #11951 from bnewcomb/master
2e0337a Minor grammar change
523eca1 Merge pull request #11930 from ssorallen/master
4a01aca Merge pull request #11941 from ZDroid/left-plus
caadd72 Merge pull request #11939 from ZDroid/weird-indents
2898e73 "Thosing" [sic] => "Those"
fc03fac Fix sentence in css.html
b298d2f Merge pull request #11945 from robertgentel/patch-1
ded1e72 Update css.html
1bf5aba No leading pluses
9201ccd 2 instead of 4 spaces in .csscomb.json
fb8310f Merge pull request #11936 from KostyaTretyak/patch-1
09c7870 Deleted curly brackets (in css.html)
85ba129 Merge pull request #11935 from tlindig/tl_fix_typo_modal-open
50f1bc4 typo fix: replaced 'model-open' with 'modal-open'
091146e Merge pull request #11934 from twbs/auto-latest-browsers
fbb0e8b omit versions in Sauce browser config; no explicit version implies latest version
edbd1a8 Merge pull request #11932 from dzwillia/th-td-position-static
22f9767 check that href id's are followed by valid char – fixes #10044
d9586e2 Added position: static to table th and td.
b048ea5 Write Glyphicons to _data, generate Glyphicons markup
8772737 Merge pull request #11929 from twbs/maintainers
07da1d7 mention core team maintenance & community contributors
4eaa297 Merge branch 'master' of github.com:twbs/bootstrap
b59b37b Fixes #11918: Fork the @h5bp contributing guidelines and combine with our coding guidelines
b8810fb Fixes
171c4b7 fixes #11447: add docs warning about loading once for remote modal option
08854cf using templating doesn't seem to work there; hardcode license URL instead
0770567 Merge branch 'master' into docs_derp
fe7c7cc rebuild minified customizer JS so it reflects the licensing change
3315d4d license in customizer
df37166 update licensing header in JS files & run grunt
766bf50 Merge branch 'master' of github.com:twbs/bootstrap
ccc8943 update license faqs for apache
5428523 cleanup licensing section more
922cd04 grunt after that carousel merge
1bb0001 Merge branch 'master' of github.com:twbs/bootstrap
27697ef another apache mention
629a474 remove license readme mention
40651cf more license mentions
b9ca65e Merge pull request #11416 from danielboendergaard/carousel-duration
e8e60ae version bump
cb40a2e Punt Apache license information and stick with MIT
f291323 grunt
af2c6de Merge pull request #11928 from twbs/we_have_to_go_back_kate
56c3634 drop the the, it's cleaner
79e97fe derp
324f6ca buttons should be more mixin friendly
ab740f0 navbars need to use prefixed nav class or they won't work as expected
3416e87 restore inline block on breadcrumbs and ensure proper code formatting for readibility
961687e run grunt dist
0a95584 rewrite readme to restore lost information, only with a bit more formatting consistency
8598c70 Merge pull request #11927 from twbs/revert_commits
2b312bf Revert commits
bc265ac callout colors
1d0aa6e more docs
d87e70f footer alignment
5bba874 Merge branch 'master' into docs_derp
3f577ab Merge pull request #11881 from ZDroid/patch-1
ee709db Merge pull request #11804 from twbs/css-source-maps
c4b0684 fix typo
6315043 Merge branch 'master' into docs_derp
c262e5b add source maps
1bc8607 Merge branch 'master' into css-source-maps
d15218a Fixes #11899: Ensure proper margins and .small/small usage for heading tags (e.g., .h1-.h6)
0d0b5c7 add inline note about navbar sizing
c1f68dd Merge branch 'master' of github.com:twbs/bootstrap
8142493 fixes #11925: cover template for firefox
b93d6df tweaks
671fb70 Merge pull request #11923 from wangsai/fix-id
98ef428 fix href of "Browser and device support"
91fdd89 Merge pull request #11910 from InWayOpenSource/btn-group-inside-input-group-btn
36e3311 Merge pull request #11916 from ZDroid/fix-iversions
575f29c Downgrade Safari and OS X
dcfe710 enable failHard grunt-html-validation option; fixes #11876
af1afb1 upgrade to grunt-html-validation v0.1.11
ae640d4 Fix handling of btn-group placed inside input-group-btn (used for mixing dropdowns with normal buttons)
ba3639b Require comma on left side
94635eb Merge pull request #11893 from twbs/separate-browsers-file
0f72123 move Sauce test browsers list out of Gruntfile into separate file
b6b2c90 Merge branch 'master' into docs_derp
2ae39d7 Merge pull request #11891 from twbs/cache-jekyll-bundle
498f00a use S3-cached Jekyll install
ec261a8 Merge branch 'master' of github.com:twbs/bootstrap
ca14b96 inform the people that fixed positioning ain't all it's cracked up to be /cc #11888
05b0a74 Merge pull request #11887 from twbs/minor-panels-refactor
6bb73df Merge pull request #11890 from twbs/generic-caching
95c72b5 make S3 caching significantly more generic
637b20f minor refactoring of 4ee93c9f8529cfeef56d4178b91e1ddcb0bff09c
75db355 Merge pull request #11886 from twbs/html-validator-config
43c3d78 explicitly set more HTML5 validator options
94bdea0 use unique IDs for input feedback examples so HTML validates
f8cee54 use unique IDs for modal labels in doc examples so HTML validates
4db1d69 simplify JS snippet slightly
a2f7c30 fix typo in docs
023731b fix var name in example to follow JS conventions
be508e0 copyediting
4ee93c9 Fixes #10492 again, this time for last row's corners on striped tables
2979e4b Add new form feedback states, clean up existing form styles
d9345ff Fixes #11266: Apply a pixel-based line-height to date inputs for iOS 7
4f22670 formatting and comment
d1f15ba Merge branch 'master' into pr/11817
b04a1de Fixes #11402: Updated fix for select.form-control width in inline-forms
24eee65 grunt
6bc7126 Merge pull request #11494 from blowsie/patch-2
393d523 Fixes #11660: Depcreate small and .small in blockquote in favor of footer
9023c08 Merge branch 'master' of github.com:twbs/bootstrap
f5c13a3 revert an earlier change to move the component-animations.less file because it fubared modal backdrop .fade usage
f6fe62c run grunt on modal scrolling change
122245f Merge branch 'master' into pr/11676
55f6beb Merge branch 'master' into pr/11776
e7a56df Merge pull request #11732 from dak/include-dev-fonts-in-bower
56eecf9 Merge branch 'master' of github.com:twbs/bootstrap
ee80b5e typo
f126411 Merge pull request #11840 from ZDroid/pagination-boom
93a4d6c Fixes #11783: Document requirement of .container(-fluid) in navbars
540677c Fixes #11795: Update the contributing guidelines to include some more CSS guidelines
a13d459 Clarify number of columns in nested grid
d57e81d Fixes #11799: Mention support of number of add-ons in docs
c7c9929 Fixes #11770: Move component-animations.less to the utility section of import list to match Customizer
a925a0b Browser/device support docs update
cb3d9df Fixes #11833: add warning to docs for popover multiple line positioning; update it's docs with example markup, too
1264cb7 update tooltip docs
61ec569 Fixes #11805 with docs mention of navbar
f60b816 finalize blog template
a7029ed Restyle the blockquote to not thin text or change line-height
fd62247 Merge branch 'master' into cover_template
2b86e05 Change variable
bc261ec Merge branch 'master' of github.com:twbs/bootstrap
a319ec5 Fixes #11829: Adds .make-xs-column mixins
2ea370f Merge pull request #11861 from freeman/master
9a8e619 Fixes #11871: commas last
ad782ff comments and spacing
8c13565 Merge branch 'master' of github.com:twbs/bootstrap
82c52a7 Fixes #11801: use correct variables for grid containers
ca7fd08 Merge pull request #11879 from ZDroid/wrong-variable
ae170a5 Fix wrong variable name
168469f Fixes #11588: Scope font-size to only p elements in a .jumbotron and remove the supersized line-height from the base class
647e9eb Fixes #11555: Add `@tooltip-opacity` variable
072ccd4 Fixes #11572: Add contextual background-color classes to match text classes; move both sets of classes to Helper Classes section of the CSS docs
67b536e change class name
bcc2c8b Merge branch 'master' of github.com:twbs/bootstrap
432b9f9 Fixes #11561: Add float: left; to .form-control within input groups to prevent IE9 from screwing up placeholder text and select menu arrows
c243e24 Merge pull request #11864 from twbs/parallelize-build
4da03c8 correct bookmark prefix
88a8669 document #11326
39a2dab parallelize Travis using build matrix & test subsuites
e98c2dc Merge pull request #11326 from ZDroid/animations
35dd6b9 Merge pull request #10704 from XhmikosR/various
46c3d27 Merge branch 'master' into pr/11435
4c64c1e Merge branch 'master' into pr/11302
d79431c Document new modal sizes
323a40c Merge branch 'master' into pr/11162
83c60ef Merge branch 'master' into pr/11107
4afcebe Merge pull request #11286 from BBosman/well-border
544b8ec Fixes #10921: Add support for input groups within button toolbars
fd41305 mention lack of support for split button dropdowns in vertical button groups
a54dbfd Merge branch 'master' into pr/10951
f186977 Fixes #10505: Document more of LESS vars and mixins
85316c8 Merge branch 'master' of github.com:twbs/bootstrap
11c6ab7 Fixes #10370: Improved and deprecated dropdown menu alignment options
9e50078 Merge pull request #11878 from ZDroid/patch-1
7f6cf5e Add `try` and `catch` to keywords
914f5e6 Fixes #11867: Add `@panel-body-padding` variable
ecc6f4e Merge branch 'master' into pr/11868
22820d7 Fixes #10495: Float Glyphicon and set margins in .navbar-brand to ensure there is no added height because wtf even is CSS
ce07ff8 Merge pull request #11869 from twbs/cache-node_modules
6b6b059 time all the things
42697a4 use S3-based node_modules caching
de6b9e9 Merge pull request #11874 from ZDroid/hotfix
e3d799f ';' isn't needed
37b2c8a add dist files.
b7bf212 use @zindex-modal for .modal and @zindex-modal-background for .modal-backdrop. removed z-index for .modal-dialog, it was not necessary because the parent element (.modal) already has a z-index.
5f9ecc7 -ms-transform is for IE9 only, IE10+ don't require it
0e6d34f Merge pull request #11819 from janpanschab/ms-transform-origin
2d693de Merge pull request #11863 from twbs/update-osx
56d89ed Sauce tests: update to later browsers supported by OS X 10.9
0cb5707 quotes
d2d2f77 text update
885d14b move icons to partial
d704bf0 just column width, not max
0b4efcd more docs homepage cleanup
ce39cbe Issue #11852 : create a new variable for the list group active item link text.
f8a78d7 homepage images
da24a3e typo
730ccd2 Merge pull request #11859 from dzwillia/add_dropdown_caret_color
4b47c60 Added @dropdown-caret-color variable back to variables.less (deprecated)
4fc2907 Merge branch 'master' into docs_derp
0e8baab more homepage and sidenav overhaul
fbf31f9 Add new template, Cover
9966d03 Merge branch 'master' of github.com:twbs/bootstrap
a3a2525 Fixes #11837: grid containers are fixed width now, no longer max-width
bdd0890 Merge pull request #11841 from ZDroid/breadcrumbs
5ec2b4b Merge pull request #11839 from XhmikosR/readme
2547f1e Use variables for breadcrumb padding
27859f6 Improve pager customization
f3077ee Merge pull request #11838 from XhmikosR/customizer
caa3d53 customizer.js: remove a workaround for older less.js.
6355832 Clarify Windows workarounds.
2bc0819 Combine updates to Windows Jekyll stuff
f32ef36 Merge pull request #11830 from XhmikosR/jekyll-windows
352b688 Merge pull request #11832 from twbs/run_jekyll_on_windows
1d56211 Help Windows users install Jekyll
b9f12a5 README.md: mention an alternative workaround for the jekyll issue on Windows.
fc3e743 Update README.md.
bbe5510 Allow listbox AIRA role on dropdown component.
1bce8c9 Merge pull request #11818 from XhmikosR/less.js
52c87b3 Merge pull request #11812 from tlindig/load_grunt_tasks
3e0366a transform origin mixin for explorer
11180e0 Update less.js to v1.5.1.
3b5e0c9 hide space characters in input-group-btn to fix segmented buttons double border
3583aa2 correct indentation
9f12f84 Buildprocess: use module "load-grunt-tasks" to load grunt tasks directly from the package.json
5749039 Remove unused variables.
a6b5c7d Merge pull request #11809 from twbs/enable-LESS-strictMath
95992ef enable strictMath in grunt-contrib-less config
28d8be1 Merge pull request #11808 from twbs/strict-math-fixes
ab29b1a misc strictMath compliance fixes
9664f8d add parens around arithmetic in recursive mixin calls to comply with LESS strictMath
88d8cd9 Merge pull request #11807 from twbs/stricter-math
10e74a9 improve compliance with LESS's strictMath
9e38e25 enable CSS source maps in grunt-contrib-less
25ec09f Merge pull request #11790 from twbs/drop_recess_for_less
d466d52 Undo merge of #11778 and use cleancss min option
b9b17bc grunt
de218bb Merge branch 'pr/11779' into drop_recess_for_less
7d4171c Merge pull request #11792 from twbs/list-group-nest
ea61a19 Merge branch 'pr/11778' into drop_recess_for_less
9ceff60 more nesting in .list-group-item-variant mixin
0016c17 Switch to `&:extend(.clearfix all)` for clearfix mixin
2a4621b Merge branch 'master' into drop_recess_for_less
e4c1ef7 more closely align property order with recess
0991c7c specify block indent as numeral to prevent fubared media query output
e90ce1c single array == no rogue spaces
4540f9e derp, don't sort min /cc @cvrebert
aae9c2d merge, compile
dbe95f0 fixups to csscomb grunt task
6df909a Fixes #11786: Nest media queries within print utilities for mixin-friendliness
6b55e93 adding json
f1cb57c restore original options value
c020042 Drop grunt-recess for grunt-contrib-less & co
768f8b0 Merge branch 'master' of github.com:twbs/bootstrap
ae0d480 fix #11787: document stateful button JS
cdb7d98 grunt
b98d6ed Merge branch 'master' of github.com:twbs/bootstrap
e1247e3 Match customizer banner to Gruntfile banner
997a1f4 fix dependency mapping of buttons and button-groups in customizer
1f35b6e fix <button>s with .btn but missing accompanying .btn-*
bab736c Fix typo in new author meta tag
5eeaf11 Merge pull request #11780 from ZDroid/grunt-dev
a5d9b35 Don't ignore Gruntfile, it's required for compile
cbfbf1b Add csslint support.
fdc5d1d Minify css with clean-css.
77bc82d Add `.animation-*()` mixins
b5613c9 Merge pull request #10709 from XhmikosR/quotes
eca8ff3 Use single quotes consistently.
0c457d4 Drop redundant module import
ed63dfd Merge pull request #11739 from XhmikosR/lint-assets
e349fb2 fix validation failure
1f9bfa8 Fixes #11741: Don't set headings font-family again, just use inherit
c37b710 Merge branch 'master' into pr/11744
b5008eb add vertical-align back to where it's necessary since we reset from block to inline-block on several inputs
e43e87b Merge pull request #11748 from bganicky/patch-1
1250004 Merge branch 'master' into pr/11750
475bbd4 Merge branch 'master' of github.com:twbs/bootstrap
d70f4e8 image compression
adf8209 Merge pull request #11772 from KostyaTretyak/correction
90cbfc7 Add new template, Cover
34070af Merge branch 'master' of https://github.com/twbs/bootstrap into correction
6145cc0 Fixed some errors in the docs javascript.html
6273604 Add .container-fluid variation for full-width containers and layouts
73bc7d9 Add new template, Dashboard
5fdd917 improve icon display on narrow devices
5e6f9b9 prevent horizontal scroll on components
74408de Shorter download text because narrow viewports
0bf5202 Fixes #11729: Show code snippets on mobile views
9edec7e Fixes #11756: Mention document mode checking ability in IE comaptibility modes
a9b86cb Merge branch 'pr/11138'
07de53c Contextual list group cleanup
a1f737b grunt dist after adding .text-justify
bfd8f8c Merge branch 'master' of github.com:twbs/bootstrap
b1215d1 Fixes #11193: Add kbd element styles to indicate user input via keyboard
a691d54 Merge pull request #11675 from GraceNut/feature/text-justify
fe58357 Fixes #10884: Adds .info variant to contextual table classes
c07632e Reorder button and table variants for consistent order
107b334 Fixes #11766: Use color var for background on badges in buttons to restore proper background to default button badge
2b4fa90 grunt dist
cc1f956 Merge branch 'master' of github.com:twbs/bootstrap
775c29f Fixes #11764: Add meta data to docs for description, keywords, and authors
94a5413 Merge pull request #11757 from ZDroid/darken-toggle
4032dd0 grunt
73da46c Fixes #11760: Remove mailing list links from readme and about pages
4b84acb Merge pull request #11765 from ZDroid/docs-min-js
8087f95 Load minified Bootstrap JS code
b441632 Merge pull request #11761 from twbs/jscs
2fc2fe7 Lint docs-assets/js/application.js and docs-assets/js/customizer.js.
f4087df Remove incompatible properties.
c1dae1e integrate JSCS
351f86e fix some JS to pass jscs
4be126e Merge pull request #11745 from XhmikosR/function-spaces
650279f Merge pull request #11758 from ZDroid/rm-brstck-bower
c78f3b2 Drop browserstack.json from bower.json ignore
78b43d4 Darken icon bar to meet WCAG
01a1c41 Merge pull request #11755 from twbs/track-customize-js
c545312 need customize.js to be tracked for it to work on GitHub Pages
2e9cde6 grunt
dc34c8a Merge pull request #11738 from XhmikosR/min-assets
e90e602 Merge pull request #11742 from vincentchan/master
5e8db4a Merge pull request #11740 from XhmikosR/trailing-spaces
b92bee9 reverted changes in commit 96109d3 which seemed to break conditional classes in striped tables (ignoring the comment above that the previous rules were needed for just this purpose)
9ce7e56 Updated .scale() mixin so that it accepts optional vertical scale factor parameter.
5e2ef69 Use a space before functions' bracket consistently.
4aad527 Use a space after function consistently.
b9ae594 Adding Bootstrap in French
68a6e57 bower.json: remove trailing spaces.
3de4f23 Minify docs-assets too.
7b06538 Merge pull request #11723 from stof/patch-1
3b75d64 Merge pull request #11733 from KostyaTretyak/edit
dde53a5 This is error?
b8b250a Don't exclude fonts from bower installs
4ec1370 Fixed another small error
3ae7e0a Merge branch 'master' of https://github.com/twbs/bootstrap into edit
813a4fa Added the removal of tab-content and tab-pane in the migration guide
6d03173 Merge pull request #11718 from KostyaTretyak/once
6e9efb2 Use document scroll height instead of offset height to support body with absolute height
c7e45fa Added links to Ukrainian translation website
aac4f01 one last grunt
0a5aa8e Merge pull request #11714 from ZDroid/redundant-comment
01afe84 Remove redundant, duplicate comment
b18d3fb Merge branch 'master' of github.com:twbs/bootstrap
45930ac Fixes #11610: Add @grid-float-breakpoint-max to better link navbar behavior across viewports and improve customization.
42bee1d Merge pull request #11671 from XhmikosR/updates
cf81cb6 Merge branch 'master' into gradient-prefix-cleanup
8c5dc54 grunt
a45d839 Fixes #11712: Better support for .table-responsive within .panel's
66f9c7d Fixes #11436: mention in docs that .container isn't nestable; update docs to mention width, not max-width
dd28ecd Merge pull request #11710 from JoahG/bootstrap-thumb
02df15d Merge pull request #11709 from mdxs/patch-1
4031f5e Add a migration tip for .label-important to .label-danger
89061b0 Updates Bootstrap thumbnail
f7d21d6 Dropping unused variable in dropdown.js
7b945ad Merge pull request #11705 from cyrusstoller/migration-guide
149e7ef Add a migration tip for .label to .label-default
a42e916 Merge branch 'master' into responsive-visibility-table
ed0d556 Merge pull request #11697 from twbs/btn-xs-10979
f8e0f16 fix broken link in CONTRIBUTING.md
ed2360d Merge pull request #11701 from twbs/sauce-labs
bd9332a switch to Sauce Labs for our cross-browser JS unit testing needs
7472c01 Corrected a small error in the documentation
1d20611 fix invalid HTML in components.html
4a45650 fix .btn-group-xs portion of #10979
3f1e4b9 -moz and old webkit syntax removed for gradients based on http://caniuse.com/#search=grad
303f8a3 add <table> case to responsive-visibility mixin; see #10056
bac1531 grunt
2d4ee18 add comment regarding #11598
018a1d5 Merge pull request #11691 from twbs/xs-grid-docs-fix
7a9d9f7 account for #11050 in the docs
1998724 reference root issue in explanatory comment
f2dab82 add .gitattributes file to enforce Unix newlines within the repo
5a826a6 Gruntfile.js: Set line feed char to '\n' to get same result on all platforms.
a7ceefc Merge pull request #11690 from lipis/patch-2
92a624a Get rid of empty line before the last closing bracket
0fcaca8 Fixes #11669 - Adds smooth modal scrolling on iOS by default
3a65b2c Added text-justify class to type.less
b892834 Update filesaver.js to the latest git.
c56e63e Update jszip.js to the latest git.
4392d43 Update holder.js to v2.2.
2b56ff0 Reduce size of the visibility styles
cc6951f Merge pull request #10662 from kevinlisota/thumbnail-images
b636756 Merge pull request #11667 from neilhem/master
ab73ff1 replace double quotation marks with single in code examples
4876cbe Merge branch 'master' into pr/11412
1444a3c grunt dist
37e46ec add comment
561aff7 Merge pull request #11499 from bassjobsen/patch-3
8a74264 bump version numbers to 3.0.3
118e901 grunt
5a03655 Rework navbar padding and margins for right aligned last-child elements
25bc532 grunt
d417fce Fixes #11357: Vertically center sm and xs buttons in the navbar
33160d5 Fixes #9927: Update non-responsive example to prevent .navbar-collapse border from increasing height and increase specificity of nav selectors to keep dropdowns looking the same
948da5c Merge branch 'master' of github.com:twbs/bootstrap
dd05c0e fixes #11508: mention in docs that inline forms only work at 768px and up
17dee30 Merge pull request #11662 from ZDroid/deprecation-fix
556d6ce Fixes #10941: Fix Glyphicons path for those importing bootstrap.less from another directory
ed29a99 Use mixin instead of whole code
8dfe93d Add docs example to go with #11536
53047fa Merge branch 'master' into pr/11536
57070dc grunt
48269dc Fixes #11658: Increase min-height of .radio and .checkbox for horizontal forms to ensure alignment of content below
841da88 Remove browser default top margin from dl elements
cf40b5d Fixes #11623: Reset position to static for grid columns within tables to unfuck borders in IE9/10 and Firefox
c6244a9 Shorten sticky footer examples footer content to prevent wrapping
22da6fc grunt
a127f39 Fixes #10716: Update what's included docs to add info on both download options
ed98ac7 Merge branch 'master' of github.com:twbs/bootstrap
6bc09dd Fixes #11268: Account for badges within buttons by matching background to text color and text color to background
5283e51 Merge pull request #11217 from ZDroid/nest
359ac8f grunt
67d4e33 Fixes #11277: Drop the abbr element from the .initialism selector
9bbdb87 Fixes #11420: Update migration guide on split of .visible-/.hidden-desktop into .visible-/.hidden-md and .visible-/.hidden-lg
6a2ca0a Fixes #11444: Use @navbar-padding-vertical for nav links padding
7aa6b41 Fixes #11402: Set width: auto; to select.form-control within .form-inline
d2f8b53 Fixes #11515: Reorder the headings with body text and text emphasis classes
21e2ae9 Fixes #11544: Add color: inherit; to .panel-title to ensure proper text color when customizing @headings-color
82bbccd Merge branch 'master' into pr/11648
5611320 Merge branch 'master' of github.com:twbs/bootstrap
853b69f Fixes #11351: Correct grid class reset on input groups by using attribute selector, not an old class from v3 betas
84f536e Merge pull request #11398 from thelukemcdonald/master
a52e528 Fix up new margins on modals by not setting auto until screen-sm-min
265118a Merge pull request #11657 from ZDroid/homepage
ab87085 Use pkg.homepage
0d81c4e Merge pull request #11124 from StevenBlack/issue.11098
080aa7f Merge branch 'master' into pr/11299
819e920 Merge branch 'master' of github.com:twbs/bootstrap
a7a9dca Alternate fix for #11303: add link to site in banner and remove @mdo and @fat usernames from it
95487f7 Merge pull request #11329 from ZDroid/patch-1
143427b Merge pull request #11330 from maxwellium/patch-1
a15a6df Merge pull request #11369 from ssorallen/speedier-js-loading
bb4a39d Merge branch 'master' into pr/11388
e6eb798 Merge pull request #11434 from ZDroid/fix-11433
938d40f Merge pull request #11432 from masterbee/WCAG2-color-contrast
a06610a Merge pull request #11502 from 1000hz/patch-1
5b137e5 Merge pull request #11511 from ZDroid/fix-xs-comments
f7b7cc3 Merge pull request #11585 from thriqon/master
40f86af Merge pull request #11617 from guybedford/master
8674228 Merge branch 'pr/11493'
9f0da54 grunt to get dist files
e484828 Fix #10979: Don't use .img-thumbnail as a mixin for .thumbnail to avoid dupe and unnecessary styles
bf9f392 Fixes #11425: Use margin instead of padding on .modal-dialog to enable click-thru to .modal-backdrop
36b82c3 Implement #11174 to fix #10936: increase height of large inputs to fix Firefox inconsistencies
61c641e fixes #10699: use xs grid classes in regular thumbnail docs
1e6c95c improve affix docs with step-by-step walk through of plugin behavior and required CSS
7d456ae Update scrollspy docs to more clearly indicate usage
a4c54b5 Fixes #11390: Add max-width to containers within jumbotrons to avoid horizontal scrollbar
09cd528 Fixes #11468: Prevent default gradient  on  in Firefox for Android
702ad4c Remove redundant comments
08e41d7 Add missing last column float
b5f9cc2 Merge branch 'master' into pr/11414
0be9418 grunt
d654f90 Fixes #10147: Remove outline from carousel controls on focus
9d93908 Fixes #10483 and #10357: Make .container mixin-friendly by moving the width declarations within one class
c13524e Fixes #11553: Prevent double border on tables in panels without thead content
9f68a5b Fixes #11516: Invert dropdown divider border in navbars
9d485db run grunt after last merge
ec9d470 Merge pull request #11551 from masterbee/outlinetweak
b7b72cc Merge branch 'master' into pr/11614
56f4cf0 Fixes #11634: Add warning to docs to not combine icon classes with other elements
594d0c7 grunt after merge of last pr; unsure why, but this is rengerating the banners and spacing
2abaed9 Merge pull request #11642 from tlindig/caret_color_fix
3d5e598 add builded files from dist/
ea78248 removed all caret border color settings.
9829c86 run grunt
27abfba Merge pull request #11616 from ZDroid/remove-window
ac6cfbb include jspm package configuration
630fd1c Remove redundant 'window.'
bff8ba2 Fix for Issue #11411
fa710fd Merge pull request #11612 from JerryChr/master
bd44a4b Removed unnecessary semicolon
cad664e Merge pull request #11598 from ZDroid/customizer-breaks
ebc9107 Merge pull request #11599 from westonplatter/explicit_fonts
a42d7ff explicitly call out font files
dbbd49b Fix #11594
de2ab64 Merge pull request #11597 from ZDroid/deps-grunt-recess-kickup
4160ff0 Kick up grunt-recess dependency
98980b0 Merge branch 'master' into docs_derp
37f3944 finish up moving content, tweaking styles
4c246c0 Merge pull request #11534 from twbs/doc-async-modals
6229924 Issue #11550 : Easily copyable classes
ccd5646 add more missing role="form"-s
b34292c Merge pull request #11567 from neilhem/master
7ab6c27 Merge pull request #11578 from barraponto/patch-1
d873af8 Make it clear there's a nested media element in the first example
bf62a62 add role form for horizontal form example
55af003 removed color treatment of outline
6ed5a84 Merge pull request #11172 from yokomizor/git_ignore_bower_components
8f589c6 Add 'in' to complete thought
ba4c5da add support for button dropdowns in justified button groups
afbdc21 fixes part of #11117: doc that modal show()/hide() return before animation finishes
2172e2e fix #11089: document modal show+shown events' relatedTarget property
446f232 add explanatory comment Re: #11526
84a3aa3 Merge pull request #11514 from twbs/navbar-text-float-breakpoint
7c9b932 Merge pull request #11526 from erikflowers/firefox-placeholder-fix
50578dd - Firefox placeholder text is faded out and not the full color. Adding opacity:1 to it returns it to the proper color - (this is a re-commit since I messed up my branch last time and failed the travis build)
ee1c53d Merge pull request #11521 from valera-rozuvan/patch-1
ad86d9a Update dropdown.js
8aec527 Run grunt dist
cdb2437 Fix #11513: Don't always float navbar-text
283c86d There are xs-offsets, -pushes and -pulls!
6b547b3 Merge pull request #11509 from ZDroid/fix-indents
9a8a571 Fix some weird indents
03501f9 Merge branch 'master' into docs_derp
ae4d5f2 fixes #11449: use menlo over monaco
a2c6daa fixes #10744: back to solid borders on carets
86678e6 text size
56f6847 Add missing data namespace for dropdown
fbd3cf5 Update navbar.less
926b940 Clear timeout on destroy.
f4eb3df Fixed single btn in btn-group-veritcal not being rounded
1f34002 Fixed button group button not being 100% width
7545da2 fixes #11477 and updates slid event in carousel with namespace
57b59fc Merge pull request #10353 from rwillrich/ignore-files
27b62d3 Merge pull request #11476 from ZDroid/keyframes
c2a6e95 Remove unusual keyframes prefixes
4cbc8d4 Justified Nav rendering bug fixed in Chrome as of v31.0.1650.48
c1c2a8e Merge pull request #11385 from twbs/justified-nav-example-warning
e7d6af0 Merge pull request #11376 from twbs/double-click-radio-fix
7a3f41b <3 @asselin for figuring out this combo of 2 patches for #9920; re-grunt
5d6e921 Don't deselect radio buttons in data-toggle; fixes #9920
934d1bc Add unit test for #9920
a639c6e Merge pull request #11409 from twbs/add-release-checklist
ce0d008 add release checklist to CONTRIBUTING file; fixes #11290
aad447e Fix #11400 and #11431
4bd263c Better documentation for validation states
4386650 Corrected color contrast to WCAG 2.0 AA
268f20e Carousel: Use the transition duration from CSS
0da3901 Add missing `.small` styles and docs
03c161f Fix glyphicon class name wrapping in IE
15fbc4b Don't print .clearfix() comment references
ed5dbf1 Update affix properly on scrollspy speedy scroll to top of page #11310
96109d3 Simplify table state styles
463343a more nesting in table.less
798e64c use nesting to make .table-striped & .table-hover mixin-able again; fixes #11387
ceefbce add warning about WebKit bug to the justified nav example itself
6df6723 Merge branch 'master' into docs_derp
3887f54 update remaining version numbers
eaff6bc grunt
98acdae bump links to 3.0.2; change readme download to release URL format
88a0664 Fixes #11295: Restore offset, push, and pull zero classes (e.g., .col-md-offset-0)
d1048a7 run grunt after version bumps
6a42305 bump versions to v3.0.2
b593df1 docs derp
c84d96a fix #11378
375b9ed Merge pull request #11273 from benji07/patch-1
7df3e14 Add a branch alias
89d489d re-grunt
f1b0cd4 Merge pull request #10039 from daguej/js-refs
d2e710a fix 1 remaining instance of #11349
a063e1f Merge pull request #11349 from alefteris/examples-navbar-sr-only
b6a083e Merge pull request #11327 from ZDroid/nestnail
18318b8 Add async attribute to Twitter widget script
68fc2f2 Add protocol for jQuery to work when accessed as file
4f5a865 Load Twitter widget async, prevent SPOF
38d6894 Serve jQuery from cookie-free Google APIs
13b9667 Merge pull request #11335 from twbs/version-number-updater
0bb122a add Grunt task to change version numbers; fixes #11332
aeee718 update node.js to v0.10.x (current stable)
de271bf Merge pull request #11354 from Ore4444/patch-1
eae1af1 Fixed links
70db224 Add toogle nav for screen readers in examples
df3b44f Merge pull request #11345 from pborreli/patch-3
05c826d Removed duplicated class change from migration instructions
fcb906c Merge pull request #11336 from twbs/fix-11317
88b6510 Fix #7398 in Basic template
be60ee1 Merge pull request #11338 from ZDroid/nestform
f1bc840 Use nesting for .placeholder()
db31452 don't use nonstandard window.location.origin in customizer JS; fixes #11317
ea3c891 Merge pull request #11334 from glebm/patch-2
b75d5f5 & > == >
4e0d022 update version numbers in JS file comment headers to v3.0.1 & regrunt
41fa8ea Merge pull request #11331 from xt0rted/patch-1
8ff7b48 Update customizer.js
56aa2af otherwise content scrolls on chrome
3dc0ed3 Use nesting for thumbnail styles
99ffa28 Merge pull request #11324 from boki-/patch-1
bb54ce0 Update README.md
19fdd70 Merge pull request #11315 from AJAlabs/master
0d4b9ef Added navigation role to example navbars
441f9d6 Support .h1 in place of h1 inside .jumbotron
867e2be 3.0.1
147837e more grunt
9fbbce9 Merge pull request #11274 from wangsai/fix-examples-urls
697a37e Merge pull request #11282 from ZDroid/combination
b8f9f82 Add well-border variable
688ca32 Combine multiple .thumbnail > img styles
77bf572 Merge pull request #11278 from ZDroid/patch-1
8a881c7 Change tense to imperative
a8e0679 Merge pull request #11275 from jared-christensen/master
583697f JS comments pointed to new documentation
ee96637 remove unused `{{ page.base_url }}` variables, and fix the urls
a23740e run grunt
e5c3f2d restore IDs
5729f20 Merge branch 'respondjs-import-note'
96d7d4a edit
c6e76d9 Fixes #10341: don't change border color on contextual table classes
4b8c662 use regular text, not callouts
67cab7f Fixes #10516: Use auto positioning for dropdowns in justified nav to fix Firefox rendering
dcf5131 Merge pull request #11258 from ZDroid/smoothing
d1dd1fc add warning about Respond.js not supporting @import; fixes #11143
0026e56 Merge pull request #11262 from vsn4ik/fonts_perms
f0c6ac0 Remove execute permissions on fonts files.
f9eec5b Add -moz-osx-font-smoothing
30127a4 Merge pull request #11253 from ZDroid/ditch
92f0071 Ditch amp
e9ca4fa Merge pull request #11248 from tagliala/chrome-osx-select-print
58cb85b #fff of course
b09417f Fixes #11245
0365796 Merge branch 'master' of github.com:twbs/bootstrap
1ef6caf Merge pull request #11200 from yokomizor/variable_way_to_set_caret_width_base
4cfe307 Fixes #11206: remove left padding on first inline list item
0c714c3 Merge branch 'master' of github.com:twbs/bootstrap
64ffed8 Merge pull request #11244 from ZDroid/animation
aff291e Add .animation() mixin
72cfe87 Remove multiple navbar z-index callout
4fac7b6 Merge pull request #11222 from ZDroid/patch-1
20cba84 Add another newline to improve final code readability
f47510b Merge pull request #11224 from twbs/10506-doc
abc50a7 Merge pull request #11239 from twbs/qunit-equals-deprecated
7b24f3c QUnit.equals() is deprecated; use QUnit.equal() instead
f2f70a4 Merge pull request #11234 from ZDroid/patch-2
ca6729e Kick up grunt-contrib-jshint dependency
a58c83a add missing space before open curly brace
aafe3f9 fix misspelling in comment
f31aae4 fix misspelling in comment
3cd744f remove ref to nonexistent branch
c865a68 fix WebKit caps in comments
91fa801 doc that uncollapsing mobile navbar requires JS; per #10506
9d2cf56 goofed on 1 dummy <img> src attribute; thanks @extesy
54cd0f8 rm dummy 'src' attributes of <img>s & squelch validator warning; fixes #11216
0d122fc silence validator regarding http-equiv="X-UA-Compatible"
9a2d169 Add quick fix to labels and badges in buttons
eb77241 Merge pull request #11209 from ZDroid/new_year
bb3d175 Merge pull request #11208 from ZDroid/codestyle_fix
63433fb Update license year
b034362 Put a space before { due to code style
5a38a57 Scrollspy acting up when targets are hidden
5f2bd59 variable way to set @caret-width-base
89e0f16 Adjust in modal size rules
9673c25 Merge pull request #11192 from ZDroid/typo
214a789 Change upper case to lower case
eed53d7 Fixes #10601: Use overflow-y: auto; for navbar collapse instead of visible to better enable scrolling on Android 4.x
ee9be1a run grunt on last commit for gradient syntax change
eef9d5a Merge pull request #10893 from Shaun-Dychko/patch--webkit-linear-gradient
976866d Merge pull request #10729 from lipis/patch-2
9a0849d more spacing
2eec3f9 Merge branch 'master' into pr/10656
6585c58 spacing
6ecb5d6 Merge branch 'master' of github.com:twbs/bootstrap
d8fab5a Fixes #10620: remove gradient on buttons for IE9 in theme.less due to bleed through with rounded corners
98378d2 Merge pull request #11188 from twbs/navbar_zindex_auto
76baacf Remove default z-index on navbar and only set on static and fixed variants
c71f895 Fix up padding on default navbar example
e486bb4 Fixes #10433: Navbar z-index refactor
5aa4c5c fixes #11139: add position: relative; to .modal-dialog so that z-index takes effect
369f5ba Merge branch 'master' of https://github.com/jeonghwan-kim/bootstrap into jeonghwan-kim-master
dd34102 Fixes #10522: Enable use of form validation class on .radio, .checkbox, .radio-inline, and .checkbox-inline
23a85d6 fixes #11126: remove box-shadow from open dropdown toggle with .btn-link
6d5c510 Merge pull request #11186 from twbs/carousel_indicators_ie
bc76be5 Merge branch 'master' into carousel_indicators_ie
f45c05a fixes #11151: remove unused h5bp class from print CSS
5e70642 Merge branch 'master' into carousel_indicators_ie
ecadbe5 mo grunt
ac6a7f0 Merge branch 'master' into carousel_indicators_ie
ecc6d98 Merge branch 'master' of github.com:twbs/bootstrap
291fd98 run grunt dist
6a93a6b Fixes #10903 and #10457: IE8-9 don't support events on elements without background-color, so we have to hack it
438a40a Merge pull request #11183 from ZDroid/patch-1
8a9e1af Continue tag way implementation
15f15ca added bower_components to .gitignore
32468b0 Merge pull request #11166 from ZDroid/tag_way
d2ad1dc (Not HTML) tag way is much better
77bb750 Options of sizes added in modal
eb4a92b Merge pull request #11155 from twbs/ie8-file-proto-respond.js-examples-warnings
0806819 Merge pull request #11156 from twbs/mobile-modals-xref
73bb911 JS docs: add cross-reference to Getting Started mobile modal section
c23d6a2 Warn about IE8 + Respond.js + file:// problem in examples; fix #11019
4c043b7 Merge pull request #11096 from twbs/navbar-button-docs
70d85be Merge branch 'master' into navbar-button-docs
96a19c1 copy change, add to buttons anchor section
bb30f63 Merge branch 'fix-11112'
1f33dc8 even shorter banner; remove space between slash and period
c88cd1c add explicit copyright header to docs CSS & JS files; fixes #11112
872c358 Merge pull request #11150 from ZDroid/patch-1
5f79354 FIx invalid element selector
25b7a52 fix #11144
a28b2cb Merge pull request #11141 from vincentchan/master
d8a68e3 Update translation URL
693915d Active state overrides contextual list-item styles
0c2055e Adding contextual styles to list-items
3e9e339 Merge pull request #11137 from twbs/explain-https
4d663e3 add note about third-party JS, CDNs, and HTTPS
cf95fe2 upgrade to html5shiv v 3.7.0
c1bf625 Merge branch 'master' of github.com:twbs/bootstrap
8ac1495 redo the glyphicons icons list to make icons not blurry on edges /cc @jankovarik
d880398 Merge pull request #11128 from lipis/patch-3
3974819 Fixed broken link
976f6df Fixes issue #11122 -- navbar-fixed-bottom border
4dffe7d Fixes issue #11098 -- Button documentation.
e317e11 add dots to class name references for consistency
401dca0 Merge pull request #11110 from nikolawannabe/patch-1
9d54a42 Include a note about text-based form control styling
4817914 Merge branch 'master' of github.com:twbs/bootstrap
acd4a0a update jumbotron docs; fixes #11109
723f85f Merge pull request #11105 from twbs/license-note
dd5c8a5 Add Note About Changing to MIT
3bfa630 Added opacity to customizer and rebuilt customizer
160ed85 Customizable backdrop opacity
2380b6b Merge pull request #11102 from ZDroid/less-fix
0423635 Ditch `&`, as `+ ...` is enought
dc495fe nuke commented out docs css
21fad33 Resolves #10923
b05a287 run grunt
a28d953 fix #10952
67829c6 Merge pull request #11094 from twbs/address-10049
27e2c56 In docs, recommend only <div> (not <span>) for putting tooltips on disabled elements
a44bd01 Merge pull request #10533 from topsitemakers/master
f11aa31 Merge pull request #10519 from zba/master
b5d7a51 Merge pull request #10779 from ssorallen/customizer-bootstrap-less-order
4e18089 add IDs to frequently-referenced parts of the docs
036712e Merge pull request #11091 from yokomizor/extended_thumbnail_hover_state
e20b02a extended hover state of linked versions of .thumbnail
fa64846 Merge branch 'master' of github.com:twbs/bootstrap
7100711 unnest the list-group-item link variation for #11085 and #11088
3fb1381 Merge pull request #11084 from ZDroid/variable_way
256f3a9 Merge pull request #11086 from twbs/table-responsive-breakpoint
50dd5d5 fix about page html validation and run grunt
6307d2c Merge branch 'master' of github.com:twbs/bootstrap
1f5c754 remove dupe content
5c64ef3 fix .table-responsive media query; refs #11067
4ce1b08 Unhardcode .table-responsive bottom margin
70278a4 Merge pull request #11078 from twbs/issue-11019-note
efc741b Merge pull request #11082 from ZDroid/nuke_zeros
b3c04c9 Nuke trailing zeros
3431f32 Merge pull request #11079 from wangsai/mother-language
ee8ba8b Add description. And complete russian and spanish languages
3c69f59 make Getting Started page's HTML more valid
df46b1b make About page's HTML more valid
ceb7694 add note to docs about Respond.js & file:// ; fixes part of #11019
67c48f7 change english link text to chinese
9416cd3 update to latest jszip commit 04fc93045334dc1b679aba5c2dce206da777a85c 2013-10-12T12:39:56-07:00
3abe86b Merge pull request #11076 from twbs/respond-js-cdn
111b9bd Merge pull request #11077 from twbs/avoid-docs-assets-in-example
e521be0 Merge pull request #11075 from twbs/respond-js-cross-domain-note
8450aa7 avoid referencing /docs-assets/ in Getting Started docs example; use CDN URL for respond.js
202f395 Merge branch 'docs_welcome'
25607c2 add translations, copy edit a few things, and fix alignment of ads
c5da059 use CDN for respond.js
f0f1b83 fix #11003
810a852 Merge pull request #11046 from ZDroid/patch-3
9da73d7 run grunt
e7379f7 no trailing decimal place
fbc67a3 Merge branch 'master' of github.com:twbs/bootstrap
36b4639 Merge pull request #10949 from StevenBlack/jumbotron.fontsize
be4e951 scope top padding of .form-control-static to be within horizontal forms only; fixes #10927
44b32a3 move .hidden to utilities; fixes #10997
7bd9553 run grunt on that scaffolding change
5a411af Merge branch 'master' of github.com:twbs/bootstrap
f946ff5 fix #10257
7112d06 Merge pull request #10955 from ZDroid/patch-1
f660bd4 clarify more grid stuff, specifically 100% fluid designs; fixes #10711
950453d mention rows m…
  • Loading branch information
fangeugene committed Jan 20, 2014
1 parent d933c3d commit 975c581
Show file tree
Hide file tree
Showing 236 changed files with 24,997 additions and 19,836 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.py]
indent_style = space
indent_size = 4
8 changes: 8 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Enforce Unix newlines
*.css text eol=lf
*.html text eol=lf
*.js text eol=lf
*.json text eol=lf
*.less text eol=lf
*.md text eol=lf
*.yml text eol=lf
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Ignore compiled docs
# Ignore docs files
_gh_pages
_site
.ruby-version

# Numerous always-ignore extensions
*.diff
Expand Down Expand Up @@ -38,3 +39,4 @@ validation-report.json

# Folders to ignore
node_modules
bower_components
34 changes: 27 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,31 @@
language: node_js
node_js:
- 0.8
before_script:
- gem install jekyll
- npm install -g grunt-cli
- "0.10"
before_install:
- time sudo pip install --use-mirrors -r test-infra/requirements.txt
- rvm use 1.9.3 --fuzzy
- if [ "$TWBS_TEST" = validate-html ]; then echo "ruby=$(basename $(rvm gemdir)) jekyll=$JEKYLL_VERSION" > pseudo_Gemfile.lock; fi
install:
- time npm install -g grunt-cli
- time ./test-infra/s3_cache.py download 'node.js packages' package.json ./node_modules || time npm install
- if [ "$TWBS_TEST" = validate-html ]; then time ./test-infra/s3_cache.py download rubygems pseudo_Gemfile.lock $(rvm gemdir) || gem install -N jekyll -v $JEKYLL_VERSION; fi
after_script:
- if [ "$TWBS_TEST" = core ]; then time ./test-infra/s3_cache.py upload 'node.js packages' package.json ./node_modules; fi
- if [ "$TWBS_TEST" = validate-html ]; then time ./test-infra/s3_cache.py upload rubygems pseudo_Gemfile.lock $(rvm gemdir); fi
env:
global:
- secure: Besg41eyU+2mfxrywQ4ydOShMdc34ImaO0S0ENP+aCOBuyNBIgP59wy5tBMmyai2/8eInYeVps4Td96mWInMMxzTe3Bar7eTLG5tWVKRSr/wc4NBPZ/ppoPAmCEsz9Y+VptRH9/FO8n7hsL9EFZ+xBKbG+C0SccGoyBDpA5j7/w=
- secure: Ptiv7phCImFP3ALIz+sMQzrZg8k7C1gLZbFBhWxjnQr3g06wIfX3Ls5y9OHvxid+lOZZjISui3wzBVgpVHqwHUYf96+r0mo6/mJ+F4ffUmShZANVaIMD/JRTnXhUQJbvntGLvxn1EYWPdNM+2IHJrMipnjHxU9tkgAnlel4Zdew=
- TWBS_HAVE_OWN_BROWSERSTACK_KEY: ""
- JEKYLL_VERSION: 1.4.1
- SAUCE_USERNAME: bootstrap
- secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ="
- secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY="
- secure: "Gghh/e3Gsbj1+4RR9Lh2aR/xJl35HWiHqlPIeSUqE9D7uDCVTAwNce/dGL3Ew7uJPfJ6Pgr70wD3zgu3stw0Zmzayax0hiDtGwcQCxVIER08wqGANK9C2Q7PYJkNTNtiTo6ehKWbdV4Z+/U+TEYyQfpQTDbAFYk/vVpsdjp0Lmc="
- secure: "RTbRdx4G/2OTLfrZtP1VbRljxEmd6A1F3GqXboeQTldsnAlwpsES65es5CE3ub/rmixLApOY9ot7OPmNixFgC2Y8xOsV7lNCC62QVpmqQEDyGFFQKb3yO6/dmwQxdsCqGfzf9Np6Wh5V22QFvr50ZLKLd7Uhd9oXMDIk/z1MJ3o="
- secure: "Besg41eyU+2mfxrywQ4ydOShMdc34ImaO0S0ENP+aCOBuyNBIgP59wy5tBMmyai2/8eInYeVps4Td96mWInMMxzTe3Bar7eTLG5tWVKRSr/wc4NBPZ/ppoPAmCEsz9Y+VptRH9/FO8n7hsL9EFZ+xBKbG+C0SccGoyBDpA5j7/w="
- secure: "Ptiv7phCImFP3ALIz+sMQzrZg8k7C1gLZbFBhWxjnQr3g06wIfX3Ls5y9OHvxid+lOZZjISui3wzBVgpVHqwHUYf96+r0mo6/mJ+F4ffUmShZANVaIMD/JRTnXhUQJbvntGLvxn1EYWPdNM+2IHJrMipnjHxU9tkgAnlel4Zdew="
matrix:
- TWBS_TEST=core
- TWBS_TEST=validate-html
- TWBS_TEST=sauce-js-unit
- TWBS_TEST=browserstack-js-unit
matrix:
fast_finish: true
178 changes: 155 additions & 23 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,46 +2,176 @@

Looking to contribute something to Bootstrap? **Here's how you can help.**

Please take a moment to review this document in order to make the contribution
process easy and effective for everyone involved.

Following these guidelines helps to communicate that you respect the time of
the developers managing and developing this open source project. In return,
they should reciprocate that respect in addressing your issue or assessing
patches and features.

## Reporting issues

We only accept issues that are bug reports or feature requests. Bugs must be isolated and reproducible problems that we can fix within the Bootstrap core. Please read the following guidelines before opening any issue.
## Using the issue tracker

1. **Search for existing issues.** We get a lot of duplicate issues, and you'd help us out a lot by first checking if someone else has reported the same issue. Moreover, the issue may have already been resolved with a fix available.
2. **Create an isolated and reproducible test case.** Be sure the problem exists in Bootstrap's code with a [reduced test case](http://css-tricks.com/reduced-test-cases/) that should be included in each bug report.
3. **Include a live example.** Make use of jsFiddle or jsBin to share your isolated test cases.
4. **Share as much information as possible.** Include operating system and version, browser and version, version of Bootstrap, customized or vanilla build, etc. where appropriate. Also include steps to reproduce the bug.
The [issue tracker](https://github.com/twbs/bootstrap/issues) is
the preferred channel for [bug reports](#bug-reports), [features requests](#feature-requests)
and [submitting pull requests](#pull-requests), but please respect the following
restrictions:

* Please **do not** use the issue tracker for personal support requests. Stack
Overflow ([`twitter-boostrap`](http://stackoverflow.com/questions/tagged/twitter-bootstrap) tag) or [IRC](https://github.com/twbs/bootstrap/blob/master/README.md#community) are better places to get help.

* Please **do not** derail or troll issues. Keep the discussion on topic and
respect the opinions of others.

* Please **do not** open issues or pull requests regarding the code in
[`Normalize`](https://github.com/necolas/normalize.css) (open them in
their respective repositories).


## Bug reports

A bug is a _demonstrable problem_ that is caused by the code in the repository.
Good bug reports are extremely helpful, so thanks!

Guidelines for bug reports:

1. **Use the GitHub issue search** &mdash; check if the issue has already been
reported.

2. **Check if the issue has been fixed** &mdash; try to reproduce it using the
latest `master` or development branch in the repository.

3. **Isolate the problem** &mdash; ideally create a [reduced test
case](http://css-tricks.com/6263-reduced-test-cases/) and a live example.
[This JS Bin](http://jsbin.com/EBAwOkOK/1) is a helpful template.


A good bug report shouldn't leave others needing to chase you up for more
information. Please try to be as detailed as possible in your report. What is
your environment? What steps will reproduce the issue? What browser(s) and OS
experience the problem? Do other browsers show the bug differently? What
would you expect to be the outcome? All these details will help people to fix
any potential bugs.

Example:

> Short and descriptive example bug report title
>
> A summary of the issue and the browser/OS environment in which it occurs. If
> suitable, include the steps required to reproduce the bug.
>
> 1. This is the first step
> 2. This is the second step
> 3. Further steps, etc.
>
> `<url>` - a link to the reduced test case
>
> Any other information you want to share that is relevant to the issue being
> reported. This might include the lines of code that you have identified as
> causing the bug, and potential solutions (and your opinions on their
> merits).

## Feature requests

Feature requests are welcome. But take a moment to find out whether your idea
fits with the scope and aims of the project. It's up to *you* to make a strong
case to convince the project's developers of the merits of this feature. Please
provide as much detail and context as possible.


## Pull requests

- CSS changes must be done in `.less` files first, never just the compiled `.css` files
- If modifying the `.less` files, always recompile and commit the compiled files `bootstrap.css` and `bootstrap.min.css`
- Try not to pollute your pull request with unintended changes--keep them simple and small
- Try to share which browsers your code has been tested in before submitting a pull request
- Pull requests should always be against the `master` branch, never against `gh-pages`.
Good pull requests—patches, improvements, new features—are a fantastic
help. They should remain focused in scope and avoid containing unrelated
commits.

**Please ask first** before embarking on any significant pull request (e.g.
implementing features, refactoring code, porting to a different language),
otherwise you risk spending a lot of time working on something that the
project's developers might not want to merge into the project.

Please adhere to the [coding guidelines](#code-guidelines) used throughout the
project (indentation, accurate comments, etc.) and any other requirements
(such as test coverage).

Adhering to the following process is the best way to get your work
included in the project:

## Coding standards
1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork,
and configure the remotes:

```bash
# Clone your fork of the repo into the current directory
git clone https://github.com/<your-username>/bootstrap.git
# Navigate to the newly cloned directory
cd bootstrap
# Assign the original repo to a remote called "upstream"
git remote add upstream https://github.com/twbs/bootstrap.git
```

2. If you cloned a while ago, get the latest changes from upstream:

```bash
git checkout master
git pull upstream master
```

3. Create a new topic branch (off the main project development branch) to
contain your feature, change, or fix:

```bash
git checkout -b <topic-branch-name>
```

4. Commit your changes in logical chunks. Please adhere to these [git commit
message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
or your code is unlikely be merged into the main project. Use Git's
[interactive rebase](https://help.github.com/articles/interactive-rebase)
feature to tidy up your commits before making them public.

5. Locally merge (or rebase) the upstream development branch into your topic branch:

```bash
git pull [--rebase] upstream master
```

6. Push your topic branch up to your fork:

```bash
git push origin <topic-branch-name>
```

7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
with a clear title and description against the `master` branch.

**IMPORTANT**: By submitting a patch, you agree to allow the project owners to
license your work under the terms of the [MIT License](LICENSE.md).


## Code guidelines

### HTML

- Two spaces for indentation, never tabs
- Double quotes only, never single quotes
- Always use proper indentation
- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags)
- Two spaces for indentation, never tabs.
- Double quotes only, never single quotes.
- Always use proper indentation.
- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags).
- Use CDNs and HTTPS for third-party JS when possible. We don't use protocol-relative URLs in this case because they break when viewing the page locally via `file://`.

### CSS

- Adhere to the [Recess CSS property order](http://markdotto.com/2011/11/29/css-property-order/)
- Multiple-line approach (one property and value per line)
- Always a space after a property's colon (.e.g, `display: block;` and not `display:block;`)
- End all lines with a semi-colon
- For multiple, comma-separated selectors, place each selector on its own line
- CSS changes must be done in `.less` files first, never just in the compiled `.css` files.
- Adhere to the [CSS property order](http://markdotto.com/2011/11/29/css-property-order/).
- Multiple-line approach (one property and value per line).
- Always a space after a property's colon (e.g., `display: block;` and not `display:block;`).
- End all lines with a semi-colon.
- For multiple, comma-separated selectors, place each selector on its own line.
- Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks).
- Attribute selectors should only be used where absolutely necessary (e.g., form controls) and should be avoided on custom components for performance and explicitness.
- Series of classes for a component should include a base class (e.g., `.component`) and use the base class as a prefix for modifier and sub-components (e.g., `.component-lg`).
- Avoid inheritance and over nesting—use single, explicit classes whenever possible.

### JS

Expand All @@ -52,7 +182,9 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso
- "Attractive"



## License

By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twbs/bootstrap/blob/master/LICENSE
By contributing your code, you agree to license your contribution under the [MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE).

Prior to v3.1.0, Bootstrap was released under the Apache License v2.0.

Loading

0 comments on commit 975c581

Please sign in to comment.