]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoremove needless space character 12271/head
Tobias Lindig [Fri, 17 Jan 2014 12:34:03 +0000 (13:34 +0100)] 
remove needless space character

11 years agoRevert "Add tooltip `viewport` option, respect bounds of the viewport"
Chris Rebert [Fri, 17 Jan 2014 04:31:19 +0000 (20:31 -0800)] 
Revert "Add tooltip `viewport` option, respect bounds of the viewport"

This reverts commit edb221a20ceabebd427e27d0432e94a227717217.
Reverting due to broken JS unit tests.

Conflicts:
docs/javascript.html

11 years agoMerge pull request #12267 from twbs/ie-10
Chris Rebert [Fri, 17 Jan 2014 04:07:43 +0000 (20:07 -0800)] 
Merge pull request #12267 from twbs/ie-10

enable IE10 for Sauce tests

11 years agoMerge branch 'bo-tooltip-viewport' of https://github.com/benogle/bootstrap into benog...
Mark Otto [Fri, 17 Jan 2014 04:01:28 +0000 (20:01 -0800)] 
Merge branch 'bo-tooltip-viewport' of https://github.com/benogle/bootstrap into benogle-bo-tooltip-viewport

Conflicts:
docs/javascript.html

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Fri, 17 Jan 2014 04:00:36 +0000 (20:00 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoSplit box-sizing reset for faster rendering
Mark Otto [Fri, 17 Jan 2014 04:00:28 +0000 (20:00 -0800)] 
Split box-sizing reset for faster rendering

11 years agoenable IE10 for Sauce tests 12267/head
Chris Rebert [Fri, 17 Jan 2014 02:17:33 +0000 (18:17 -0800)] 
enable IE10 for Sauce tests

11 years agotemporarily disable OS X Chrome Sauce test since it's being flaky
Chris Rebert [Fri, 17 Jan 2014 03:52:24 +0000 (19:52 -0800)] 
temporarily disable OS X Chrome Sauce test since it's being flaky

e.g.:
Tested http://127.0.0.1:3000/js/tests/index.html
Environment: OS X 10.9::chrome
>> Timeout, waited for more than 300000 milliseconds

11 years agoMerge pull request #12265 from twbs/ie-11
Chris Rebert [Fri, 17 Jan 2014 01:00:46 +0000 (17:00 -0800)] 
Merge pull request #12265 from twbs/ie-11

enable IE11 in Sauce tests

11 years agoMerge pull request #12264 from twbs/mavericks-safari-7
Chris Rebert [Fri, 17 Jan 2014 00:10:50 +0000 (16:10 -0800)] 
Merge pull request #12264 from twbs/mavericks-safari-7

upgrade to Safari 7 in Sauce tests

11 years agoenable IE11 in Sauce tests 12265/head
Chris Rebert [Thu, 16 Jan 2014 23:35:08 +0000 (15:35 -0800)] 
enable IE11 in Sauce tests

11 years agoMerge pull request #12262 from twbs/osx-firefox
Chris Rebert [Thu, 16 Jan 2014 23:25:50 +0000 (15:25 -0800)] 
Merge pull request #12262 from twbs/osx-firefox

re-enable OS X Firefox in Sauce tests

11 years agogrunt
Mark Otto [Thu, 16 Jan 2014 23:03:34 +0000 (15:03 -0800)] 
grunt

11 years agoupgrade to Safari 7 in Sauce tests 12264/head
Chris Rebert [Thu, 16 Jan 2014 22:51:41 +0000 (14:51 -0800)] 
upgrade to Safari 7 in Sauce tests

11 years agore-enable OS X Firefox in Sauce tests 12262/head
Chris Rebert [Thu, 16 Jan 2014 22:47:11 +0000 (14:47 -0800)] 
re-enable OS X Firefox in Sauce tests

11 years agoadd missing paren
fat [Thu, 16 Jan 2014 22:28:21 +0000 (14:28 -0800)] 
add missing paren

11 years agotooltip subpixel test fixes
fat [Thu, 16 Jan 2014 22:25:28 +0000 (14:25 -0800)] 
tooltip subpixel test fixes

11 years agoremove flaky pos bottom test which is effect by unit scroll pos
fat [Thu, 16 Jan 2014 21:44:08 +0000 (13:44 -0800)] 
remove flaky pos bottom test which is effect by unit scroll pos

11 years agonew qunit
fat [Thu, 16 Jan 2014 21:33:09 +0000 (13:33 -0800)] 
new qunit

11 years agoMerge pull request #12260 from patricker/patch-1
Chris Rebert [Thu, 16 Jan 2014 18:55:22 +0000 (10:55 -0800)] 
Merge pull request #12260 from patricker/patch-1

Update javascript.html to fix Tabs example

11 years agoUpdate javascript.html 12260/head
patricker [Thu, 16 Jan 2014 18:41:34 +0000 (11:41 -0700)] 
Update javascript.html

Fixed issue in Tabs example where the div had been marked as 'active' but the li had not been.  The correct tab of data would be displayed on load, but no tabs would be highlighted.  The tabs with fade example does not have this issue.  jsFiddle: http://jsfiddle.net/uXV56/

11 years agoMerge pull request #12258 from ibash/master
Chris Rebert [Thu, 16 Jan 2014 18:18:52 +0000 (10:18 -0800)] 
Merge pull request #12258 from ibash/master

Fixing js error in IE9 where no transition is supported

11 years agoFixing js error in IE9 where no transition is supported 12258/head
Islam Sharabash [Thu, 16 Jan 2014 17:34:16 +0000 (09:34 -0800)] 
Fixing js error in IE9 where no transition is supported

11 years agoMerge pull request #12252 from browserstack/browserstack-runner
Chris Rebert [Thu, 16 Jan 2014 07:14:13 +0000 (23:14 -0800)] 
Merge pull request #12252 from browserstack/browserstack-runner

Browserstack runner tunnel timeout

11 years agoadd debug for browserstack-runner 12252/head
Rahul Nawani [Thu, 16 Jan 2014 06:26:08 +0000 (11:56 +0530)] 
add debug for browserstack-runner

11 years agoupdate browserstack-runner package
Rahul Nawani [Thu, 16 Jan 2014 06:25:44 +0000 (11:55 +0530)] 
update browserstack-runner package

11 years agoMerge pull request #12245 from twbs/footer-links
Mark Otto [Thu, 16 Jan 2014 04:14:37 +0000 (20:14 -0800)] 
Merge pull request #12245 from twbs/footer-links

add Issues & Releases links back to footer

11 years agoadd Issues & Releases links back to footer 12245/head
Chris Rebert [Thu, 16 Jan 2014 01:29:54 +0000 (17:29 -0800)] 
add Issues & Releases links back to footer

11 years agoreassert #12231 & #12232 (merge went badly?)
Chris Rebert [Thu, 16 Jan 2014 01:07:08 +0000 (17:07 -0800)] 
reassert #12231 & #12232 (merge went badly?)

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Thu, 16 Jan 2014 00:25:29 +0000 (16:25 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
docs/assets/css/pack.min.css

11 years agofix ad placement
Mark Otto [Thu, 16 Jan 2014 00:25:04 +0000 (16:25 -0800)] 
fix ad placement

11 years agoFix customizer's toggle buttons' margin
Julian Thilo [Thu, 16 Jan 2014 00:19:00 +0000 (01:19 +0100)] 
Fix customizer's toggle buttons' margin

11 years agoAdapt about.html lead to latest changes
Julian Thilo [Thu, 16 Jan 2014 00:08:00 +0000 (01:08 +0100)] 
Adapt about.html lead to latest changes

11 years agoFix footer links
Julian Thilo [Wed, 15 Jan 2014 23:57:27 +0000 (00:57 +0100)] 
Fix footer links

11 years agoincrease Sauce concurrency
Chris Rebert [Wed, 15 Jan 2014 23:55:47 +0000 (15:55 -0800)] 
increase Sauce concurrency

Per https://github.com/twbs/bootstrap/issues/11087#issuecomment-32309827
Thanks @admc & @saucelabs !

11 years agoMerge pull request #12243 from twbs/cleanup-about
Mark Otto [Wed, 15 Jan 2014 23:54:35 +0000 (15:54 -0800)] 
Merge pull request #12243 from twbs/cleanup-about

move Community & Translations docs sections from About to Getting Started

11 years agomove Community & Translations docs sections from About to Getting Started 12243/head
Chris Rebert [Wed, 15 Jan 2014 23:34:10 +0000 (15:34 -0800)] 
move Community & Translations docs sections from About to Getting Started

11 years agoMerge pull request #12242 from twbs/sass-contributing
Mark Otto [Wed, 15 Jan 2014 23:27:07 +0000 (15:27 -0800)] 
Merge pull request #12242 from twbs/sass-contributing

add link to Sass CONTRIBUTING file in the About page

11 years agoAdhere to MailChimp's brand guidelines ;)
Julian Thilo [Wed, 15 Jan 2014 23:22:05 +0000 (00:22 +0100)] 
Adhere to MailChimp's brand guidelines ;)

11 years agoRemove popovers from components.html lead
Julian Thilo [Wed, 15 Jan 2014 23:17:04 +0000 (00:17 +0100)] 
Remove popovers from components.html lead

because they're only really featured on javascript.html
Replacement: input groups

11 years agoadd link to Sass CONTRIBUTING file in the About page 12242/head
Chris Rebert [Wed, 15 Jan 2014 23:02:13 +0000 (15:02 -0800)] 
add link to Sass CONTRIBUTING file in the About page

11 years agoremove inaccurate comment
Chris Rebert [Wed, 15 Jan 2014 22:29:58 +0000 (14:29 -0800)] 
remove inaccurate comment

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Wed, 15 Jan 2014 23:01:50 +0000 (15:01 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFix page headers
Mark Otto [Wed, 15 Jan 2014 23:01:41 +0000 (15:01 -0800)] 
Fix page headers

11 years agoGetting Started: fix ID of heading so matches TOC
Chris Rebert [Wed, 15 Jan 2014 22:26:29 +0000 (14:26 -0800)] 
Getting Started: fix ID of heading so matches TOC

11 years agoadd a couple commas
Chris Rebert [Wed, 15 Jan 2014 21:44:23 +0000 (13:44 -0800)] 
add a couple commas

11 years agoMerge pull request #12241 from twbs/jekyll-encoding
Chris Rebert [Wed, 15 Jan 2014 21:43:12 +0000 (13:43 -0800)] 
Merge pull request #12241 from twbs/jekyll-encoding

Set Jekyll encoding and tweak Windows notes

11 years agoindentation and page header changes
Mark Otto [Wed, 15 Jan 2014 21:24:34 +0000 (13:24 -0800)] 
indentation and page header changes

11 years agoSet Jekyll encoding and tweak Windows notes 12241/head
Julian Thilo [Wed, 15 Jan 2014 21:18:35 +0000 (22:18 +0100)] 
Set Jekyll encoding and tweak Windows notes

11 years agoMerge branch 'master' into docs_derp
Mark Otto [Wed, 15 Jan 2014 21:08:35 +0000 (13:08 -0800)] 
Merge branch 'master' into docs_derp

Conflicts:
docs/components.html
docs/css.html

11 years agoMerge pull request #12232 from twbs/mixing-docs
Mark Otto [Wed, 15 Jan 2014 05:47:24 +0000 (21:47 -0800)] 
Merge pull request #12232 from twbs/mixing-docs

clarify docs regarding non-mixable components

11 years agoMerge pull request #12231 from twbs/callouts
Mark Otto [Wed, 15 Jan 2014 05:46:46 +0000 (21:46 -0800)] 
Merge pull request #12231 from twbs/callouts

callout severity tweaks

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Wed, 15 Jan 2014 05:45:10 +0000 (21:45 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
docs/assets/js/customize.min.js

11 years agoFixes #12210: badges in xs buttons
Mark Otto [Wed, 15 Jan 2014 05:44:38 +0000 (21:44 -0800)] 
Fixes #12210: badges in xs buttons

11 years agoclarify docs regarding non-mixable components 12232/head
Chris Rebert [Wed, 15 Jan 2014 05:26:19 +0000 (21:26 -0800)] 
clarify docs regarding non-mixable components

11 years agodowngrade .img-responsive cross-reference callout from warning to info 12231/head
Chris Rebert [Wed, 15 Jan 2014 05:03:49 +0000 (21:03 -0800)] 
downgrade .img-responsive cross-reference callout from warning to info

11 years agoupgrade form-group + input-group callout from info to warning
Chris Rebert [Wed, 15 Jan 2014 05:02:56 +0000 (21:02 -0800)] 
upgrade form-group + input-group callout from info to warning

11 years agodowngrade <label>-related callouts from danger to warning
Chris Rebert [Wed, 15 Jan 2014 05:02:06 +0000 (21:02 -0800)] 
downgrade <label>-related callouts from danger to warning

11 years agoupgrade tooltip/popover-in-groups callout from info to warning
Chris Rebert [Wed, 15 Jan 2014 05:01:09 +0000 (21:01 -0800)] 
upgrade tooltip/popover-in-groups callout from info to warning

11 years agorevert unnecessary customizations of Blob.js & FileSaver.js
Chris Rebert [Wed, 15 Jan 2014 04:37:11 +0000 (20:37 -0800)] 
revert unnecessary customizations of Blob.js & FileSaver.js

Per https://github.com/eligrey/Blob.js/pull/20
& https://github.com/eligrey/FileSaver.js/pull/63
The library author has deemed the existing /*! @source URL */ comments to be
sufficient attribution, and these already survive minification.

Refs ea591748edee4f8fe722274b71787ccf2b052c4a

11 years agoMerge pull request #12213 from twbs/browserstack
Chris Rebert [Wed, 15 Jan 2014 04:44:47 +0000 (20:44 -0800)] 
Merge pull request #12213 from twbs/browserstack

tests: run BrowserStack in parallel with Sauce Labs

11 years agoMerge pull request #12229 from twbs/richer-results
Chris Rebert [Wed, 15 Jan 2014 04:21:54 +0000 (20:21 -0800)] 
Merge pull request #12229 from twbs/richer-results

more detailed QUnit test results in Sauce

11 years agomore detailed QUnit test results in Sauce 12229/head
Chris Rebert [Wed, 15 Jan 2014 03:57:01 +0000 (19:57 -0800)] 
more detailed QUnit test results in Sauce

11 years agoAdd tooltip `viewport` option, respect bounds of the viewport 11593/head
Ben Ogle [Fri, 22 Nov 2013 19:58:53 +0000 (11:58 -0800)] 
Add tooltip `viewport` option, respect bounds of the viewport

11 years agoMerge branch 'master' into docs_derp
Mark Otto [Tue, 14 Jan 2014 23:53:06 +0000 (15:53 -0800)] 
Merge branch 'master' into docs_derp

Conflicts:
docs/_includes/old-bs-docs.html

11 years agoDon't copy-pasta all the Sass docs because fuck keeping that up to date. Instead...
Mark Otto [Tue, 14 Jan 2014 23:52:40 +0000 (15:52 -0800)] 
Don't copy-pasta all the Sass docs because fuck keeping that up to date. Instead, point to https://github.com/twbs/bootstrap-sass/blob/master/README.md.

11 years agoadd missing semicolon
Chris Rebert [Tue, 14 Jan 2014 22:25:25 +0000 (14:25 -0800)] 
add missing semicolon

11 years agotests: run BrowserStack in parallel with Sauce Labs 12213/head
Chris Rebert [Tue, 14 Jan 2014 02:19:37 +0000 (18:19 -0800)] 
tests: run BrowserStack in parallel with Sauce Labs

Per https://github.com/twbs/bootstrap/issues/11087#issuecomment-31922999
and internal twbs team discussion.
Effectively reverts the deletions from #11701.

11 years agoMerge pull request #12224 from twbs/raw-files-banner
Chris Rebert [Tue, 14 Jan 2014 21:28:50 +0000 (13:28 -0800)] 
Merge pull request #12224 from twbs/raw-files-banner

add copyright notice to raw-files.js

11 years agoadd copyright notice to raw-files.js 12224/head
Chris Rebert [Tue, 14 Jan 2014 21:25:27 +0000 (13:25 -0800)] 
add copyright notice to raw-files.js

11 years agoMerge pull request #12220 from ZDroid/link
Julian Thilo [Tue, 14 Jan 2014 14:03:35 +0000 (06:03 -0800)] 
Merge pull request #12220 from ZDroid/link

Link the blog post instead of main blog page

11 years agoLink the blog post instead of main blog page 12220/head
Zlatan Vasović [Tue, 14 Jan 2014 13:29:02 +0000 (14:29 +0100)] 
Link the blog post instead of main blog page

11 years agoMerge pull request #12218 from ZDroid/docs.js
Chris Rebert [Tue, 14 Jan 2014 12:49:58 +0000 (04:49 -0800)] 
Merge pull request #12218 from ZDroid/docs.js

Rename uglify.js to uglify.min.js for consistency

11 years agoRename uglify.js to uglify.min.js for consistency 12218/head
Zlatan Vasović [Tue, 14 Jan 2014 12:41:21 +0000 (13:41 +0100)] 
Rename uglify.js to uglify.min.js for consistency

11 years agoheader masthead changes
Mark Otto [Tue, 14 Jan 2014 06:59:09 +0000 (22:59 -0800)] 
header masthead changes

11 years agomake page headers like masthead
Mark Otto [Tue, 14 Jan 2014 06:54:22 +0000 (22:54 -0800)] 
make page headers like masthead

11 years agoMerge branch 'master' into docs_derp
Mark Otto [Tue, 14 Jan 2014 06:43:18 +0000 (22:43 -0800)] 
Merge branch 'master' into docs_derp

Conflicts:
docs/assets/css/pack.min.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js

11 years agoMerge pull request #12215 from twbs/attribution-comments
Mark Otto [Tue, 14 Jan 2014 06:38:47 +0000 (22:38 -0800)] 
Merge pull request #12215 from twbs/attribution-comments

sort out attribution banners of docs assets

11 years agosort out attribution banners of docs assets; fixes #11976 12215/head
Chris Rebert [Tue, 14 Jan 2014 05:58:27 +0000 (21:58 -0800)] 
sort out attribution banners of docs assets; fixes #11976

11 years agoavoid redundant banner in minified docs CSS
Chris Rebert [Tue, 14 Jan 2014 05:31:40 +0000 (21:31 -0800)] 
avoid redundant banner in minified docs CSS

11 years agoadd a title/description to customizer.js's attribution comment
Chris Rebert [Tue, 14 Jan 2014 05:07:17 +0000 (21:07 -0800)] 
add a title/description to customizer.js's attribution comment

11 years agoMerge pull request #12214 from twbs/slightly-newer-qunit
Chris Rebert [Tue, 14 Jan 2014 03:28:23 +0000 (19:28 -0800)] 
Merge pull request #12214 from twbs/slightly-newer-qunit

upgrade to QUnit v1.0.0

11 years agoupgrade to QUnit v1.0.0 12214/head
Chris Rebert [Tue, 14 Jan 2014 03:21:07 +0000 (19:21 -0800)] 
upgrade to QUnit v1.0.0

11 years agoRevert accidental overzealousness from 16eccc43d9
Chris Rebert [Tue, 14 Jan 2014 03:09:49 +0000 (19:09 -0800)] 
Revert accidental overzealousness from 16eccc43d9

Let's not confuse the archaeologists & historians.

11 years agoupdate to Holder.js 5b79144fa
Chris Rebert [Tue, 14 Jan 2014 01:50:17 +0000 (17:50 -0800)] 
update to Holder.js 5b79144fa

11 years agopreserve third-party attribution comments when minifying docs JS
Chris Rebert [Mon, 13 Jan 2014 09:06:48 +0000 (01:06 -0800)] 
preserve third-party attribution comments when minifying docs JS

11 years agodocument subheading syntax
Chris Rebert [Mon, 13 Jan 2014 10:37:55 +0000 (02:37 -0800)] 
document subheading syntax

11 years agoMerge branch 'master' into docs_derp
Mark Otto [Mon, 13 Jan 2014 00:10:57 +0000 (16:10 -0800)] 
Merge branch 'master' into docs_derp

Conflicts:
docs/assets/js/docs.min.js

11 years agogrunt dist build-customizer
Chris Rebert [Sun, 12 Jan 2014 22:53:21 +0000 (14:53 -0800)] 
grunt dist build-customizer

11 years agoupdate to FileSaver.js version 2013-12-27 / 0055d054ac
XhmikosR [Sun, 12 Jan 2014 22:46:23 +0000 (14:46 -0800)] 
update to FileSaver.js version 2013-12-27 / 0055d054ac

Refs #12196

11 years agoadd Blob.js separate from filesaver.js
Chris Rebert [Sun, 12 Jan 2014 22:38:30 +0000 (14:38 -0800)] 
add Blob.js separate from filesaver.js

Blob.js version 2013-12-27 / 0055d054acbca43eff44fc25c891055440685d9c
Refs #12196

11 years agoupdate less.js to v1.6.1 & use accurate filename; refs #12196
XhmikosR [Sun, 12 Jan 2014 22:32:45 +0000 (14:32 -0800)] 
update less.js to v1.6.1 & use accurate filename; refs #12196

11 years agoupdate holder.js to v2.3; refs #12196
XhmikosR [Sun, 12 Jan 2014 22:21:02 +0000 (14:21 -0800)] 
update holder.js to v2.3; refs #12196

11 years agoFormatting and docs changes
Mark Otto [Sun, 12 Jan 2014 08:04:24 +0000 (00:04 -0800)] 
Formatting and docs changes

11 years agoImprove spacing and alignment of sections and their headings
Mark Otto [Sun, 12 Jan 2014 07:15:37 +0000 (23:15 -0800)] 
Improve spacing and alignment of sections and their headings

11 years agobrand guidelines cleanup
Mark Otto [Sun, 12 Jan 2014 03:42:10 +0000 (19:42 -0800)] 
brand guidelines cleanup

11 years agohomepage improvements
Mark Otto [Sun, 12 Jan 2014 03:35:40 +0000 (19:35 -0800)] 
homepage improvements

11 years agoMerge branch 'master' into docs_derp
Mark Otto [Sun, 12 Jan 2014 03:13:10 +0000 (19:13 -0800)] 
Merge branch 'master' into docs_derp

Conflicts:
docs/getting-started.html

11 years agorm lingering reference to Recess in the docs
Chris Rebert [Sun, 12 Jan 2014 01:15:08 +0000 (17:15 -0800)] 
rm lingering reference to Recess in the docs

Refs c0200426ee72b165de400db740a60bae5d344b3c

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sat, 11 Jan 2014 22:49:03 +0000 (14:49 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap