rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-14 02:24:00 +01:00
Code Issues Actions Packages Releases Activity
8,343 Commits 108 Branches 89 Tags 553 MiB
45e65eef3d
Commit Graph

8343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zlatan Vasović
09f62f6a7a Improve alignment of the dashboard placeholder images 
Fixes #12435
 2014-02-01 22:46:55 +01:00
Chris Rebert
9c054fd4c0 Merge pull request #12503 from ZDroid/ed 
Don't re-set indent style for [*.py]
 2014-02-01 13:35:12 -08:00
Zlatan Vasović
59a38b7bf6 Don't re-set indent style for [*.py] 
Just inherit it from [*].
 2014-02-01 14:37:19 +01:00
Chris Rebert
d6f25e13ec mv .img-responsive docs from Overview to Images section 2014-02-01 00:26:46 -08:00
Chris Rebert
362708acdd Merge pull request #12480 from twbs/clarify-jquery-err-msg 
Clarify JS error message about missing jQuery
 2014-01-31 14:13:27 -08:00
Mark Otto
58bf3f9432 grunt after last commits 2014-01-31 13:40:32 -08:00
Mark Otto
9f36bc2bf6 Merge pull request #12448 from PHLAK/master 
Fix issue causing .navbar-brand element height to be shorter than .navbar height
 2014-01-31 13:39:23 -08:00
Mark Otto
1802cedbc1 Use scss option instead of css for better highlighting 2014-01-31 13:12:31 -08:00
Chris Rebert
4b194471b0 fix #12484 2014-01-31 10:32:32 -08:00
Chris Rebert
623d650758 most of Bootstrap's components are pure CSS and thus don't require jQuery 
Refs https://news.ycombinator.com/item?id=7156305
 2014-01-31 09:50:47 -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 Kankiewicz
22e576c600 Fix issue causing .navbar-brand element height to be shorter than .navbar height 2014-01-30 14:59:54 -07: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