rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity
9,240 Commits 108 Branches 89 Tags 552 MiB
3b99a41246
Commit Graph

9240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
XhmikosR
3b99a41246 Merge pull request #13388 from twbs/xhmikosr-js-style 
Improve JS style
 2014-06-07 09:13:05 +03:00
Chris Rebert
3cbbc70d55 Merge pull request #13627 from twbs/maybe-fix-12364 
Hopefully fixes trigger focus restoration on modal close
 2014-06-06 15:59:17 -07:00
XhmikosR
03a8949d7c Run grunt. 2014-06-06 01:23:07 +03:00
XhmikosR
e2cabe4971 Minor style tweaks. 2014-06-06 01:23:07 +03:00
XhmikosR
82fc03f3b6 carousel.js: remove unneeded variable assignment. 
`slideIndex` is assigned to the same value a few lines above.
 2014-06-06 01:23:07 +03:00
XhmikosR
7b0acf14d8 Comply to the new style. 2014-06-06 01:23:07 +03:00
XhmikosR
5ef9383f53 Tweak JSHint and JSCS checks. 
Be more consistent across the whole codebase.

Also, make use of JSHint's 2.5.1 `extends` and `qunit` options. This way we set our basis options in js/.jshintrc and override the rest.
 2014-06-06 01:23:06 +03:00
Chris Rebert
a8641b4db7 Merge pull request #10632 from stuartpb/patch-1 
Customizer: Alert on successful save to Gist
 2014-06-05 13:58:22 -07:00
Chris Rebert
ef436c761b Merge pull request #13740 from jasny/patch-composer-replace 
Added rename directive for composer
 2014-06-05 09:02:36 -07:00
Arnold Daniels
53b8254fe0 Added directive for composer 2014-06-05 13:24:56 +02:00
Chris Rebert
f9495eab12 Merge pull request #13732 from twbs/bump-sauce 
Bump grunt-saucelabs to ~8.0.2
 2014-06-04 13:40:23 -07:00
Chris Rebert
e91eaa2884 update shrinkwrap 
[skip validator]
 2014-06-04 12:40:53 -07:00
Chris Rebert
f0c97bf758 bump grunt-saucelabs to ~8.0.2 2014-06-04 12:38:26 -07:00
Chris Rebert
6d7c0b2513 Merge pull request #13731 from twbs/bump-deps 
Bump dependency versions
 2014-06-04 12:36:17 -07:00
Chris Rebert
19987cc285 update shrinkwrap 
[skip sauce] [skip validator]
 2014-06-04 12:21:42 -07:00
Chris Rebert
34621740b3 bump grunt-contrib-jade to ~0.12.0 2014-06-04 12:06:47 -07:00
Chris Rebert
094e42883a bump grunt-contrib-qunit to ~0.5.1 2014-06-04 12:06:03 -07:00
Chris Rebert
c0ba4622c1 Merge pull request #13716 from rustinlee/fix-creators-anchor 
Changed broken #authors anchor to #creators
 2014-06-02 13:02:27 -07:00
Rustin Wollin
22cdf4ae94 Changed broken #authors anchor to #creators 2014-06-02 15:43:57 -04:00
Chris Rebert
5a1614466d Merge pull request #13700 from twbs/role-menu-all-the-things 
add missing role="menu" attrs to .dropdown-menu elements in docs+examples
 2014-05-28 17:21:58 -07:00
Chris Rebert
95ff94091e add missing role="menu" attrs to .dropdown-menu elements in docs+examples 
Docs audit prompted by #13697.
[skip sauce]
 2014-05-28 17:18:22 -07:00
Chris Rebert
ad34c3b061 fix #13697 
[skip sauce]
 2014-05-28 16:52:47 -07:00
Chris Rebert
8e568a8e36 grunt dist 2014-05-23 15:49:13 -07:00
Chris Rebert
475dbe58b0 Merge pull request #13589 from mrobinet/scrollspy-maxScroll-with-offset 
Adjust for Scrollspy offset when calculating maxScroll.
 2014-05-23 14:36:05 -07:00
