0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Commit Graph

9716 Commits

Author SHA1 Message Date
Chris Rebert
c2c19a4d2d Revert UMD (#13772 & friends) for now, due to #13812.
Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0.

Revert "some changes from #13801 - add strict mode back and =="
This reverts commit 2b302f69ee.

Revert "Fix regression of #10038 introduced by #13772"
This reverts commit e9d6756a1a.

Revert "MD/CommonJS/Globals #12909"
This reverts commit 1c6fa9010d.

Revert "address #13811"
This reverts commit f347d7d955.

Conflicts:
    js/carousel.js
    js/collapse.js
    js/dropdown.js
    js/modal.js
    js/tab.js
    js/tooltip.js
2014-06-23 11:11:59 -07:00
Mark Otto
bc895a4b43 Merge pull request #13900 from twbs/customize_on_your_own
Remove broken link
2014-06-23 10:42:13 -07:00
Mark Otto
32bde78e19 grid class inconsistency /cc @juthilo 2014-06-23 10:41:45 -07:00
Mark Otto
e033c5be29 Merge branch 'master' of github.com:twbs/bootstrap 2014-06-23 10:39:08 -07:00
Mark Otto
df7cfe8652 Fixes #13903: Restore side padding on .btn-block 2014-06-23 10:38:45 -07:00
Thomas Welton
09cf618acf Use @font-size-small variable to calculate <small> font-size fixes #13713 #13809 2014-06-23 18:00:18 +01:00
Chris Rebert
e05a4f6ac5 Merge pull request #13901 from knownasilya/typo
Fix typo in css - buttons docs
2014-06-23 09:34:59 -07:00
Ilya Radchenko
d4ce4dbf12 fix typo in css - buttons 2014-06-23 12:25:14 -04:00
Julian Thilo
7339759fd6 Remove broken link to Customizing Bootstrap 2014-06-23 17:51:02 +02:00
Mark Otto
9da127a8e5 Merge branch 'master' of github.com:twbs/bootstrap 2014-06-22 18:04:28 -07:00
Mark Otto
ca54cff4ab new homepage expo features 2014-06-22 18:04:19 -07:00
XhmikosR
898328655f Update dependencies. 2014-06-23 03:12:16 +03:00
Mark Otto
e98fc373e3 Fixes #13872 more: add overrides for lg and sm input modifiers 2014-06-20 13:24:14 -07:00
Mark Otto
34248437c3 tweak alert per #13875 2014-06-19 19:54:25 -07:00
Mark Otto
1e53dcd137 Fixes #13872: Always apply padding to .form-control-static for that vertical alignment 2014-06-19 18:33:41 -07:00
Mark Otto
166b66d08a formatting 2014-06-19 18:15:42 -07:00
Mark Otto
8bd4163ad4 fixes #13881: restore existing striped progress bar behavior with theme styles 2014-06-19 18:14:56 -07:00
Chris Rebert
856bc8694c bump npm-shrinkwrap to ~3.1.4 2014-06-19 16:04:40 -07:00
Mark Otto
1482947405 grunt 2014-06-19 15:25:50 -07:00
Mark Otto
a4fa8d07c8 grunt dist 2014-06-19 15:24:24 -07:00
Mark Otto
00cc166671 ids over names 2014-06-19 15:22:49 -07:00
Chris Rebert
9488bd58f9 Merge pull request #13867 from hnrch02/remove-depreacted-jscs-rules
Remove deprecated JSCS rules
2014-06-19 14:51:52 -07:00
Heinrich Fenkart
f983e4944f S H R I N K W R A P 2014-06-19 23:37:01 +02:00
Mark Otto
a33f6f8930 Merge pull request #13866 from BBosman/ie8fontface
Document #13863
2014-06-19 12:45:57 -07:00
Heinrich Fenkart
587451ad9a Update a few source files to comply to new JSCS rules 2014-06-19 21:08:05 +02:00
Heinrich Fenkart
09c2e41ec4 Remove deprecated JSCS rules and add requireSpaceAfterLineComment 2014-06-19 21:08:05 +02:00
Heinrich Fenkart
7bc8db9558 Bump grunt-jscs-checker to 0.5.1 2014-06-19 21:08:04 +02:00
Chris Rebert
77ff226e3f Merge pull request #13877 from twbs/npm-shrinkwrap
Switch to uber/npm-shrinkwrap for npm-shrinkwrap.json generation
2014-06-19 11:58:41 -07:00
Chris Rebert
3c4ba2a08c Switch to uber/npm-shrinkwrap for npm-shrinkwrap.json generation
Instead of our homegrown grunt/shrinkwrap.js
Fixes #13483.
New npm-shrinkwrap.json is human-readable but still in a consistent/stable format.
Should aid debugging, produce better diffs, and be less prone to merge conflicts
2014-06-19 11:46:37 -07:00
Bas Bosman
8c1160d91b Document IE8 font-face weirdness 2014-06-19 16:07:18 +02:00
Chris Rebert
d37b0ffa5f Merge pull request #13870 from BBosman/gray-light
Fix @gray-light in docs
2014-06-19 06:35:32 -07:00
Bas Bosman
91d2cf848b Fix @gray-light in docs 2014-06-19 14:56:43 +02:00
XhmikosR
abe7afd87a Run grunt. 2014-06-19 12:58:34 +03:00
XhmikosR
4686d1483b Merge pull request #13829 from BBosman/preserve
Always use preserveComment: 'some'
2014-06-19 12:57:52 +03:00
Mark Otto
5b4b4b5279 Merge pull request #13865 from BBosman/deprecated
Use full deprecation version
2014-06-19 02:18:50 -07:00
Bas Bosman
ae793ad749 Use full deprecation version 2014-06-19 11:09:35 +02:00
XhmikosR
0418c7678d Update JSZip to v2.3.0. 2014-06-19 12:03:10 +03:00
Mark Otto
bd541083f1 Nuke equal height columns example; got a few bugs that make it not ready for prime time in v3.2 2014-06-19 02:02:23 -07:00
Mark Otto
162a27f67a grunt 2014-06-18 23:50:16 -07:00
Mark Otto
f685f2a670 Merge pull request #13861 from twbs/new_striped_progress_bar_class
Make striped progress bars its own class
2014-06-18 23:32:17 -07:00
Mark Otto
a012ba465d lol words 2014-06-18 23:21:44 -07:00
Mark Otto
99f176e7ec rewrite striped and active to deprecate the parent selectors, change the docs 2014-06-18 22:35:05 -07:00
Mark Otto
d4eb5552b3 Merge branch 'master' into new_striped_progress_bar_class 2014-06-18 22:29:37 -07:00
Mark Otto
53d68a099d Merge pull request #13859 from twbs/skew_you
Change skew(x,y) to skewX skewY
2014-06-18 22:27:12 -07:00
Mark Otto
d222c21f84 grunt 2014-06-18 22:24:56 -07:00
Mark Otto
e93bf15f60 Merge branch 'master' of github.com:twbs/bootstrap 2014-06-18 22:23:52 -07:00
Mark Otto
4c21146ce3 Merge pull request #13860 from twbs/fixes_13346
Add a variable for .dl-horizontal's offset
2014-06-18 22:23:42 -07:00
Mark Otto
74982cf101 grunt 2014-06-18 22:23:31 -07:00
Mark Otto
02642350f8 Fixes #13400, #13415: actually document the existing practice for links in panel headings 2014-06-18 22:16:15 -07:00
Mark Otto
2a380f6bd8 fixes #13347: make striped progress bars its own class 2014-06-18 21:58:29 -07:00