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

8821 Commits

Author SHA1 Message Date
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
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
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
Mark Otto
552f170e3c even more grunt 2014-03-10 13:31:34 -07:00
Mark Otto
3fb5d0bbac Merge branch 'master' into modular-the-mixins 2014-03-10 13:21:56 -07:00
XhmikosR
91d0a6d779 Bump Jekyll version used in Travis to v1.4.2.
Note that while v1.4.3 is the latest stable version, it has a nasty Windows bug.
(https://github.com/jekyll/jekyll/issues/1948)
2014-03-10 18:32:49 +02:00
Julian Thilo
6234ba561a Merge pull request #13002 from ZDroid/hash
Add missing customizer comment
2014-03-10 11:08:56 +01:00
Zlatan Vasović
1a417357ad Add missing customizer comment 2014-03-10 08:35:50 +01:00
Zlatan Vasović
d985e5bf56 Correct the page name
"Getting started" is used in the docs.
2014-03-10 08:31:55 +01:00
Mark Otto
0b7b374691 words 2014-03-10 00:10:07 -07:00
Mark Otto
a36643dd33 Merge branch 'master' into modular-the-mixins
Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
2014-03-10 00:08:29 -07:00
Chris Rebert
6dd51fab44 fix #12771 2014-03-10 00:06:38 -07:00
Mark Otto
3a2d6e4050 Formatting, comment consolidation, and line endings 2014-03-10 00:05:57 -07:00
Mark Otto
564b79ca87 grunt 2014-03-09 23:58:29 -07:00
Mark Otto
1848b0f249 Merge branch 'master' of github.com:twbs/bootstrap 2014-03-09 23:57:31 -07:00
Mark Otto
c4bc0d2311 Merge pull request #12999 from ZDroid/outline-zero
Use `outline: 0` consistently
2014-03-09 23:57:17 -07:00
Zlatan Vasović
d50a89bea9 Use outline: 0 consistently 2014-03-10 07:55:29 +01:00
mrmrs
38d0908aff Add recompiled assets after nuking toc in mixins.less. 2014-03-09 23:51:38 -07:00
mrmrs
b0bc9ef815 Add consistent newline at end of files in less/mixins 2014-03-09 23:44:11 -07:00
mrmrs
2f380a9683 Merge branch 'master' into modular-the-mixins
* master:
  Replace some images on the Carousel example with some base64 encoded 1x1 gifs
  ugh grunt
  moar grunt
  mo copy
  http://www.youtube.com/watch?v=AJWtLf4-WWs
  grunt
  Copy change
  fix grammar in comment in forms.less
  Fixes #12759
  Fixes #12738
  replace .visible-{size} with .visible-{size}-{display} ; fixes #8869

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	less/mixins.less
2014-03-09 23:28:08 -07:00