]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoadd role="alert" to Alert examples, to improve accessibility 13024/head
Chris Rebert [Tue, 11 Feb 2014 21:15:40 +0000 (13:15 -0800)] 
add role="alert" to Alert examples, to improve accessibility

Per https://github.com/paypal/bootstrap-accessibility-plugin/blob/d8fcbcd3fe86f0cb47fda0ffe269b2c7a2131f07/README.md#alert

11 years agoMerge pull request #13012 from twbs/banner
XhmikosR [Tue, 11 Mar 2014 17:50:09 +0000 (19:50 +0200)] 
Merge pull request #13012 from twbs/banner

11 years agoSimplify tasks a little bit. 13012/head
XhmikosR [Tue, 11 Mar 2014 17:48:14 +0000 (19:48 +0200)] 
Simplify tasks a little bit.

11 years agoRun usebanner before cssmin.
XhmikosR [Tue, 11 Mar 2014 09:02:45 +0000 (11:02 +0200)] 
Run usebanner before cssmin.

11 years agoMerge pull request #13018 from ORiON-/master
Julian Thilo [Tue, 11 Mar 2014 17:02:10 +0000 (18:02 +0100)] 
Merge pull request #13018 from ORiON-/master

Fixed typo at docs/examples/rtl/index.php

11 years agoFixed typo at docs/examples/rtl/index.php 13018/head
ORiON- [Tue, 11 Mar 2014 16:42:49 +0000 (18:42 +0200)] 
Fixed typo at docs/examples/rtl/index.php

The filename generated at dist/css/ called 'bootstrap-rtl.min.css'.

11 years agomoar grunt
Mark Otto [Mon, 10 Mar 2014 23:51:53 +0000 (16:51 -0700)] 
moar grunt

11 years agoremove comment
Mark Otto [Mon, 10 Mar 2014 23:43:57 +0000 (16:43 -0700)] 
remove comment

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 10 Mar 2014 23:43:01 +0000 (16:43 -0700)] 
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

11 years agoFixes #13003: Move padding on radio and checkbox options from the surrounding div...
Mark Otto [Mon, 10 Mar 2014 23:41:56 +0000 (16:41 -0700)] 
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

11 years agoMerge pull request #12998 from twbs/modular-the-mixins
Mark Otto [Mon, 10 Mar 2014 23:36:34 +0000 (16:36 -0700)] 
Merge pull request #12998 from twbs/modular-the-mixins

Modular the mixins

11 years agoMerge pull request #13001 from ZDroid/title
Mark Otto [Mon, 10 Mar 2014 22:46:59 +0000 (15:46 -0700)] 
Merge pull request #13001 from ZDroid/title

Correct the page name

11 years agoeven more grunt 12998/head
Mark Otto [Mon, 10 Mar 2014 20:31:34 +0000 (13:31 -0700)] 
even more grunt

11 years agoMerge branch 'master' into modular-the-mixins
Mark Otto [Mon, 10 Mar 2014 20:21:56 +0000 (13:21 -0700)] 
Merge branch 'master' into modular-the-mixins

11 years agoBump Jekyll version used in Travis to v1.4.2.
XhmikosR [Mon, 10 Mar 2014 14:58:16 +0000 (16:58 +0200)] 
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)

11 years agoMerge pull request #13002 from ZDroid/hash
Julian Thilo [Mon, 10 Mar 2014 10:08:56 +0000 (11:08 +0100)] 
Merge pull request #13002 from ZDroid/hash

Add missing customizer comment

11 years agoAdd missing customizer comment 13002/head
Zlatan Vasović [Mon, 10 Mar 2014 07:35:50 +0000 (08:35 +0100)] 
Add missing customizer comment

11 years agoCorrect the page name 13001/head
Zlatan Vasović [Mon, 10 Mar 2014 07:31:55 +0000 (08:31 +0100)] 
Correct the page name

"Getting started" is used in the docs.

11 years agowords
Mark Otto [Mon, 10 Mar 2014 07:10:07 +0000 (00:10 -0700)] 
words

11 years agoMerge branch 'master' into modular-the-mixins
Mark Otto [Mon, 10 Mar 2014 07:08:29 +0000 (00:08 -0700)] 
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

11 years agofix #12771
Chris Rebert [Mon, 10 Mar 2014 07:06:38 +0000 (00:06 -0700)] 
fix #12771

11 years agoFormatting, comment consolidation, and line endings
Mark Otto [Mon, 10 Mar 2014 07:05:57 +0000 (00:05 -0700)] 
Formatting, comment consolidation, and line endings

11 years agogrunt
Mark Otto [Mon, 10 Mar 2014 06:58:29 +0000 (23:58 -0700)] 
grunt

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 10 Mar 2014 06:57:31 +0000 (23:57 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoMerge pull request #12999 from ZDroid/outline-zero
Mark Otto [Mon, 10 Mar 2014 06:57:17 +0000 (23:57 -0700)] 
Merge pull request #12999 from ZDroid/outline-zero

Use `outline: 0` consistently

11 years agoUse `outline: 0` consistently 12999/head
Zlatan Vasović [Mon, 10 Mar 2014 06:55:29 +0000 (07:55 +0100)] 
Use `outline: 0` consistently

11 years agoAdd recompiled assets after nuking toc in mixins.less.
mrmrs [Mon, 10 Mar 2014 06:51:38 +0000 (23:51 -0700)] 
Add recompiled assets after nuking toc in mixins.less.

11 years agoAdd consistent newline at end of files in less/mixins
mrmrs [Mon, 10 Mar 2014 06:44:11 +0000 (23:44 -0700)] 
Add consistent newline at end of files in less/mixins

11 years agoMerge branch 'master' into modular-the-mixins
mrmrs [Mon, 10 Mar 2014 06:28:08 +0000 (23:28 -0700)] 
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

11 years agoproper var
Mark Otto [Mon, 10 Mar 2014 06:25:15 +0000 (23:25 -0700)] 
proper var

11 years agoBreak mixins.less up into smaller modules.
mrmrs [Mon, 10 Mar 2014 06:18:48 +0000 (23:18 -0700)] 
Break mixins.less up into smaller modules.

Move all deprecated vendor prefix mixins to less/mixins/vendor-prefixes.less
Create mixins directory and move partials to that directory.

FIXES #12994

11 years agoMerge pull request #12204 from twbs/fix-8869
Mark Otto [Mon, 10 Mar 2014 05:48:57 +0000 (22:48 -0700)] 
Merge pull request #12204 from twbs/fix-8869

replace .visible-{size} with .visible-{size}-{display}

11 years agoReplace some images on the Carousel example with some base64 encoded 1x1 gifs
Mark Otto [Mon, 10 Mar 2014 05:38:13 +0000 (22:38 -0700)] 
Replace some images on the Carousel example with some base64 encoded 1x1 gifs

11 years agough grunt 12204/head
Mark Otto [Mon, 10 Mar 2014 05:28:22 +0000 (22:28 -0700)] 
ugh grunt

11 years agomoar grunt
Mark Otto [Mon, 10 Mar 2014 05:19:02 +0000 (22:19 -0700)] 
moar grunt

11 years agomo copy
Mark Otto [Mon, 10 Mar 2014 05:10:58 +0000 (22:10 -0700)] 
mo copy

11 years agohttp://www.youtube.com/watch?v=AJWtLf4-WWs
Mark Otto [Mon, 10 Mar 2014 05:06:51 +0000 (22:06 -0700)] 
http://www.youtube.com/watch?v=AJWtLf4-WWs

11 years agogrunt
Mark Otto [Mon, 10 Mar 2014 05:06:14 +0000 (22:06 -0700)] 
grunt

11 years agoCopy change
Mark Otto [Mon, 10 Mar 2014 05:06:12 +0000 (22:06 -0700)] 
Copy change

11 years agoMerge branch 'master' into fix-8869
Mark Otto [Mon, 10 Mar 2014 05:01:38 +0000 (22:01 -0700)] 
Merge branch 'master' into fix-8869

11 years agofix grammar in comment in forms.less
Chris Rebert [Mon, 10 Mar 2014 04:35:48 +0000 (21:35 -0700)] 
fix grammar in comment in forms.less

11 years agoFixes #12759
Mark Otto [Mon, 10 Mar 2014 04:25:51 +0000 (21:25 -0700)] 
Fixes #12759

Ensures proper sizing and alignment of input groups within inline and
navbar forms.

* Uses `inline-table` on the input group
* Nukes the widths to `width: auto`—without this, the parent input
group doesn’t size correctly and functions as `display: table;` or
`block`

11 years agoFixes #12738
Mark Otto [Mon, 10 Mar 2014 03:45:32 +0000 (20:45 -0700)] 
Fixes #12738

* Removes default max-height from .navbar-collapse (so not every navbar
will get a max-height collapse section)
* Scopes regular 340px max-height to fixed top and bottom navbars only
(those are the only ones that really need a max-height to enable
scrolling)
* Adds a landscape media query for phones to cap the max-height at
200px for fixed navbars"

11 years agoFixes #12843: Scope label styles for horizontal forms to a media query so their narro...
Mark Otto [Mon, 10 Mar 2014 00:22:52 +0000 (17:22 -0700)] 
Fixes #12843: Scope label styles for horizontal forms to a media query so their narrow viewport display looks just like a normal form

11 years agoFixes #12669: Properly reset line-height on date inputs for all sizes; Fix IE8+'s...
Mark Otto [Mon, 10 Mar 2014 00:12:39 +0000 (17:12 -0700)] 
Fixes #12669: Properly reset line-height on date inputs for all sizes; Fix IE8+'s misaslignment of text within date inputs

11 years agoMerge pull request #12993 from twbs/mixin-table-of-contents
Mark Otto [Sun, 9 Mar 2014 23:56:00 +0000 (16:56 -0700)] 
Merge pull request #12993 from twbs/mixin-table-of-contents

Mixin table of contents

11 years agoReorganize mixins and G R U N T 12993/head
Mark Otto [Sun, 9 Mar 2014 23:50:30 +0000 (16:50 -0700)] 
Reorganize mixins and G R U N T

11 years agoMerge branch 'master' into mixin-table-of-contents
mrmrs [Sun, 9 Mar 2014 23:40:40 +0000 (16:40 -0700)] 
Merge branch 'master' into mixin-table-of-contents

* master:
  Fix bad grunt merge and then G R U N T
  Reorder the Gruntfile a bit
  Fixes #12892: Link to one of the SO articles on Bootstrap modals and YouTube
  Remove unneeded quotes.
  Rename generateRawFilesJs to generateRawFiles
  Remove redundant parens

Conflicts:
docs/assets/js/raw-files.min.js
test-infra/npm-shrinkwrap.canonical.json

11 years agoAdjusts some section titles to be more explicit.
mrmrs [Sun, 9 Mar 2014 23:25:27 +0000 (16:25 -0700)] 
Adjusts some section titles to be more explicit.

FIXES #12992

11 years agoMerge pull request #12977 from ZDroid/var
XhmikosR [Sun, 9 Mar 2014 23:16:30 +0000 (01:16 +0200)] 
Merge pull request #12977 from ZDroid/var

Rename generateRawFilesJs to generateRawFiles

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 9 Mar 2014 23:16:02 +0000 (16:16 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFix bad grunt merge and then G R U N T
Mark Otto [Sun, 9 Mar 2014 23:15:53 +0000 (16:15 -0700)] 
Fix bad grunt merge and then G R U N T

11 years agoMerge pull request #12975 from ZDroid/parens
XhmikosR [Sun, 9 Mar 2014 23:15:52 +0000 (01:15 +0200)] 
Merge pull request #12975 from ZDroid/parens

Remove redundant parens

11 years agoChanges compiled assets after changing mixins.less
mrmrs [Sun, 9 Mar 2014 23:15:35 +0000 (16:15 -0700)] 
Changes compiled assets after changing mixins.less

11 years agoAdds basic table of contents for mixins.less. You know for the kids.
mrmrs [Sun, 9 Mar 2014 23:13:37 +0000 (16:13 -0700)] 
Adds basic table of contents for mixins.less. You know for the kids.

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 9 Mar 2014 23:11:04 +0000 (16:11 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
Gruntfile.js

11 years agoReorder the Gruntfile a bit
Mark Otto [Sun, 9 Mar 2014 23:09:36 +0000 (16:09 -0700)] 
Reorder the Gruntfile a bit

11 years agoMerge pull request #12986 from twbs/unneeded-quotes
XhmikosR [Sun, 9 Mar 2014 23:07:14 +0000 (01:07 +0200)] 
Merge pull request #12986 from twbs/unneeded-quotes

Remove unneeded quotes.

11 years agoFixes #12892: Link to one of the SO articles on Bootstrap modals and YouTube
Mark Otto [Sun, 9 Mar 2014 23:03:46 +0000 (16:03 -0700)] 
Fixes #12892: Link to one of the SO articles on Bootstrap modals and YouTube

11 years agoMoves IE8 justified button border mention to docs section, not the browser bugs page...
Mark Otto [Sun, 9 Mar 2014 22:32:36 +0000 (15:32 -0700)] 
Moves IE8 justified button border mention to docs section, not the browser bugs page /cc @cvrebert

11 years agoFixes #12487: Document required use of position relative for scrollspy
Mark Otto [Sun, 9 Mar 2014 22:19:26 +0000 (15:19 -0700)] 
Fixes #12487: Document required use of position relative for scrollspy

11 years agoDocument shitty situation of multiple .navbar-right classes in #12951
Mark Otto [Sun, 9 Mar 2014 21:49:52 +0000 (14:49 -0700)] 
Document shitty situation of multiple .navbar-right classes in #12951

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 9 Mar 2014 21:39:52 +0000 (14:39 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoDocument #12476 bug in the wall of bugs
Mark Otto [Sun, 9 Mar 2014 21:17:18 +0000 (14:17 -0700)] 
Document #12476 bug in the wall of bugs

11 years agoMerge pull request #12989 from twbs/bower_ignore
Mark Otto [Sun, 9 Mar 2014 20:52:24 +0000 (13:52 -0700)] 
Merge pull request #12989 from twbs/bower_ignore

Don't ignore every dot file in Bower

11 years agogrunt
Mark Otto [Sun, 9 Mar 2014 20:50:55 +0000 (13:50 -0700)] 
grunt

11 years agoMerge pull request #12679 from twbs/sr-only-focusable
Mark Otto [Sun, 9 Mar 2014 19:39:29 +0000 (12:39 -0700)] 
Merge pull request #12679 from twbs/sr-only-focusable

add .sr-only-focusable

11 years agoMerge branch 'master' into sr-only-focusable 12679/head
Mark Otto [Sun, 9 Mar 2014 19:32:13 +0000 (12:32 -0700)] 
Merge branch 'master' into sr-only-focusable

11 years agoDon't ignore every dot file in Bower 12989/head
Mark Otto [Sun, 9 Mar 2014 19:31:42 +0000 (12:31 -0700)] 
Don't ignore every dot file in Bower

11 years agoRemove unneeded quotes. 12986/head
XhmikosR [Sun, 9 Mar 2014 09:10:15 +0000 (11:10 +0200)] 
Remove unneeded quotes.

11 years agogrunt
Mark Otto [Sun, 9 Mar 2014 05:05:23 +0000 (21:05 -0800)] 
grunt

11 years agodocument position relative firefox bug; cleanup some stuff in the browser bugs page
Mark Otto [Sun, 9 Mar 2014 04:53:16 +0000 (20:53 -0800)] 
document position relative firefox bug; cleanup some stuff in the browser bugs page

11 years agoMerge branch 'master' into sr-only-focusable
Mark Otto [Sun, 9 Mar 2014 04:34:29 +0000 (20:34 -0800)] 
Merge branch 'master' into sr-only-focusable

Conflicts:
dist/css/bootstrap.css

11 years agoMerge pull request #12983 from twbs/fat-9836
Mark Otto [Sun, 9 Mar 2014 04:10:04 +0000 (20:10 -0800)] 
Merge pull request #12983 from twbs/fat-9836

fixes #9836

11 years agogrunt 12983/head
Mark Otto [Sun, 9 Mar 2014 04:03:31 +0000 (20:03 -0800)] 
grunt

11 years agofixes #9836
fat [Sun, 9 Mar 2014 03:45:38 +0000 (19:45 -0800)] 
fixes #9836

11 years agoMerge pull request #12982 from twbs/fat-9342
Mark Otto [Sun, 9 Mar 2014 03:38:17 +0000 (19:38 -0800)] 
Merge pull request #12982 from twbs/fat-9342

fix #9342

11 years agogrunt 12982/head
Mark Otto [Sun, 9 Mar 2014 03:32:40 +0000 (19:32 -0800)] 
grunt

11 years agofix #9342
fat [Sun, 9 Mar 2014 03:20:47 +0000 (19:20 -0800)] 
fix #9342

11 years agogrunt dist
Mark Otto [Sun, 9 Mar 2014 01:40:58 +0000 (17:40 -0800)] 
grunt dist

11 years agoFix comment
Mark Otto [Sun, 9 Mar 2014 01:11:48 +0000 (17:11 -0800)] 
Fix comment

11 years agogrunt
Mark Otto [Sun, 9 Mar 2014 00:11:24 +0000 (16:11 -0800)] 
grunt

11 years agoMerge pull request #12976 from ZDroid/comment
Mark Otto [Sat, 8 Mar 2014 23:36:07 +0000 (15:36 -0800)] 
Merge pull request #12976 from ZDroid/comment

Update .hide-text() comment

11 years agoFixes #12966: Ensure icon font vars are loaded into Customizer
Mark Otto [Sat, 8 Mar 2014 23:32:24 +0000 (15:32 -0800)] 
Fixes #12966: Ensure icon font vars are loaded into Customizer

11 years agogrunt
Mark Otto [Sat, 8 Mar 2014 23:30:18 +0000 (15:30 -0800)] 
grunt

11 years agoMerge pull request #12980 from ZDroid/config-yml-quotes
Mark Otto [Sat, 8 Mar 2014 23:08:36 +0000 (15:08 -0800)] 
Merge pull request #12980 from ZDroid/config-yml-quotes

Remove redundant _config.yml quotes

11 years agoRemove redundant _config.yml quotes 12980/head
Zlatan Vasović [Sat, 8 Mar 2014 22:03:28 +0000 (23:03 +0100)] 
Remove redundant _config.yml quotes

11 years agoRename generateRawFilesJs to generateRawFiles 12977/head
Zlatan Vasović [Sat, 8 Mar 2014 09:54:41 +0000 (10:54 +0100)] 
Rename generateRawFilesJs to generateRawFiles

11 years agoUpdate .hide-text() comment 12976/head
Zlatan Vasović [Sat, 8 Mar 2014 09:49:48 +0000 (10:49 +0100)] 
Update .hide-text() comment

11 years agoRemove redundant parens 12975/head
Zlatan Vasović [Sat, 8 Mar 2014 09:44:24 +0000 (10:44 +0100)] 
Remove redundant parens

11 years agoMerge pull request #12972 from twbs/cleaner-shrinkwrap
Chris Rebert [Sat, 8 Mar 2014 05:20:06 +0000 (21:20 -0800)] 
Merge pull request #12972 from twbs/cleaner-shrinkwrap

Exclude `resolved` from npm shrinkwrap to avoid irrelevant changes

11 years agoS H R I N K W R A P 12972/head
Chris Rebert [Sat, 8 Mar 2014 00:20:53 +0000 (16:20 -0800)] 
S H R I N K W R A P

11 years agofix #12959
Chris Rebert [Sat, 8 Mar 2014 00:05:46 +0000 (16:05 -0800)] 
fix #12959

11 years agoMerge pull request #12962 from BBosman/transitions-count
Mark Otto [Fri, 7 Mar 2014 22:52:41 +0000 (14:52 -0800)] 
Merge pull request #12962 from BBosman/transitions-count

Add transition-timing-function mixin to docs

11 years agoMerge pull request #12969 from ZDroid/badge-mixin
Mark Otto [Fri, 7 Mar 2014 22:41:55 +0000 (14:41 -0800)] 
Merge pull request #12969 from ZDroid/badge-mixin

Improve badges mixinability

11 years agoMerge pull request #12970 from ZDroid/package.json-pa
Mark Otto [Fri, 7 Mar 2014 22:13:35 +0000 (14:13 -0800)] 
Merge pull request #12970 from ZDroid/package.json-pa

Remove ./ from package.json paths

11 years agoMerge pull request #12971 from ZDroid/config-yml
Mark Otto [Fri, 7 Mar 2014 22:12:48 +0000 (14:12 -0800)] 
Merge pull request #12971 from ZDroid/config-yml

Remove ./ from _config.yml paths

11 years agoRemove ./ from _config.yml paths 12971/head
Zlatan Vasović [Fri, 7 Mar 2014 22:11:59 +0000 (23:11 +0100)] 
Remove ./ from _config.yml paths

11 years agoRemove ./ from package.json paths 12970/head
Zlatan Vasović [Fri, 7 Mar 2014 22:07:38 +0000 (23:07 +0100)] 
Remove ./ from package.json paths

11 years agorm #1969 from browser bugs list per outcome of investigation
Chris Rebert [Fri, 7 Mar 2014 19:08:05 +0000 (11:08 -0800)] 
rm #1969 from browser bugs list per outcome of investigation