rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-30 12:24:19 +01:00
Code Issues Actions Packages Releases Activity
9,294 Commits 108 Branches 89 Tags 547 MiB
24a9b34add
Commit Graph

9294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fat
f219fee07b versions 2014-05-12 21:15:16 -07:00
Jacob
c312d735d9 Merge pull request #13191 from AshleyDawson/master 
Fixed nested tab elements li activation
 2014-05-12 20:57:21 -07:00
Mark Otto
c42cd8164c Merge branch 'master' into icon_paths 
Conflicts:
	dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.css.map
 2014-05-12 20:26:23 -07:00
Mark Otto
d4c7248749 grunt dist 2014-05-12 20:26:01 -07:00
Mark Otto
5938774296 Merge pull request #13369 from armikbd/bootstrap-itsme 
Dropdown menu in justified button-group
 2014-05-12 20:23:34 -07:00
Mark Otto
d8baec85f5 remove the comment 2014-05-12 20:14:39 -07:00
Mark Otto
31956be6ef Merge branch 'master' into icon_paths 
Conflicts:
	dist/css/bootstrap-rtl.css
	dist/css/bootstrap.css.map
	dist/js/bootstrap.min.js
	docs/dist/css/bootstrap.css.map
	docs/dist/js/bootstrap.min.js
 2014-05-12 19:57:49 -07:00
Mark Otto
be18f50fd0 nuke the rtl example 2014-05-12 19:56:29 -07:00
Mark Otto
be00b82bb9 nuke the rtl docs 2014-05-12 19:55:58 -07:00
Mark Otto
0d1018cb2f grunt 2014-05-12 19:53:12 -07:00
Mark Otto
81a1825d6e Merge branch 'master' of github.com:twbs/bootstrap 2014-05-12 19:48:04 -07:00
Mark Otto
f5513fd30e nuke rtl 2014-05-12 19:47:53 -07:00
Jacob
fd0f563d8a Merge pull request #13576 from twbs/fat-12211 
fixes #12211: Scrollspy: Navs in different tabs can interfere with each ...
 2014-05-12 19:17:12 -07:00
fat
9900771aa7 fixes #12211: Scrollspy: Navs in different tabs can interfere with each othe 2014-05-12 19:15:23 -07:00
Chris Rebert
54284a13c6 Temporarily revert README deletions from #13470, 
pending the release of v3.2.0's updated hosted docs.

Fixes #13572.
 2014-05-12 12:54:10 -07:00
Mark Otto
96bdc56fde cleanup 2014-05-10 13:31:18 -07:00
Mark Otto
696844fe08 Merge pull request #13549 from danielhusar/master 
IE8 button group support
 2014-05-10 12:41:01 -07:00
Jacob
0e91b85d2a Merge pull request #13541 from gpakosz/patch-2 
Fixed affix-bottom positioning
 2014-05-10 09:41:12 -07:00
Daniel
056a192f95 Squashed commit of the following: 
commit 81324491f4913d6797c3c9e4df83a1aefd7d9116
Author: Daniel <dano.husar@gmail.com>
Date:   Sat May 10 17:37:29 2014 +0100

    use opacity mixin

commit 694b0a3fcd196e8cba9e4c23850f903c0804cb44
Author: Daniel Husar <dano.husar@gmail.com>
Date:   Fri May 9 13:47:35 2014 +0100

    Update button-groups.less
 2014-05-10 17:39:34 +01:00
XhmikosR
ed98b3dfc0 Update html5shiv to 3.7.2. 2014-05-10 09:23:53 +03:00
Chris Rebert
a217ed776d Merge pull request #13558 from twbs/nav-tabs-role-tablist 
add some ARIA roles to tabs for improved accessibility
 2014-05-09 23:12:46 -07:00
Chris Rebert
90138390ba Merge pull request #13559 from twbs/carousel-role 
add role="button" to [data-slide="prev"],[data-slide="next"] to improve accessibility
 2014-05-09 16:02:56 -07:00
Chris Rebert
b7ac0d401f add role="button" to [data-slide="prev"],[data-slide="next"] to improve accessibility 
Per https://github.com/paypal/bootstrap-accessibility-plugin/blob/master/README.md#carousel
Credit: https://github.com/paypal/bootstrap-accessibility-plugin
 2014-05-09 15:31:52 -07:00
Chris Rebert
0a808fc56c add role="tab" to .nav-tabs [data-toggle="tab"] 
Per https://github.com/paypal/bootstrap-accessibility-plugin#tab-panel
Credit: https://github.com/paypal/bootstrap-accessibility-plugin
 2014-05-09 15:12:57 -07:00