Chris Rebert
bc1ce426d9 Merge pull request #13593 from ResentedHook/master 
Add tooltip self-reference to address #12320
 2014-05-23 14:33:19 -07:00
Chris Rebert
ef62254917 Merge pull request #13557 from bassettsj/aria-describedby-tooltip-13480 
Aria describedby tooltip: #13480
 2014-05-23 14:11:15 -07:00
Chris Rebert
66bc4d1c67 Merge pull request #13668 from twbs/bump-sauce 
Bump grunt-saucelabs to ~7.0.0
 2014-05-23 13:50:09 -07:00
Chris Rebert
c6cb8abdce update shrinkwrap 
[skip validator]
 2014-05-23 12:55:08 -07:00
Chris Rebert
7b2600cfc5 bump grunt-saucelabs to ~7.0.0 2014-05-23 12:53:12 -07:00
Chris Rebert
656597e4dd Merge pull request #13667 from twbs/bump-deps 
Bump glob to ^4.0.0
 2014-05-23 12:52:29 -07:00
Chris Rebert
02ca217278 update shrinkwrap 
[skip sauce]
 2014-05-23 12:48:38 -07:00
Chris Rebert
8be8fb61bb bump glob to ^4.0.0 2014-05-23 12:29:24 -07:00
Chris Rebert
676fda9c8f Merge pull request #13626 from twbs/address-13090 
show proper error message when viewing Customizer in IE8
 2014-05-23 08:48:45 -07:00
Mark Otto
10e9fef85c Merge pull request #13651 from twbs/ios-temporal 
update explanatory comment about iOS date/time inputs bug
 2014-05-22 21:48:56 -07:00
Mark Otto
338cff1359 clarify 2014-05-22 21:39:47 -07:00
Mark Otto
46974490e4 grunt dist for docs 2014-05-22 21:39:37 -07:00
Mark Otto
4f60a7fae9 don't change code bg on callouts 2014-05-22 21:34:49 -07:00
Mark Otto
64bb8be707 more callout tweaks 2014-05-22 21:34:24 -07:00
Mark Otto
abbf6da6aa tighten up callouts and remove backgrounds 2014-05-22 21:12:13 -07:00
Mark Otto
a375069704 Merge branch 'master' of github.com:twbs/bootstrap 2014-05-22 20:57:10 -07:00
Mark Otto
ef360b61b5 clarify and danger-ify affix docs usage requirements, per #10235 2014-05-22 20:14:32 -07:00
Mark Otto
68de4bf387 Merge pull request #13463 from twbs/docs-theme-toggler 
add button to toggle the optional theme when viewing the docs
 2014-05-22 19:20:32 -07:00
Mark Otto
326f6b2b87 Merge branch 'master' into docs-theme-toggler 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/css/docs.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-05-22 18:54:25 -07:00
Mark Otto
fab9ab8fe9 Reset the padding on radio/checkbox labels in form-inline 2014-05-22 18:42:21 -07:00
Mark Otto
12b5d46f17 move it to the sidebar 2014-05-22 18:38:43 -07:00
XhmikosR
cae7dee236 Revert 4f9270cc20. 
The validator doesn't choke anymore on this and even though it's not spec compliant, it's needed for some IE versions. So until we move favicon.ico in root, this should do the job.
 2014-05-22 10:55:28 +03:00
Chris Rebert
1340a491e5 grunt dist 2014-05-21 23:37:06 -07:00
Chris Rebert
8a62f9e61f show proper error message when viewing Customizer in IE8 
Closes #13090.
[skip sauce]
 2014-05-21 21:07:16 -07:00
Chris Rebert
3261ab704e update explanatory comment about iOS date/time inputs bug 
Per:
* http://jsbin.com/purer/2/edit
* 6e8aa78384/README.md (ios-temporal-input-line-height)
Thanks @mdo <3

[skip sauce] [skip validator]
 2014-05-21 16:50:23 -07:00
Mark Otto
707b362b80 Merge branch 'master' into docs-theme-toggler 
Conflicts:
	docs/assets/css/docs.min.css
 2014-05-20 23:27:40 -07:00