]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoregenerate with fixes applied 14002/head
Chris Rebert [Tue, 1 Jul 2014 04:11:21 +0000 (21:11 -0700)] 
regenerate with fixes applied

11 years agoPort additional changes to popover docs
Julian Thilo [Thu, 26 Jun 2014 21:27:46 +0000 (23:27 +0200)] 
Port additional changes to popover docs

https://github.com/twbs/bootstrap/commit/43b7a942bc4eb2307353dcf32e7c245664546afc
So all the popover demos work great.
/fyi @mdo

11 years agoport over #13946
Mark Otto [Thu, 26 Jun 2014 19:57:46 +0000 (12:57 -0700)] 
port over #13946

11 years agoport changes from #13947
Mark Otto [Thu, 26 Jun 2014 19:46:37 +0000 (12:46 -0700)] 
port changes from #13947

11 years agoport in #13942
Mark Otto [Thu, 26 Jun 2014 18:51:56 +0000 (11:51 -0700)] 
port in #13942

11 years agobring back full js
Mark Otto [Thu, 26 Jun 2014 16:48:57 +0000 (09:48 -0700)] 
bring back full js

11 years agobring back full css files
Mark Otto [Thu, 26 Jun 2014 16:48:42 +0000 (09:48 -0700)] 
bring back full css files

11 years agomerge in v3.2.0 changes; nuke a dupe _gh_pages dir
Mark Otto [Thu, 26 Jun 2014 16:46:59 +0000 (09:46 -0700)] 
merge in v3.2.0 changes; nuke a dupe _gh_pages dir

11 years agoMerge pull request #13472 from twbs/adios-232-customizer
Chris Rebert [Thu, 1 May 2014 03:02:18 +0000 (20:02 -0700)] 
Merge pull request #13472 from twbs/adios-232-customizer

take down the v2.3.2 Customizer; closes #13456

11 years agotake down the v2.3.2 Customizer; closes #13456 13472/head
Chris Rebert [Thu, 1 May 2014 02:53:21 +0000 (19:53 -0700)] 
take down the v2.3.2 Customizer; closes #13456

11 years agorestore carbon
Mark Otto [Wed, 9 Apr 2014 04:38:42 +0000 (21:38 -0700)] 
restore carbon

11 years agosmall update 13283/head
Mark Otto [Tue, 1 Apr 2014 09:11:37 +0000 (02:11 -0700)] 
small update

11 years agomanually hack in a0ac99efbf201f03106f392bce7045d8563064d9
Chris Rebert [Wed, 12 Mar 2014 17:12:53 +0000 (10:12 -0700)] 
manually hack in a0ac99efbf201f03106f392bce7045d8563064d9

Tired of seeing issues about it.

11 years agohomepage update for old docs
Mark Otto [Tue, 11 Mar 2014 18:17:07 +0000 (11:17 -0700)] 
homepage update for old docs

11 years agochange translation docs in light of #11342 & its many dupes
Chris Rebert [Wed, 19 Feb 2014 19:19:41 +0000 (11:19 -0800)] 
change translation docs in light of #11342 & its many dupes

11 years agospacing
Mark Otto [Thu, 13 Feb 2014 17:39:00 +0000 (09:39 -0800)] 
spacing

11 years agolame-copy-paste files because Pages doesn't support custom source yet
Mark Otto [Thu, 13 Feb 2014 17:36:49 +0000 (09:36 -0800)] 
lame-copy-paste files because Pages doesn't support custom source yet

11 years agofix #12540
Chris Rebert [Mon, 3 Feb 2014 09:44:50 +0000 (01:44 -0800)] 
fix #12540

11 years agoupdate docs about destination of remote modal content; fixes #12494
Chris Rebert [Mon, 3 Feb 2014 06:11:18 +0000 (22:11 -0800)] 
update docs about destination of remote modal content; fixes #12494

11 years agoMerge branch 'gh-pages' of github.com:twbs/bootstrap into gh-pages
Mark Otto [Fri, 31 Jan 2014 18:42:48 +0000 (10:42 -0800)] 
Merge branch 'gh-pages' of github.com:twbs/bootstrap into gh-pages

11 years agoreadd some files for the hotlinkers out there
Mark Otto [Fri, 31 Jan 2014 18:42:36 +0000 (10:42 -0800)] 
readd some files for the hotlinkers out there

11 years agoDowngrade holder.js to v2.2.0.
XhmikosR [Fri, 31 Jan 2014 07:26:11 +0000 (09:26 +0200)] 
Downgrade holder.js to v2.2.0.

