Chris Rebert
|
4b194471b0
|
fix #12484
|
2014-01-31 10:32:32 -08:00 |
|
Chris Rebert
|
40d3cf6cd7
|
Merge pull request #12463 from XhmikosR/12440
Downgrade holder.js to v2.2.0.
|
2014-01-31 00:40:43 -08:00 |
|
XhmikosR
|
7b9c0a38a7
|
Downgrade holder.js to v2.2.0.
Fixes #12440.
|
2014-01-31 09:32:55 +02:00 |
|
Chris Rebert
|
2c6b099f91
|
fix "pading-right" [sic] typo in dashboard.css; fixes #12455
|
2014-01-30 20:39:12 -08:00 |
|
Chris Rebert
|
e430675d14
|
use correct+newer name for retina mixin in docs; fixes #12450
|
2014-01-30 14:46:58 -08:00 |
|
Chris Rebert
|
00685be0e9
|
Merge pull request #12445 from twbs/browserstack-runner-update
update to browserstack-runner v0.1.0
|
2014-01-30 13:01:07 -08:00 |
|
Chris Rebert
|
2f81246174
|
Merge pull request #12444 from twbs/grunt-saucelabs-update
update to grunt-saucelabs v5.0.0
|
2014-01-30 13:00:46 -08:00 |
|
Chris Rebert
|
bf0cedc624
|
update to browserstack-runner v0.1.0
|
2014-01-30 12:32:30 -08:00 |
|
Chris Rebert
|
dd6bb5a335
|
update to grunt-saucelabs v5.0.0
|
2014-01-30 12:30:55 -08:00 |
|
Chris Rebert
|
c86c8de4f2
|
rm duplicate warning callouts in Input Groups docs
|
2014-01-30 12:25:02 -08:00 |
|
Julian Thilo
|
a9567a9e0c
|
Apply eaa2b83 to master as well
|
2014-01-30 21:16:48 +01:00 |
|
Chris Rebert
|
c1a5e1443f
|
Merge pull request #12436 from XhmikosR/jquery
Update jQuery to v1.11.0.
|
2014-01-30 11:12:40 -08:00 |
|
XhmikosR
|
8939268a33
|
Update jQuery to v1.11.0.
Also, use Google's CDN per #11369.
|
2014-01-30 20:50:17 +02:00 |
|
Chris Rebert
|
7c6e4a231c
|
rm outdated note about lack of .col-{xs,sm}-offset-0; fixes #12439
|
2014-01-30 10:49:43 -08:00 |
|
Chris Rebert
|
9f26194489
|
note specific versions of IE where progress bar animation supported; fixes #12437
|
2014-01-30 10:42:44 -08:00 |
|
Mark Otto
|
1409cde7e8
|
Bump versions, run grunt
|
2014-01-30 08:30:37 -08:00 |
|
Mark Otto
|
9a6b7ab375
|
grunt
|
2014-01-30 08:14:18 -08:00 |
|
Julian Thilo
|
c2784ddd75
|
Merge pull request #12432 from ChrisRiddell/signin-email-fix
Wrong input css for signin example
|
2014-01-30 04:54:19 -08:00 |
|
Chris Riddell
|
d002f0459d
|
its an email input
|
2014-01-30 23:14:05 +10:30 |
|
Mark Otto
|
d4b1bfd667
|
grunt
|
2014-01-29 22:44:06 -08:00 |
|
Mark Otto
|
d2f1887bb5
|
Merge branch 'master' into pr/12388
Conflicts:
dist/css/bootstrap.min.css
|
2014-01-29 22:18:29 -08:00 |
|
Mark Otto
|
9195d8e8eb
|
Follow up to #11655: don't reset opacity on disabled buttons
|
2014-01-29 21:57:44 -08:00 |
|
Mark Otto
|
7ba2eede4e
|
fix css url
|
2014-01-29 21:44:36 -08:00 |
|
Mark Otto
|
80ef14a11a
|
Merge pull request #12423 from ZDroid/name
Rename pack.min.css to docs.min.css to match with docs.min.js
|
2014-01-29 21:44:01 -08:00 |
|
Mark Otto
|
d631e0b92d
|
Fix #12422: Reset height on multiple select in input size mixin
|
2014-01-29 21:34:10 -08:00 |
|
Mark Otto
|
545c957f17
|
Fixes #12424: Account for Normalize change on figure element so that we don't potentially screw folks over
|
2014-01-29 21:23:23 -08:00 |
|
Zlatan Vasović
|
00f062fc7e
|
Rename pack.min.css to docs.min.css to match with docs.min.js
|
2014-01-29 20:50:10 +01:00 |
|
Chris Rebert
|
9ec5905c07
|
Merge pull request #12415 from XhmikosR/master
Gruntfile.js: remove unused code.
|
2014-01-28 17:35:09 -08:00 |
|
Chris Rebert
|
37926839ff
|
Merge pull request #12417 from ZDroid/cmt
Remove redundant jshint comment
|
2014-01-28 15:54:23 -08:00 |
|
Zlatan Vasović
|
f8bb6811bd
|
Remove redundant jshint comment
|
2014-01-28 22:47:23 +01:00 |
|
XhmikosR
|
615f1ad4aa
|
Gruntfile.js: remove unused code.
|
2014-01-28 21:07:56 +02:00 |
|
Mark Otto
|
01dabd3391
|
Merge pull request #12406 from twbs/normalize_v3
Upgrade to Normalize v3
|
2014-01-28 10:57:31 -08:00 |
|
Mark Otto
|
a9a4d81730
|
grunt
|
2014-01-28 10:08:40 -08:00 |
|
Mark Otto
|
493d143cbd
|
v3 instead of rc1
|
2014-01-28 10:07:33 -08:00 |
|
Julian Thilo
|
3a62811bbd
|
Update javascript.html
|
2014-01-28 00:01:10 +01:00 |
|
Julian Thilo
|
0a5cb2f908
|
Fix typo
|
2014-01-27 23:07:14 +01:00 |
|
Mark Otto
|
b7ac009a52
|
Remove #8350's reset for number inputs since Normalize fixes those upstream
|
2014-01-27 12:25:39 -08:00 |
|
Mark Otto
|
400720d00b
|
Remove optgroup resets from #7611 since Normalize fixes those upstream
|
2014-01-27 12:24:35 -08:00 |
|
Mark Otto
|
6a0a139cda
|
Upgrade to Normalize v3-rc1 in prep for v3 final
|
2014-01-27 12:08:55 -08:00 |
|
Mark Otto
|
45ea456468
|
Merge branch 'master' of github.com:twbs/bootstrap
|
2014-01-27 09:42:33 -08:00 |
|
Mark Otto
|
e08e871f01
|
document id requirement in carousels per #12393
|
2014-01-27 09:24:51 -08:00 |
|
Julian Thilo
|
72a31db210
|
Merge pull request #12403 from Quy/master
Change positioning reference from left to right in affix's example.
|
2014-01-27 09:22:17 -08:00 |
|
Quy Ton
|
5c1852fb74
|
Change positioning reference from left to right in affix's example.
|
2014-01-27 09:17:57 -08:00 |
|
Chris Rebert
|
50ad304bb5
|
Merge pull request #12315 from twbs/use-shrinkwrap
Do npm caching based on npm-shrinkwrap.canonical.json
|
2014-01-26 20:46:14 -08:00 |
|
Mark Otto
|
16fd8cd01e
|
Merge pull request #12398 from twbs/deprecate-box-shadow-mixin
mark .box-shadow() mixin as deprecated
|
2014-01-26 19:15:31 -08:00 |
|
Chris Rebert
|
1a36e4fa1e
|
docs & comments: v3.1 => v3.1.0
|
2014-01-26 17:48:15 -08:00 |
|
Chris Rebert
|
602e5f8f11
|
mark .box-shadow() mixin as deprecated; fixes #12396
|
2014-01-26 17:44:01 -08:00 |
|
Chris Rebert
|
5a3f1a90ba
|
fix #12261
|
2014-01-26 14:22:06 -08:00 |
|
Alan Hamlett
|
e38fd138ce
|
fixes #10495 by forcing .navbar-brand height to prevent it's inner content from increasing navbar height
|
2014-01-25 21:40:56 -08:00 |
|
Chris Rebert
|
3157a37775
|
Merge pull request #12387 from twbs/osx-chrome
re-enable OS X Chrome in Sauce tests
|
2014-01-25 18:33:23 -08:00 |
|