]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoMerge pull request #13269 from twbs/fix-13136
Chris Rebert [Thu, 3 Apr 2014 21:07:49 +0000 (14:07 -0700)] 
Merge pull request #13269 from twbs/fix-13136

move some caching info+logic out of .travis.yml

11 years agomove some caching info+logic out of .travis.yml; fixes #13136 13269/head
Chris Rebert [Thu, 3 Apr 2014 20:18:50 +0000 (13:18 -0700)] 
move some caching info+logic out of .travis.yml; fixes #13136

11 years agoMerge pull request #13222 from twbs/fix-13126
Chris Rebert [Thu, 3 Apr 2014 20:32:34 +0000 (13:32 -0700)] 
Merge pull request #13222 from twbs/fix-13126

doc how to change the collapsed mobile navbar breakpoint

11 years agodoc how to change the collapsed mobile navbar breakpoint; fixes #13126 13222/head
Chris Rebert [Fri, 28 Mar 2014 23:54:16 +0000 (16:54 -0700)] 
doc how to change the collapsed mobile navbar breakpoint; fixes #13126

11 years agoTravis: introduce $GEMDIR env var
Chris Rebert [Thu, 3 Apr 2014 18:55:52 +0000 (11:55 -0700)] 
Travis: introduce $GEMDIR env var

11 years agogrammar
Chris Rebert [Thu, 3 Apr 2014 18:53:35 +0000 (11:53 -0700)] 
grammar

11 years agoadd timing logic+output to s3_cache.py
Chris Rebert [Thu, 3 Apr 2014 18:34:15 +0000 (11:34 -0700)] 
add timing logic+output to s3_cache.py

11 years agoRun `grunt`.
XhmikosR [Thu, 3 Apr 2014 07:53:20 +0000 (10:53 +0300)] 
Run `grunt`.

11 years agoFix the new JSHint warnings.
XhmikosR [Thu, 3 Apr 2014 07:48:30 +0000 (10:48 +0300)] 
Fix the new JSHint warnings.

11 years agoUpdate dependencies.
XhmikosR [Wed, 2 Apr 2014 13:23:20 +0000 (16:23 +0300)] 
Update dependencies.

11 years agoMerge pull request #13217 from thedavidscherer/fix-13216
Mark Otto [Thu, 3 Apr 2014 06:48:55 +0000 (23:48 -0700)] 
Merge pull request #13217 from thedavidscherer/fix-13216

fixes #13216

11 years agohelp avoid misuse of Carousel's .active when copy-pasting from examples; fix #13252
Chris Rebert [Tue, 1 Apr 2014 20:03:14 +0000 (13:03 -0700)] 
help avoid misuse of Carousel's .active when copy-pasting from examples; fix #13252

11 years agore-deprecate @screen-xs-min per #12913
Chris Rebert [Tue, 1 Apr 2014 19:49:52 +0000 (12:49 -0700)] 
re-deprecate @screen-xs-min per #12913