Fixes #12440.

11 years agofix "pading-right" [sic] typo in dashboard.css; fixes #12455
Chris Rebert [Fri, 31 Jan 2014 04:39:12 +0000 (20:39 -0800)] 
fix "pading-right" [sic] typo in dashboard.css; fixes #12455

11 years agouse correct+newer name for retina mixin in docs; fixes #12450
Chris Rebert [Thu, 30 Jan 2014 22:46:58 +0000 (14:46 -0800)] 
use correct+newer name for retina mixin in docs; fixes #12450

11 years agorm duplicate warning callouts in Input Groups docs
Chris Rebert [Thu, 30 Jan 2014 20:24:45 +0000 (12:24 -0800)] 
rm duplicate warning callouts in Input Groups docs

11 years agoMerge branch 'docs-hotfixes' into gh-pages
Chris Rebert [Thu, 30 Jan 2014 19:31:50 +0000 (11:31 -0800)] 
Merge branch 'docs-hotfixes' into gh-pages

11 years agorm outdated note about lack of .col-{xs,sm}-offset-0; fixes #12439
Chris Rebert [Thu, 30 Jan 2014 18:49:43 +0000 (10:49 -0800)] 
rm outdated note about lack of .col-{xs,sm}-offset-0; fixes #12439

11 years agonote specific versions of IE where progress bar animation supported; fixes #12437
Chris Rebert [Thu, 30 Jan 2014 18:42:44 +0000 (10:42 -0800)] 
note specific versions of IE where progress bar animation supported; fixes #12437

11 years agoturn the docs upside down for the deploy because we're waiting on some new jekyll...
Mark Otto [Thu, 30 Jan 2014 17:30:24 +0000 (09:30 -0800)] 
turn the docs upside down for the deploy because we're waiting on some new jekyll hotness

11 years agosass port number
Mark Otto [Thu, 30 Jan 2014 16:59:23 +0000 (08:59 -0800)] 
sass port number

11 years agoMerge branch 'master' into gh-pages
Mark Otto [Thu, 30 Jan 2014 16:55:26 +0000 (08:55 -0800)] 
Merge branch 'master' into gh-pages

11 years agoBump versions, run grunt v3.1.0
Mark Otto [Thu, 30 Jan 2014 16:30:37 +0000 (08:30 -0800)] 
Bump versions, run grunt

11 years agogrunt
Mark Otto [Thu, 30 Jan 2014 16:14:18 +0000 (08:14 -0800)] 
grunt

11 years agoMerge pull request #12432 from ChrisRiddell/signin-email-fix
Julian Thilo [Thu, 30 Jan 2014 12:54:19 +0000 (04:54 -0800)] 
Merge pull request #12432 from ChrisRiddell/signin-email-fix

Wrong input css for signin example

11 years agoits an email input 12432/head
Chris Riddell [Thu, 30 Jan 2014 12:44:05 +0000 (23:14 +1030)] 
its an email input

11 years agogrunt
Mark Otto [Thu, 30 Jan 2014 06:44:06 +0000 (22:44 -0800)] 
grunt

11 years agoMerge branch 'master' into pr/12388
Mark Otto [Thu, 30 Jan 2014 06:18:29 +0000 (22:18 -0800)] 
Merge branch 'master' into pr/12388

Conflicts:
dist/css/bootstrap.min.css

11 years agoFollow up to #11655: don't reset opacity on disabled buttons
Mark Otto [Thu, 30 Jan 2014 05:57:44 +0000 (21:57 -0800)] 
Follow up to #11655: don't reset opacity on disabled buttons

11 years agofix css url
Mark Otto [Thu, 30 Jan 2014 05:44:36 +0000 (21:44 -0800)] 
fix css url

11 years agoMerge pull request #12423 from ZDroid/name
Mark Otto [Thu, 30 Jan 2014 05:44:01 +0000 (21:44 -0800)] 
Merge pull request #12423 from ZDroid/name

Rename pack.min.css to docs.min.css to match with docs.min.js

11 years agoFix #12422: Reset height on multiple select in input size mixin
Mark Otto [Thu, 30 Jan 2014 05:34:10 +0000 (21:34 -0800)] 
Fix #12422: Reset height on multiple select in input size mixin

11 years agoFixes #12424: Account for Normalize change on figure element so that we don't potenti...
Mark Otto [Thu, 30 Jan 2014 05:23:23 +0000 (21:23 -0800)] 
Fixes #12424: Account for Normalize change on figure element so that we don't potentially screw folks over

