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
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
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
df1aee56df
upgrade grunt-saucelabs to ~8.1.0
...
update shrinkwrap too
2014-06-24 12:17:24 -07:00
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
c975f42e04
Merge pull request #13913 from hnrch02/webkit-keyframes
...
Partly revert cb7eb674ac
2014-06-24 09:12:27 -07:00
15c63fa137
Run grunt.
2014-06-24 19:01:40 +03:00
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
dc7da296e4
Update dependencies.
2014-06-24 18:58:38 +03:00
e9ac7c1e1c
Partly revert cb7eb674ac
...
Fixes #13911
2014-06-24 17:08:16 +02:00
a0e98adebf
Merge branch 'fix-13386'
2014-06-23 23:08:44 -07:00
0aa01f63e3
Merge branch 'master' into fix-13386
...
Conflicts:
js/carousel.js
2014-06-23 23:08:23 -07:00
b31c35b636
Merge pull request #13904 from twbs/revert-umd
...
Revert UMD for now, due to #13812 .
2014-06-23 22:54:44 -07:00
25b06d927f
grid class inconsistency 2
...
https://github.com/twbs/bootstrap/commit/32bde78e1996a92e6b801e1f4a475d5ab48685f8
2014-06-23 23:36:18 +02:00
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
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#10038 introduced by #13772 "
This reverts commit e9d6756a1a#12909 "
This reverts commit 1c6fa9010d#13811 "
This reverts commit f347d7d955
2014-06-23 11:11:59 -07:00
bc895a4b43
Merge pull request #13900 from twbs/customize_on_your_own
...
Remove broken link
2014-06-23 10:42:13 -07:00
32bde78e19
grid class inconsistency /cc @juthilo
2014-06-23 10:41:45 -07:00
e033c5be29
Merge branch 'master' of github.com:twbs/bootstrap
2014-06-23 10:39:08 -07:00
df7cfe8652
Fixes #13903 : Restore side padding on .btn-block
2014-06-23 10:38:45 -07:00
09cf618acf
Use @font-size-small variable to calculate <small> font-size fixes #13713 #13809
2014-06-23 18:00:18 +01:00
e05a4f6ac5
Merge pull request #13901 from knownasilya/typo
...
Fix typo in css - buttons docs
2014-06-23 09:34:59 -07:00
d4ce4dbf12
fix typo in css - buttons
2014-06-23 12:25:14 -04:00
7339759fd6
Remove broken link to Customizing Bootstrap
2014-06-23 17:51:02 +02:00
9da127a8e5
Merge branch 'master' of github.com:twbs/bootstrap
2014-06-22 18:04:28 -07:00
ca54cff4ab
new homepage expo features
2014-06-22 18:04:19 -07:00
898328655f
Update dependencies.
2014-06-23 03:12:16 +03:00
e98fc373e3
Fixes #13872 more: add overrides for lg and sm input modifiers
2014-06-20 13:24:14 -07:00
34248437c3
tweak alert per #13875
2014-06-19 19:54:25 -07:00
1e53dcd137
Fixes #13872 : Always apply padding to .form-control-static for that vertical alignment
2014-06-19 18:33:41 -07:00
166b66d08a
formatting
2014-06-19 18:15:42 -07:00
8bd4163ad4
fixes #13881 : restore existing striped progress bar behavior with theme styles
2014-06-19 18:14:56 -07:00
856bc8694c
bump npm-shrinkwrap to ~3.1.4
2014-06-19 16:04:40 -07:00
1482947405
grunt
2014-06-19 15:25:50 -07:00
a4fa8d07c8
grunt dist
2014-06-19 15:24:24 -07:00
00cc166671
ids over names
2014-06-19 15:22:49 -07:00
9488bd58f9
Merge pull request #13867 from hnrch02/remove-depreacted-jscs-rules
...
Remove deprecated JSCS rules
2014-06-19 14:51:52 -07:00
f983e4944f
S H R I N K W R A P
2014-06-19 23:37:01 +02:00
a33f6f8930
Merge pull request #13866 from BBosman/ie8fontface
...
Document #13863
2014-06-19 12:45:57 -07:00
587451ad9a
Update a few source files to comply to new JSCS rules
2014-06-19 21:08:05 +02:00
09c2e41ec4
Remove deprecated JSCS rules and add requireSpaceAfterLineComment
2014-06-19 21:08:05 +02:00
7bc8db9558
Bump grunt-jscs-checker to 0.5.1
2014-06-19 21:08:04 +02:00
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
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
8c1160d91b
Document IE8 font-face weirdness
2014-06-19 16:07:18 +02:00
d37b0ffa5f
Merge pull request #13870 from BBosman/gray-light
...
Fix @gray-light in docs
2014-06-19 06:35:32 -07:00
91d2cf848b
Fix @gray-light in docs
2014-06-19 14:56:43 +02:00
abe7afd87a
Run grunt.
2014-06-19 12:58:34 +03:00
4686d1483b
Merge pull request #13829 from BBosman/preserve
...
Always use preserveComment: 'some'
2014-06-19 12:57:52 +03:00
5b4b4b5279
Merge pull request #13865 from BBosman/deprecated
...
Use full deprecation version
2014-06-19 02:18:50 -07:00
Chris Rebert