0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Commit Graph

9039 Commits

Author SHA1 Message Date
Mark Otto
b3f30bb70e grunt 2014-03-16 20:46:00 -07:00
Mark Otto
43cf003f9a Update gruntfile to point to new customizer nav, run grunt 2014-03-16 20:40:30 -07:00
Mark Otto
c93c371433 Merge branch 'master' of github.com:twbs/bootstrap 2014-03-16 20:38:12 -07:00
Chris Rebert
96525fdec4 move sauce_browsers.yml into /grunt/; fixes #13065 2014-03-16 20:30:50 -07:00
Chris Rebert
7cf7e42c67 Merge branch 'hnrch02-modal-toggle' 2014-03-16 20:24:59 -07:00
Heinrich Fenkart
4e4e456341 Fix #12845 - Modal#hide should only be called with an event argument
Closes #12850
2014-03-16 20:24:33 -07:00
Jacob
fa4379de08 Merge pull request #12862 from sultano/patch-1
Fixed flickering and simplified calculations
2014-03-16 20:24:21 -07:00
Zlatan Vasović
ead17b7ca6 Fix #12375: stop using document.body.scrollTop as it's deprecated in the strict mode
Closes #12377
2014-03-16 20:10:52 -07:00
Tobias Lindig
0f366e0376 correct event naming of scroll and `load' event
closes #12337
2014-03-16 19:58:12 -07:00
Mark Otto
b004c9ac39 Rename and organize nav partials for cleaner file structure 2014-03-16 19:32:08 -07:00
Mark Otto
b7ab799824 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/js/bootstrap.min.js
	docs/dist/js/bootstrap.min.js
2014-03-16 19:06:17 -07:00
Mark Otto
2a43e7e78a Break up docs into includes 2014-03-16 19:03:53 -07:00
Jacob
c6ab3fc7d8 Merge pull request #13086 from twbs/fat-fix-12983
Fat fix 12983
2014-03-16 19:00:12 -07:00
fat
dd7cab84f6 build 2014-03-16 18:44:58 -07:00
fat
615dcb5ca0 fixes #9855 2014-03-16 18:38:47 -07:00
Mark Otto
bdb70fa471 Fixes #13055: Mention outdenting more 2014-03-16 15:54:28 -07:00
Mark Otto
96344acb31 Merge branch 'master' of github.com:twbs/bootstrap 2014-03-16 15:42:25 -07:00
XhmikosR
d475da5b0f Update dependencies. 2014-03-16 06:53:15 +02:00
Mark Otto
28c230faba Merge pull request #13081 from ZDroid/blank
Add missing blank line
2014-03-15 14:41:25 -07:00
Zlatan Vasović
17812b450c Add missing blank line 2014-03-15 22:40:51 +01:00
Mark Otto
d787cffc5a relative not absolute 2014-03-15 14:39:56 -07:00
Julian Thilo
6d882a6420 Fix JSHint errors
X-Ref: 8c9739d477
2014-03-14 18:16:36 +01:00
Zlatan Vasović
74eb4882c0 Add Bower package description 2014-03-14 10:55:04 +01:00
Chris Rebert
b50d4a176f Merge pull request #13060 from twbs/role-tooltip
add role="tooltip" to tooltips by default to improve accessibility
2014-03-13 21:50:01 -07:00
Jacob
905c78129f Merge pull request #11937 from IHomer/master
Fix: IE10 or lower incorrectly determines the scrollheight of the body. ...
2014-03-13 21:45:04 -07:00
Jacob
8c9739d477 Merge pull request #11453 from moodyroto/patch-1
fix scrollspy for targets within tabs
2014-03-13 21:44:05 -07:00
Chris Rebert
8a6cdff825 add role="tooltip" to tooltips by default to improve accessibility
See https://github.com/paypal/bootstrap-accessibility-plugin/blob/master/README.md#tooltip
2014-03-13 15:05:13 -07:00
Chris Rebert
7b41aab775 Merge pull request #13048 from twbs/grunt-css-flip-0.2.0
upgrade to grunt-css-flip v0.2.0
2014-03-12 17:21:14 -07:00
Chris Rebert
1751922ca0 upgrade to grunt-css-flip v0.2.0 2014-03-12 16:59:58 -07:00
Chris Rebert
327980ddb0 remove unnecessary direct devDependency on css-flip 2014-03-12 16:51:12 -07:00
Mark Otto
acd8ba5816 Merge pull request #13039 from twbs/dropdown-pull-right-deprec
comply with .dropdown-menu.pull-right deprecation in docs
2014-03-12 15:58:19 -07:00
Chris Rebert
065fe98a29 use stricter error checking in uncached-npm-install.sh
Closes #13045
2014-03-12 13:50:11 -07:00
XhmikosR
d4a4bbb729 Update dependencies. 2014-03-12 20:22:22 +02:00
Chris Rebert
4c76c79213 comply with .dropdown-menu.pull-right deprecation in docs 2014-03-12 10:19:52 -07:00
Mark Otto
b136d42ba5 Merge pull request #13024 from twbs/role-alert
add role="alert" to Alert examples, to improve accessibility
2014-03-12 10:18:07 -07:00
XhmikosR
28d2de3703 Gruntfile.js: fix path after d08bbdc6ec. 2014-03-12 19:15:41 +02:00
Chris Rebert
08f470ea68 rework docs copy: inputs-without-labels are likely the more common case 2014-03-12 10:11:02 -07:00
Chris Rebert
4277ba62d3 add role="alert" to Alert examples, to improve accessibility
Per d8fcbcd3fe/README.md (alert)
2014-03-11 19:41:54 -07:00
XhmikosR
1902f0ab50 Merge pull request #13012 from twbs/banner 2014-03-11 19:50:09 +02:00
XhmikosR
b39a8c77c3 Simplify tasks a little bit. 2014-03-11 19:49:11 +02:00
XhmikosR
f750f7e448 Run usebanner before cssmin. 2014-03-11 19:49:11 +02:00
Julian Thilo
57f09327cc Merge pull request #13018 from ORiON-/master
Fixed typo at docs/examples/rtl/index.php
2014-03-11 18:02:10 +01:00
ORiON-
3ea69a16f9 Fixed typo at docs/examples/rtl/index.php
The filename generated at dist/css/ called 'bootstrap-rtl.min.css'.
2014-03-11 18:42:49 +02:00
Alexey
7ea9538def Support for hovering on cell's with state
If parent row are hovered, child cell with state should react to this.
2014-03-11 12:32:46 +03:00
Mark Otto
6f13a14e4b moar grunt 2014-03-10 16:51:53 -07:00
Mark Otto
5f2845f307 remove comment 2014-03-10 16:43:57 -07:00
Mark Otto
74c391b9ad Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/customize.min.js
	docs/dist/css/bootstrap.css.map
2014-03-10 16:43:01 -07:00
Mark Otto
a83ca38713 Fixes #13003: Move padding on radio and checkbox options from the surrounding div to the label to remove the no-click deadzone caused by negative margin 2014-03-10 16:41:56 -07:00
Mark Otto
82e2f87363 Merge pull request #12998 from twbs/modular-the-mixins
Modular the mixins
2014-03-10 16:36:34 -07:00
Mark Otto
ac8db909c5 Merge pull request #13001 from ZDroid/title
Correct the page name
2014-03-10 15:46:59 -07:00