11 years agoRename pack.min.css to docs.min.css to match with docs.min.js 12423/head
Zlatan Vasović [Wed, 29 Jan 2014 19:50:10 +0000 (20:50 +0100)] 
Rename pack.min.css to docs.min.css to match with docs.min.js

11 years agoMerge pull request #12415 from XhmikosR/master
Chris Rebert [Wed, 29 Jan 2014 01:35:09 +0000 (17:35 -0800)] 
Merge pull request #12415 from XhmikosR/master

Gruntfile.js: remove unused code.

11 years agoMerge pull request #12417 from ZDroid/cmt
Chris Rebert [Tue, 28 Jan 2014 23:54:23 +0000 (15:54 -0800)] 
Merge pull request #12417 from ZDroid/cmt

Remove redundant jshint comment

11 years agoRemove redundant jshint comment 12417/head
Zlatan Vasović [Tue, 28 Jan 2014 21:47:23 +0000 (22:47 +0100)] 
Remove redundant jshint comment

11 years agoGruntfile.js: remove unused code. 12415/head
XhmikosR [Tue, 28 Jan 2014 11:16:13 +0000 (13:16 +0200)] 
Gruntfile.js: remove unused code.

11 years agoMerge pull request #12406 from twbs/normalize_v3
Mark Otto [Tue, 28 Jan 2014 18:57:31 +0000 (10:57 -0800)] 
Merge pull request #12406 from twbs/normalize_v3

Upgrade to Normalize v3

11 years agogrunt 12406/head
Mark Otto [Tue, 28 Jan 2014 18:08:40 +0000 (10:08 -0800)] 
grunt

11 years agov3 instead of rc1
Mark Otto [Tue, 28 Jan 2014 18:07:33 +0000 (10:07 -0800)] 
v3 instead of rc1

11 years agoUpdate javascript.html
Julian Thilo [Mon, 27 Jan 2014 23:01:10 +0000 (00:01 +0100)] 
Update javascript.html

11 years agoFix typo
Julian Thilo [Mon, 27 Jan 2014 22:07:14 +0000 (23:07 +0100)] 
Fix typo

11 years agoRemove #8350's reset for number inputs since Normalize fixes those upstream
Mark Otto [Mon, 27 Jan 2014 20:25:39 +0000 (12:25 -0800)] 
Remove #8350's reset for number inputs since Normalize fixes those upstream

11 years agoRemove optgroup resets from #7611 since Normalize fixes those upstream
Mark Otto [Mon, 27 Jan 2014 20:24:35 +0000 (12:24 -0800)] 
Remove optgroup resets from #7611 since Normalize fixes those upstream