By definition, XS screens have no minimum size, only a maximum size.
(Symmetrically, LG screens have no maximum size, hence why there's no @screen-lg-max.)

11 years agoRun `grunt`.
XhmikosR [Tue, 1 Apr 2014 05:26:47 +0000 (08:26 +0300)] 
Run `grunt`.

11 years agoUpdate "grunt-contrib-concat" dependency.
XhmikosR [Tue, 1 Apr 2014 05:26:39 +0000 (08:26 +0300)] 
Update "grunt-contrib-concat" dependency.

11 years agoMerge pull request #13241 from twbs/address-13240
Mark Otto [Tue, 1 Apr 2014 04:12:38 +0000 (21:12 -0700)] 
Merge pull request #13241 from twbs/address-13240

explicitly doc that icon classes should only be used on empty elements

11 years agoexplicitly doc that icon classes should only be used on empty elements; closes #13240 13241/head
Chris Rebert [Mon, 31 Mar 2014 08:24:54 +0000 (01:24 -0700)] 
explicitly doc that icon classes should only be used on empty elements; closes #13240

11 years agoMerge pull request #13249 from twbs/slid-is-not-a-typo
Mark Otto [Tue, 1 Apr 2014 03:08:07 +0000 (20:08 -0700)] 
Merge pull request #13249 from twbs/slid-is-not-a-typo

Add comments in carousel.js to clarify that "slid" is not a typo

11 years agoAdd comments in carousel.js to clarify that "slid" is not a typo 13249/head
Chris Rebert [Tue, 1 Apr 2014 01:09:24 +0000 (18:09 -0700)] 
Add comments in carousel.js to clarify that "slid" is not a typo

Addresses #13248.

11 years agoMerge pull request #13239 from twbs/doc-load-in-example
Chris Rebert [Mon, 31 Mar 2014 08:49:15 +0000 (01:49 -0700)] 
Merge pull request #13239 from twbs/doc-load-in-example

add document ready jQuery wrapper in Android Browser workaround

11 years agoadd document ready jQuery wrapper in Android Browser workaround 13239/head
Chris Rebert [Mon, 31 Mar 2014 07:00:05 +0000 (00:00 -0700)] 
add document ready jQuery wrapper in Android Browser workaround

11 years agoSauce tests: update iOS to v7.1
Chris Rebert [Mon, 31 Mar 2014 01:00:06 +0000 (18:00 -0700)] 
Sauce tests: update iOS to v7.1

11 years agobump patch versions of 3 grunt tasks
Chris Rebert [Mon, 31 Mar 2014 00:26:13 +0000 (17:26 -0700)] 
bump patch versions of 3 grunt tasks

11 years agobump grunt-saucelabs to v5.1.1
Chris Rebert [Mon, 31 Mar 2014 00:17:59 +0000 (17:17 -0700)] 
bump grunt-saucelabs to v5.1.1

11 years agoModal body shift fix for IE10/11
Tyler Cipriani [Mon, 17 Mar 2014 19:04:58 +0000 (13:04 -0600)] 
Modal body shift fix for IE10/11

Closes #13103 by merging it.

11 years agoMerge pull request #13190 from twbs/fix-13175
Chris Rebert [Fri, 28 Mar 2014 18:57:07 +0000 (11:57 -0700)] 
Merge pull request #13190 from twbs/fix-13175

doc that popover content() is given the element as an arg

11 years agofixes #13216 13217/head
David Scherer [Fri, 28 Mar 2014 18:56:12 +0000 (14:56 -0400)] 
fixes #13216

change `@zindex-popover` and `@zindex-tooltip` values to be greater than
those set for `@zindex-modal` allowing tooltips and popovers to be
displayed in front of modals (and all other content).

11 years agoMerge pull request #13047 from twbs/fix-customizer
Chris Rebert [Fri, 28 Mar 2014 18:42:04 +0000 (11:42 -0700)] 
Merge pull request #13047 from twbs/fix-customizer

Fix customizer (see #13043)

11 years agogrunt update-shrinkwrap build-customizer dist 13047/head
Chris Rebert [Fri, 28 Mar 2014 04:30:28 +0000 (21:30 -0700)] 
grunt update-shrinkwrap build-customizer dist

11 years agoenhance customizer to handle transitive Less @import-s
Chris Rebert [Fri, 28 Mar 2014 04:28:21 +0000 (21:28 -0700)] 
enhance customizer to handle transitive Less @import-s

11 years agorename generateCustomCSS to generateCustomLess for accuracy
Chris Rebert [Fri, 28 Mar 2014 03:43:44 +0000 (20:43 -0700)] 
rename generateCustomCSS to generateCustomLess for accuracy

11 years agouse glob instead of fs.readdirSync since /less now has subdirs
Chris Rebert [Wed, 12 Mar 2014 21:01:09 +0000 (14:01 -0700)] 
use glob instead of fs.readdirSync since /less now has subdirs

11 years agoMerge pull request #13205 from twbs/fix-9951
Chris Rebert [Fri, 28 Mar 2014 18:01:01 +0000 (11:01 -0700)] 
Merge pull request #13205 from twbs/fix-9951

Add Gist & Customizer URLs to customized files & config.json

11 years agogrunt dist 13205/head
Chris Rebert [Fri, 28 Mar 2014 18:00:39 +0000 (11:00 -0700)] 
grunt dist

11 years agoAdd Gist & Customizer URLs to customized files & config.json
Chris Rebert [Fri, 28 Mar 2014 05:07:20 +0000 (22:07 -0700)] 
Add Gist & Customizer URLs to customized files & config.json

Fixes #9951
Fixes #12865

11 years agoFix HTML errors
Julian Thilo [Fri, 28 Mar 2014 12:03:22 +0000 (13:03 +0100)] 
Fix HTML errors

11 years agoFix tooltip viewport example
Julian Thilo [Fri, 28 Mar 2014 11:48:19 +0000 (12:48 +0100)] 
Fix tooltip viewport example

- Move example to correct location docs/examples/
- Move custom JS and CSS into stand-alone files
- Update headers and footers
- Copy-editing

11 years agoMerge pull request #13194 from twbs/normalize.css-3.0.1
XhmikosR [Fri, 28 Mar 2014 05:18:10 +0000 (07:18 +0200)] 
Merge pull request #13194 from twbs/normalize.css-3.0.1

Update normalize.css to v3.0.1

11 years agoRevert upgrade to Universal Analytics
Julian Thilo [Thu, 27 Mar 2014 21:59:26 +0000 (22:59 +0100)] 
Revert upgrade to Universal Analytics

The Google Analytics account we use cannot currently be upgraded to Universal Analytics. In order to keep using Analytics, we have to stick with Classic for now.

11 years agoChange GA events to Universal Analytics
Julian Thilo [Thu, 27 Mar 2014 20:26:21 +0000 (21:26 +0100)] 
Change GA events to Universal Analytics

11 years agoAdd TOC entry for "Third-party libraries" callout section to JS docs
Chris Rebert [Thu, 27 Mar 2014 19:47:59 +0000 (12:47 -0700)] 
Add TOC entry for "Third-party libraries" callout section to JS docs

11 years agoGruntfile.js: Remove default `report` option.
XhmikosR [Thu, 27 Mar 2014 17:45:25 +0000 (19:45 +0200)] 
Gruntfile.js: Remove default `report` option.

11 years agoMerge pull request #13195 from budnik/patch-1
Julian Thilo [Thu, 27 Mar 2014 11:22:15 +0000 (12:22 +0100)] 
Merge pull request #13195 from budnik/patch-1

fix doc typo

11 years agofix doc typo 13195/head
Дмитро Будник [Thu, 27 Mar 2014 09:54:39 +0000 (11:54 +0200)] 
fix doc typo

one can find correct name of variable just few lines below the typo

11 years agoRun `grunt`. 13194/head
XhmikosR [Thu, 27 Mar 2014 06:01:21 +0000 (08:01 +0200)] 
Run `grunt`.

11 years agoUpdate normalize.css to v3.0.1
XhmikosR [Thu, 27 Mar 2014 06:00:20 +0000 (08:00 +0200)] 
Update normalize.css to v3.0.1

11 years agoDocs: switch to the Universal Analytics code.
XhmikosR [Thu, 27 Mar 2014 05:09:43 +0000 (07:09 +0200)] 
Docs: switch to the Universal Analytics code.

11 years agodoc that popover content() is given the element as an arg; fix #13175 13190/head
Chris Rebert [Wed, 26 Mar 2014 19:49:15 +0000 (12:49 -0700)] 
doc that popover content() is given the element as an arg; fix #13175

11 years agoMerge pull request #13184 from twbs/fix-13088
Chris Rebert [Wed, 26 Mar 2014 19:42:16 +0000 (12:42 -0700)] 
Merge pull request #13184 from twbs/fix-13088

document `template` option of tooltip & popover

11 years agoDocument `template` option of tooltip & popover; fixes #13088 13184/head
Chris Rebert [Wed, 26 Mar 2014 02:12:16 +0000 (19:12 -0700)] 
Document `template` option of tooltip & popover; fixes #13088

Also capitalize column titles and descriptions.

11 years agoDocument #13186
Mark Otto [Wed, 26 Mar 2014 06:00:47 +0000 (23:00 -0700)] 
Document #13186

11 years agoMerge pull request #13178 from twbs/jekyll-1.5.0
XhmikosR [Tue, 25 Mar 2014 17:26:03 +0000 (19:26 +0200)] 
Merge pull request #13178 from twbs/jekyll-1.5.0

Update to Jekyll 1.5.0

11 years agoUpdate Jekyll to 1.5.0. 13178/head
XhmikosR [Tue, 25 Mar 2014 07:45:26 +0000 (09:45 +0200)] 
Update Jekyll to 1.5.0.

The 1.4.3 Windows bug is fixed, plus the encoding workaround isn't needed anymore.

11 years agocleanup svg
Mark Otto [Tue, 25 Mar 2014 06:57:24 +0000 (23:57 -0700)] 
cleanup svg

11 years agofixes #13026: Document more Bootstrap components in the Theme and RTL examples
Mark Otto [Tue, 25 Mar 2014 06:29:11 +0000 (23:29 -0700)] 
fixes #13026: Document more Bootstrap components in the Theme and RTL examples

11 years agogrunt
Mark Otto [Tue, 25 Mar 2014 04:16:07 +0000 (21:16 -0700)] 
grunt

11 years agoFixes #13066: Add z-index to the form control feedback icons so input groups don...
Mark Otto [Tue, 25 Mar 2014 03:07:54 +0000 (20:07 -0700)] 
Fixes #13066: Add z-index to the form control feedback icons so input groups don't render on top of them

11 years agoFixes #13037: add text-align: left; to prevent alignment change in dropdowns
Mark Otto [Tue, 25 Mar 2014 03:02:56 +0000 (20:02 -0700)] 
Fixes #13037: add text-align: left; to prevent alignment change in dropdowns

11 years agogrunt
Mark Otto [Tue, 25 Mar 2014 03:01:46 +0000 (20:01 -0700)] 
grunt

11 years agoMerge pull request #13013 from ogonkov/patch-1
Mark Otto [Tue, 25 Mar 2014 02:57:55 +0000 (19:57 -0700)] 
Merge pull request #13013 from ogonkov/patch-1

Support for hovering on cell's with some state

11 years agoexpand issue # ref to full URL
Chris Rebert [Tue, 25 Mar 2014 02:48:21 +0000 (19:48 -0700)] 
expand issue # ref to full URL

11 years agoMerge pull request #13165 from stefanneculai/master
Jacob [Tue, 25 Mar 2014 02:42:40 +0000 (22:42 -0400)] 
Merge pull request #13165 from stefanneculai/master

Fix popover when using append

11 years agogrunt
Mark Otto [Tue, 25 Mar 2014 02:41:20 +0000 (19:41 -0700)] 
grunt

11 years agoMerge pull request #13173 from twbs/fat-9461
Jacob [Tue, 25 Mar 2014 02:35:27 +0000 (22:35 -0400)] 
Merge pull request #13173 from twbs/fat-9461

fixes #9461 - Make carousel ignore non-items in carousel-inner

11 years agogrunt 13173/head
Mark Otto [Tue, 25 Mar 2014 02:31:12 +0000 (19:31 -0700)] 
grunt

11 years agoMerge branch 'master' into fat-9461
Mark Otto [Tue, 25 Mar 2014 02:30:17 +0000 (19:30 -0700)] 
Merge branch 'master' into fat-9461

11 years agoFixes #13141: Add a max-width: 100%; to label elements so IE8 wraps text
Mark Otto [Tue, 25 Mar 2014 02:26:41 +0000 (19:26 -0700)] 
Fixes #13141: Add a max-width: 100%; to label elements so IE8 wraps text

11 years agofixes #9461 - Make carousel ignore non-items in carousel-inner
fat [Tue, 25 Mar 2014 02:15:58 +0000 (19:15 -0700)] 
fixes #9461 - Make carousel ignore non-items in carousel-inner

11 years agoFixes #13158: add link to nonresponsive docs in the example
Mark Otto [Tue, 25 Mar 2014 02:13:29 +0000 (19:13 -0700)] 
Fixes #13158: add link to nonresponsive docs in the example

11 years agogrunt
Mark Otto [Tue, 25 Mar 2014 02:09:30 +0000 (19:09 -0700)] 
grunt

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 25 Mar 2014 02:08:17 +0000 (19:08 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #13079: Scope .open class in button variant mixin to immediate children
Mark Otto [Tue, 25 Mar 2014 02:08:05 +0000 (19:08 -0700)] 
Fixes #13079: Scope .open class in button variant mixin to immediate children

11 years agoMerge pull request #13167 from ZDroid/underscore
Chris Rebert [Tue, 25 Mar 2014 01:59:39 +0000 (18:59 -0700)] 
Merge pull request #13167 from ZDroid/underscore

Fix #13138: use underscore prefix to ignore directories

11 years agoMerge pull request #13168 from ZDroid/homep
Chris Rebert [Mon, 24 Mar 2014 21:01:15 +0000 (14:01 -0700)] 
Merge pull request #13168 from ZDroid/homep

Add `homepage` Bower property

11 years agoAdd `homepage` Bower property 13168/head
Zlatan Vasović [Mon, 24 Mar 2014 20:57:46 +0000 (21:57 +0100)] 
Add `homepage` Bower property

11 years agoFix #13138: use underscore prefix to ignore directories 13167/head
Zlatan Vasović [Mon, 24 Mar 2014 20:47:59 +0000 (21:47 +0100)] 
Fix #13138: use underscore prefix to ignore directories

11 years agoAdd test for popover. 13165/head
Stefan Neculai [Mon, 24 Mar 2014 17:49:06 +0000 (19:49 +0200)] 
Add test for popover.

11 years agoFix popover when using append.
Stefan Neculai [Mon, 24 Mar 2014 16:49:03 +0000 (18:49 +0200)] 
Fix popover when using append.

11 years agotests/index.html: re-indent.
XhmikosR [Mon, 24 Mar 2014 07:30:44 +0000 (09:30 +0200)] 
tests/index.html: re-indent.

11 years agotests/index.html: add missing `meta charset`.
XhmikosR [Sun, 23 Mar 2014 17:50:42 +0000 (19:50 +0200)] 
tests/index.html: add missing `meta charset`.

11 years agoUpdate QUnit to v1.14.0.
XhmikosR [Sun, 23 Mar 2014 17:49:25 +0000 (19:49 +0200)] 
Update QUnit to v1.14.0.

11 years agoSwitch to `icon` instead of `shortcut icon` to fix the HTML validation tests.
XhmikosR [Mon, 24 Mar 2014 07:28:40 +0000 (09:28 +0200)] 
Switch to `icon` instead of `shortcut icon` to fix the HTML validation tests.

11 years agoMerge pull request #12328 from benogle/bo-tooltip-adjust
Mark Otto [Sun, 23 Mar 2014 18:41:28 +0000 (11:41 -0700)] 
Merge pull request #12328 from benogle/bo-tooltip-adjust

Add tooltip `viewport` option, respect bounds of the viewport

11 years agoUpdate time-grunt to v0.3.1.
XhmikosR [Sun, 23 Mar 2014 06:13:38 +0000 (08:13 +0200)] 
Update time-grunt to v0.3.1.

11 years agoUpdate JSZip to v2.2.0.
XhmikosR [Sun, 23 Mar 2014 06:10:00 +0000 (08:10 +0200)] 
Update JSZip to v2.2.0.

11 years agoAdd tooltip `viewport` option, respect bounds of the viewport 12328/head
Ben Ogle [Mon, 20 Jan 2014 19:54:22 +0000 (11:54 -0800)] 
Add tooltip `viewport` option, respect bounds of the viewport

11 years agoMerge pull request #13137 from ZDroid/bad-st
Mark Otto [Thu, 20 Mar 2014 21:06:02 +0000 (14:06 -0700)] 
Merge pull request #13137 from ZDroid/bad-st

Remove redundant `<code>` styling

11 years agoRemove redundant `<code>` styling 13137/head
Zlatan Vasović [Thu, 20 Mar 2014 20:54:14 +0000 (21:54 +0100)] 
Remove redundant `<code>` styling

npm shouldn't have `<code>` styling.

11 years agoMerge pull request #13135 from ZDroid/color-typo
Chris Rebert [Thu, 20 Mar 2014 20:19:52 +0000 (13:19 -0700)] 
Merge pull request #13135 from ZDroid/color-typo

#ffff -> #fff

11 years ago#ffff -> #fff 13135/head
Zlatan Vasović [Thu, 20 Mar 2014 20:12:59 +0000 (21:12 +0100)] 
#ffff -> #fff

:smile:

11 years agoMerge pull request #13101 from twbs/ie8-responsive-file-warning
Chris Rebert [Thu, 20 Mar 2014 08:22:53 +0000 (01:22 -0700)] 
Merge pull request #13101 from twbs/ie8-responsive-file-warning

Move ie8-responsive-file-warning.js one dir up.

11 years agogrunt dist
Chris Rebert [Thu, 20 Mar 2014 08:16:01 +0000 (01:16 -0700)] 
grunt dist

11 years agoFix vertical alignment of temporal inputs on iOS
Rob Fletcher [Mon, 17 Mar 2014 14:36:58 +0000 (14:36 +0000)] 
Fix vertical alignment of temporal inputs on iOS

Fixes #13098
Closes #13099

11 years agoUpdate grunt-contrib-less to v0.11.0.
XhmikosR [Thu, 20 Mar 2014 04:46:32 +0000 (06:46 +0200)] 
Update grunt-contrib-less to v0.11.0.

11 years agoMerge pull request #13095 from twbs/translation_data
Mark Otto [Tue, 18 Mar 2014 22:55:09 +0000 (15:55 -0700)] 
Merge pull request #13095 from twbs/translation_data

Generate Translations list from YAML

11 years agoMerge pull request #13106 from tenmilestereo/patch-1
Julian Thilo [Tue, 18 Mar 2014 09:06:30 +0000 (10:06 +0100)] 
Merge pull request #13106 from tenmilestereo/patch-1

Updated dates in index.html

11 years ago[trivial] Updated dates 13106/head
Lewis Cowper [Tue, 18 Mar 2014 00:18:01 +0000 (00:18 +0000)] 
[trivial] Updated dates

11 years agoGenerate Translations list from YAML 13095/head
Julian Thilo [Mon, 17 Mar 2014 11:19:45 +0000 (12:19 +0100)] 
Generate Translations list from YAML

11 years agoMove ie8-responsive-file-warning.js one dir up. 13101/head
XhmikosR [Mon, 17 Mar 2014 15:47:08 +0000 (17:47 +0200)] 
Move ie8-responsive-file-warning.js one dir up.

This is a regression of d08bbdc6ec50baca9e34d2aa6e8bcfc8d6135217.

11 years agoSeparate JS includes for alerts and popovers
Julian Thilo [Mon, 17 Mar 2014 14:58:03 +0000 (15:58 +0100)] 
Separate JS includes for alerts and popovers

/cc @mdo