Chris Rebert
e9374c0609 add role="tablist" to .nav-tabs in examples to improve accessibility 
Per https://github.com/paypal/bootstrap-accessibility-plugin#tab-panel
Credit: https://github.com/paypal/bootstrap-accessibility-plugin
 2014-05-09 15:05:20 -07:00
Chris Rebert
48fd9e29a2 Merge pull request #13543 from twbs/fix-13305 
Customizer: make utilities.less inclusion mandatory
 2014-05-08 17:20:36 -07:00
Chris Rebert
e6788ef979 Customizer: make utilities.less inclusion mandatory 
Fixes #13305.
 2014-05-08 16:49:19 -07:00
Chris Rebert
cb2ef1eff4 grunt dist 2014-05-08 16:35:03 -07:00
Mark Otto
510f4fe50a Fixes #13478, reverts #10941 2014-05-08 15:41:08 -07:00
Gregory Pakosz
78cac11cef Fixed affix-bottom positioning 
Set top position to (scrollHeight - this.$element.height() - offsetBottom).
 2014-05-09 00:26:31 +02:00
Chris Rebert
91607900c0 Merge pull request #13536 from Quy/master 
Remove outdated rtl nav links
 2014-05-08 10:33:13 -07:00
Quy Ton
5f6304bd65 Remove outdated rtl nav links 2014-05-08 07:20:25 -07:00
Mark Otto
6a803ad777 Update .travis.yml 2014-05-07 23:37:41 -07:00
Mark Otto
00b6f27897 Merge pull request #13531 from twbs/grunt-html-docs 
move Grunt info from README into HTML docs
 2014-05-07 21:30:22 -07:00
Chris Rebert
bdd822a94c regenerate minified docs JS & CSS 2014-05-07 20:19:40 -07:00
Chris Rebert
5d8880fdfa move Grunt info from README into HTML docs 
Fixes #13470
 2014-05-07 19:38:27 -07:00
Chris Rebert
7d0f7e8441 add button to toggle the optional theme when viewing the docs; fixes #9764 2014-05-07 16:12:42 -07:00
Mark Otto
f0daa64a29 move rtl to getting started, per @cvrebert's feedback 2014-05-07 15:30:27 -07:00
Mark Otto
7408917887 Merge pull request #13499 from twbs/clarify-rtl 
emphasize that bootstrap-rtl.css & bootstrap.css should not be used together
 2014-05-07 15:28:08 -07:00
Chris Rebert
16cff71ba4 Merge pull request #13504 from Quy/resputil 
Fix .visible-print deprecation version #.
 2014-05-07 14:35:33 -07:00
Chris Rebert
aa877571f3 Merge pull request #13528 from twbs/unlock-jscs 
unlock & bump grunt-jscs-checker to ~0.4.3
 2014-05-07 13:37:48 -07:00
Chris Rebert
150ca95b19 unlock & bump grunt-jscs-checker to ~0.4.3 2014-05-07 13:28:02 -07:00
Chris Rebert
d36c150569 tweak formatting in Carousel docs for clarity; fixes #13522 2014-05-06 11:34:46 -07:00
XhmikosR
06fae12023 Update JSZip to v2.2.2. 2014-05-06 12:43:41 +03:00
Chris Rebert
9444df2476 Merge pull request #13511 from hnrch02/button-reset-falsey-values-fix 
Allow for resetText of a button to be a falsey value; fixes #13466
 2014-05-05 22:55:05 -07:00
Chris Rebert
a032c396ee Merge pull request #13406 from EnsignR/closed.bs.alert-after-remove 
fires closed.bs.alert *after* DOM detach() as per #12379
 2014-05-05 22:47:50 -07:00
Chris Rebert
c3f294dae7 Merge pull request #13514 from twbs/jscs 
bump grunt-jscs-checker to v0.4.1
 2014-05-05 12:36:58 -07:00
Chris Rebert
64fdbd7621 bump grunt-jscs-checker to v0.4.1; refs #13512 2014-05-05 12:31:17 -07:00
Chris Rebert
5728b5791c update-shrinkwrap 2014-05-05 12:13:14 -07:00
Chris Rebert
b100e15d41 temporarily lock grunt-jscs-checker to v0.4.0 
Per #13512 & https://github.com/mdevils/node-jscs/issues/357
 2014-05-05 12:08:04 -07:00