11 years agoUpgrade to Normalize v3-rc1 in prep for v3 final
Mark Otto [Mon, 27 Jan 2014 20:08:55 +0000 (12:08 -0800)] 
Upgrade to Normalize v3-rc1 in prep for v3 final

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 27 Jan 2014 17:42:33 +0000 (09:42 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agodocument id requirement in carousels per #12393
Mark Otto [Mon, 27 Jan 2014 17:24:51 +0000 (09:24 -0800)] 
document id requirement in carousels per #12393

11 years agoMerge pull request #12403 from Quy/master
Julian Thilo [Mon, 27 Jan 2014 17:22:17 +0000 (09:22 -0800)] 
Merge pull request #12403 from Quy/master

Change positioning reference from left to right in affix's example.

11 years agoChange positioning reference from left to right in affix's example. 12403/head
Quy Ton [Mon, 27 Jan 2014 17:17:57 +0000 (09:17 -0800)] 
Change positioning reference from left to right in affix's example.

11 years agoMerge pull request #12315 from twbs/use-shrinkwrap
Chris Rebert [Mon, 27 Jan 2014 04:46:14 +0000 (20:46 -0800)] 
Merge pull request #12315 from twbs/use-shrinkwrap

Do npm caching based on npm-shrinkwrap.canonical.json

11 years agoMerge pull request #12398 from twbs/deprecate-box-shadow-mixin
Mark Otto [Mon, 27 Jan 2014 03:15:31 +0000 (19:15 -0800)] 
Merge pull request #12398 from twbs/deprecate-box-shadow-mixin

mark .box-shadow() mixin as deprecated

11 years agodocs & comments: v3.1 => v3.1.0
Chris Rebert [Mon, 27 Jan 2014 01:48:15 +0000 (17:48 -0800)] 
docs & comments: v3.1 => v3.1.0

11 years agomark .box-shadow() mixin as deprecated; fixes #12396 12398/head
Chris Rebert [Mon, 27 Jan 2014 01:31:11 +0000 (17:31 -0800)] 
mark .box-shadow() mixin as deprecated; fixes #12396

11 years agofix #12261 12315/head
Chris Rebert [Mon, 20 Jan 2014 21:06:13 +0000 (13:06 -0800)] 
fix #12261

11 years agofixes #10495 by forcing .navbar-brand height to prevent it's inner content from incre... 12388/head
Alan Hamlett [Sun, 26 Jan 2014 05:40:56 +0000 (21:40 -0800)] 
fixes #10495 by forcing .navbar-brand height to prevent it's inner content from increasing navbar height

11 years agoMerge pull request #12387 from twbs/osx-chrome
Chris Rebert [Sun, 26 Jan 2014 02:33:23 +0000 (18:33 -0800)] 
Merge pull request #12387 from twbs/osx-chrome

re-enable OS X Chrome in Sauce tests

11 years agore-enable OS X Chrome in Sauce tests 12387/head
Chris Rebert [Sun, 26 Jan 2014 01:55:52 +0000 (17:55 -0800)] 
re-enable OS X Chrome in Sauce tests

11 years agoMerge pull request #12386 from twbs/update-iphone
Chris Rebert [Sun, 26 Jan 2014 01:11:49 +0000 (17:11 -0800)] 
Merge pull request #12386 from twbs/update-iphone

update to iOS v7 in Sauce test config

11 years agoupdate to iOS v7 in Sauce test config 12386/head
Chris Rebert [Sun, 26 Jan 2014 00:47:55 +0000 (16:47 -0800)] 
update to iOS v7 in Sauce test config

11 years agoREADME: use Bootstrap v3-specific StackOverflow tag
Chris Rebert [Sun, 26 Jan 2014 00:38:47 +0000 (16:38 -0800)] 
README: use Bootstrap v3-specific StackOverflow tag

11 years agodisable IE11 in BrowserStack config due to frequent timeouts
Chris Rebert [Sun, 26 Jan 2014 00:35:13 +0000 (16:35 -0800)] 
disable IE11 in BrowserStack config due to frequent timeouts

11 years agoMerge pull request #12378 from andrewdisley/patch-1
Chris Rebert [Sun, 26 Jan 2014 00:30:02 +0000 (16:30 -0800)] 
Merge pull request #12378 from andrewdisley/patch-1

Fix #10348: Customizer dependencies

11 years agoMerge pull request #12385 from hnrch02/update-load-grunt-tasks
Chris Rebert [Sun, 26 Jan 2014 00:27:05 +0000 (16:27 -0800)] 
Merge pull request #12385 from hnrch02/update-load-grunt-tasks

Update load-grunt-tasks to v0.3.0

11 years agoUpdate load-grunt-tasks to v0.3.0 12385/head
Heinrich Fenkart [Sat, 25 Jan 2014 20:03:44 +0000 (21:03 +0100)] 
Update load-grunt-tasks to v0.3.0

11 years agoMerge pull request #12266 from twbs/linux
Chris Rebert [Sat, 25 Jan 2014 20:00:10 +0000 (12:00 -0800)] 
Merge pull request #12266 from twbs/linux

enable Linux Chrome & Linux Firefox in Sauce tests

11 years agoMerge pull request #12380 from twbs/translation-german
Mark Otto [Sat, 25 Jan 2014 19:10:20 +0000 (11:10 -0800)] 
Merge pull request #12380 from twbs/translation-german

Add German translation

11 years agoAdd link to German translation and reorder links 12380/head
Julian Thilo [Sat, 25 Jan 2014 15:08:15 +0000 (16:08 +0100)] 
Add link to German translation and reorder links

11 years agoFix #10348: Customizer dependencies 12378/head
Andrew Disley [Sat, 25 Jan 2014 12:35:46 +0000 (12:35 +0000)] 
Fix #10348: Customizer dependencies

11 years agoMerge pull request #12366 from Quy/master
Mark Otto [Sat, 25 Jan 2014 06:36:05 +0000 (22:36 -0800)] 
Merge pull request #12366 from Quy/master

Change a word.

11 years agoClarify nesting in grid example
Julian Thilo [Sat, 25 Jan 2014 00:58:54 +0000 (01:58 +0100)] 
Clarify nesting in grid example

11 years agoChange a word. 12366/head
Quy Ton [Fri, 24 Jan 2014 19:24:50 +0000 (11:24 -0800)] 
Change a word.

11 years agoMerge pull request #12365 from Quy/master
Chris Rebert [Fri, 24 Jan 2014 18:43:06 +0000 (10:43 -0800)] 
Merge pull request #12365 from Quy/master

Remove Twitter from tweet button

11 years agoRemove Twitter from tweet button 12365/head
Quy Ton [Fri, 24 Jan 2014 18:37:12 +0000 (10:37 -0800)] 
Remove Twitter from tweet button

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

11 years agoFix #12359: Reset min-width on fieldsets so that they don't break responsive tables...
Mark Otto [Fri, 24 Jan 2014 17:55:59 +0000 (11:55 -0600)] 
Fix #12359: Reset min-width on fieldsets so that they don't break responsive tables and behave more like standard block level elements

11 years agoMerge pull request #12357 from twbs/border-box-note
Chris Rebert [Fri, 24 Jan 2014 04:57:45 +0000 (20:57 -0800)] 
Merge pull request #12357 from twbs/border-box-note

add note in Less source about global `box-sizing: border-box;`

11 years agoMerge pull request #12356 from twbs/wcag-contributing
Mark Otto [Fri, 24 Jan 2014 04:55:39 +0000 (20:55 -0800)] 
Merge pull request #12356 from twbs/wcag-contributing

add WCAG color guideline to CONTRIBUTING.md

11 years agoroll back to github zip
Mark Otto [Fri, 24 Jan 2014 04:55:06 +0000 (22:55 -0600)] 
roll back to github zip

11 years agoMerge pull request #12355 from twbs/aria-contributing
Mark Otto [Fri, 24 Jan 2014 04:53:33 +0000 (20:53 -0800)] 
Merge pull request #12355 from twbs/aria-contributing

add WAI-ARIA guideline to CONTRIBUTING.md

11 years agoFix #12353: Scope table border reset in panels to first-child rows
Mark Otto [Fri, 24 Jan 2014 04:52:26 +0000 (22:52 -0600)] 
Fix #12353: Scope table border reset in panels to first-child rows

11 years agoAdd ref in Less to docs regarding box-sizing conflicts 12357/head
Chris Rebert [Fri, 24 Jan 2014 01:23:57 +0000 (17:23 -0800)] 
Add ref in Less to docs regarding box-sizing conflicts

Refs #12351

11 years agoadd ID to "Box sizing" section of Getting Started docs
Chris Rebert [Fri, 24 Jan 2014 01:01:43 +0000 (17:01 -0800)] 
add ID to "Box sizing" section of Getting Started docs

11 years ago"bottom increment" => "decrement" in explanatory comment
Chris Rebert [Thu, 23 Jan 2014 23:07:04 +0000 (15:07 -0800)] 
"bottom increment" => "decrement" in explanatory comment

11 years agoadd WCAG color guideline to CONTRIBUTING.md 12356/head
Chris Rebert [Thu, 23 Jan 2014 22:01:59 +0000 (14:01 -0800)] 
add WCAG color guideline to CONTRIBUTING.md

11 years agoadd WAI-ARIA guideline to CONTRIBUTING.md 12355/head
Chris Rebert [Thu, 23 Jan 2014 20:50:57 +0000 (12:50 -0800)] 
add WAI-ARIA guideline to CONTRIBUTING.md

11 years agofix typo and use the v3-specific StackOverflow tag
Chris Rebert [Thu, 23 Jan 2014 19:18:56 +0000 (11:18 -0800)] 
fix typo and use the v3-specific StackOverflow tag

11 years agoPoint config to temp download file
Mark Otto [Thu, 23 Jan 2014 19:08:23 +0000 (13:08 -0600)] 
Point config to temp download file

11 years agoadd temp zip file that works
Mark Otto [Thu, 23 Jan 2014 19:04:45 +0000 (13:04 -0600)] 
add temp zip file that works

11 years agoMerge pull request #12347 from twbs/ie-11-browserstack
Chris Rebert [Thu, 23 Jan 2014 05:34:42 +0000 (21:34 -0800)] 
Merge pull request #12347 from twbs/ie-11-browserstack

enable IE11 in BrowserStack tests

11 years agoFollow-up to #12250: remove remaining page margins for print
Mark Otto [Thu, 23 Jan 2014 03:51:23 +0000 (21:51 -0600)] 
Follow-up to #12250: remove remaining page margins for print