clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-26 21:17:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,495 Commits 116 Branches 89 Tags 631 MiB
ff6b279b3c
Commit Graph

9495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Otto
ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
Mark Otto
1de2f68bdc Merge branch 'master' of github.com:twbs/bootstrap 2014-06-26 02:49:35 -07:00
Mark Otto
719ebd8239 grunt 2014-06-26 02:49:21 -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
Mark Otto
4dcdc08d89 grunt 2014-06-25 23:03:40 -07:00
Mark Otto
b6e52d55ea Merge pull request #13905 from Jimtrim/patch-1 
Update cover.css
 2014-06-25 22:29:02 -07:00
Chris Rebert
5fb1c065eb Mozilla bug says the fix targeted v31 2014-06-25 18:04:49 -07:00
Mark Otto
4045740c54 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-06-25 16:57:22 -07:00
Mark Otto
e40df7cfac fixes #13912: make radios/checkboxes work with inline forms again 2014-06-25 16:56:36 -07:00
XhmikosR
4abb095783 Run grunt. 
Revert a991cd572c.
 2014-06-25 02:07:17 +03:00
XhmikosR
b93b7b1b6d Revert "Revert "Turn off clean-css' advanced optimizations."" 
This reverts commit e31c2edf88.
 2014-06-25 01:53:10 +03:00
Chris Rebert
a991cd572c grunt dist; closes #13914 2014-06-24 15:06:47 -07:00
Chris Rebert
e31c2edf88 Revert "Turn off clean-css' advanced optimizations." 
This reverts commit 25ca51319b.
 2014-06-24 14:54:51 -07:00
Chris Rebert
49fe75d138 update shrinkwrap to get clean-css v2.2.3 
Refs #13914
Refs https://github.com/GoalSmashers/clean-css/issues/302
 2014-06-24 14:49:44 -07:00
Chris Rebert
1aaad6481c Merge pull request #13781 from twbs/saucier 
Reenable additional Sauce browsers
 2014-06-24 13:18:46 -07:00
Chris Rebert
532dffdd46 reenable Win7 IE8-9 in Sauce 2014-06-24 12:37:44 -07:00
Chris Rebert
6352c85a65 reenable OS X Chrome in Sauce 2014-06-24 12:37:44 -07:00
Chris Rebert
389210fca6 Merge pull request #13918 from twbs/sauce-with-retries 
Enable retrying of timed-out Sauce tests
 2014-06-24 12:36:18 -07:00
Mark Otto
dad6d4445c Merge pull request #13916 from glebm/variable-order 
Move variable declaration before its use (for Sass)
 2014-06-24 12:21:10 -07:00
Chris Rebert
6ec5b8cea8 retry each test up to 3 times in the event of timeout 
Big thanks to @gvas for https://github.com/axemclion/grunt-saucelabs/pull/136 ! <3
 2014-06-24 12:17:38 -07:00
Chris Rebert
df1aee56df upgrade grunt-saucelabs to ~8.1.0 
update shrinkwrap too
 2014-06-24 12:17:24 -07:00
Gleb Mazovetskiy
8ad583063b Move variable declaration before its use for Sass 
In Sass, variable must be declared before it is used.
This also removes Miscellaneous section, because horizontal line color
and form / list paddings are Typography.
 2014-06-24 18:30:24 +02:00
Chris Rebert
c975f42e04 Merge pull request #13913 from hnrch02/webkit-keyframes 
Partly revert cb7eb674ac
 2014-06-24 09:12:27 -07:00
XhmikosR
15c63fa137 Run grunt. 2014-06-24 19:01:40 +03:00
XhmikosR
25ca51319b Turn off clean-css' advanced optimizations. 
Works around #13914.

We might give it another go in the future but the stuff this breaks over the time does not justify having it enabled. The gain in size is negligible:

dist/css/bootstrap.min.css: 108.65 kB → 109.5 kB
dist/css/bootstrap-theme.min.css: 18.84 kB → 18.86 kB
docs/assets/css/docs.min.css: 20.44 kB → 20.61 kB
 2014-06-24 19:01:40 +03:00
XhmikosR
dc7da296e4 Update dependencies. 2014-06-24 18:58:38 +03:00
Heinrich Fenkart
e9ac7c1e1c Partly revert cb7eb674ac 
Fixes #13911
 2014-06-24 17:08:16 +02:00
fat
a0e98adebf Merge branch 'fix-13386' 2014-06-23 23:08:44 -07:00
fat
0aa01f63e3 Merge branch 'master' into fix-13386 
Conflicts:
	js/carousel.js
 2014-06-23 23:08:23 -07:00
Jacob
b31c35b636 Merge pull request #13904 from twbs/revert-umd 
Revert UMD for now, due to #13812.
 2014-06-23 22:54:44 -07:00
Julian Thilo
25b06d927f grid class inconsistency 2 
32bde78e19
 2014-06-23 23:36:18 +02:00
Jim Frode Hoff
29d97d07ef Update cover.css 
Moved the inset box-shadow to .site-wrapper in order to keep the shadow at the edges even if content exceeds viewport and needs scrolling.
 2014-06-23 22:50:38 +02:00
Mark Otto
b8a04f8c60 Merge pull request #13882 from thomaswelton/issue-13713-use-variable-small 
Use @font-size-small variable to calculate <small> font-size
 2014-06-23 12:59:46 -07:00
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