]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agoReflect sass readme change in css.html
Gleb Mazovetskiy [Tue, 24 Dec 2013 16:20:52 +0000 (17:20 +0100)] 
Reflect sass readme change in css.html

12 years agoUse correct directory name for bootstrap contribution 12001/head
soundarapandian [Tue, 24 Dec 2013 10:35:19 +0000 (16:05 +0530)] 
Use correct directory name for bootstrap contribution

12 years agoMerge pull request #11933 from twbs/fat-10105
Jacob [Tue, 24 Dec 2013 07:31:11 +0000 (23:31 -0800)] 
Merge pull request #11933 from twbs/fat-10105

change where modal loads content -– fixes #10105, #9318, #9459

12 years agochange where modal loads content -– fixes #10105, #9318, #9459 11933/head
fat [Thu, 19 Dec 2013 05:38:35 +0000 (21:38 -0800)] 
change where modal loads content -– fixes #10105, #9318, #9459

12 years agoMerge pull request #11999 from XhmikosR/respond.js
Mark Otto [Tue, 24 Dec 2013 07:26:05 +0000 (23:26 -0800)] 
Merge pull request #11999 from XhmikosR/respond.js

Update Respond.js

12 years agoUpdate Respond.js to v1.4.2. 11999/head
XhmikosR [Mon, 23 Dec 2013 17:23:07 +0000 (19:23 +0200)] 
Update Respond.js to v1.4.2.

12 years agofixes #10568 - kill hoverstate info once command has been executed
fat [Tue, 24 Dec 2013 06:57:39 +0000 (22:57 -0800)] 
fixes #10568 - kill hoverstate info once command has been executed

12 years agofixes #10205 Scrollspy Doesn't Support Chinese ID Targets http://mathiasbynens.be...
fat [Tue, 24 Dec 2013 06:08:43 +0000 (22:08 -0800)] 
fixes #10205 Scrollspy Doesn't Support Chinese ID Targets  http://mathiasbynens.be/notes/html5-id-class

12 years agoadd callout about justified button group borders to address #11964
Mark Otto [Tue, 24 Dec 2013 04:28:21 +0000 (20:28 -0800)] 
add callout about justified button group borders to address #11964

12 years agoMerge pull request #11970 from supergibbs/Better_10492_fix
Mark Otto [Tue, 24 Dec 2013 02:53:30 +0000 (18:53 -0800)] 
Merge pull request #11970 from supergibbs/Better_10492_fix

Fixes #10492 better

12 years agoFixes #10492 better: 11970/head
Supergibbs [Tue, 24 Dec 2013 00:07:55 +0000 (16:07 -0800)] 
Fixes #10492 better:
- Made more generic. Applies to "> .table" and "> .table-responsive > .table" to support td/tr background colors too and not just .table-striped
- Supports tfoot

12 years agoFixes #11975: Change from png to .ico for favicon
Mark Otto [Mon, 23 Dec 2013 23:16:25 +0000 (15:16 -0800)] 
Fixes #11975: Change from png to .ico for favicon

12 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 23 Dec 2013 21:26:01 +0000 (13:26 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

12 years agoUpgrade to CSScomb 1.2.1 and reset some ordering to ensure no rogue spaces
Mark Otto [Mon, 23 Dec 2013 21:25:51 +0000 (13:25 -0800)] 
Upgrade to CSScomb 1.2.1 and reset some ordering to ensure no rogue spaces

12 years agoMerge pull request #11989 from ZDroid/banner
Mark Otto [Mon, 23 Dec 2013 20:42:41 +0000 (12:42 -0800)] 
Merge pull request #11989 from ZDroid/banner

Improve banner

12 years agoImprove banner 11989/head
Zlatan Vasović [Mon, 23 Dec 2013 17:02:42 +0000 (18:02 +0100)] 
Improve banner

12 years agoMerge pull request #11978 from XhmikosR/clean-up-_gh-pages
Mark Otto [Mon, 23 Dec 2013 07:15:35 +0000 (23:15 -0800)] 
Merge pull request #11978 from XhmikosR/clean-up-_gh-pages

Jekyll: exclude more files/folders.

12 years agogrunt
Mark Otto [Mon, 23 Dec 2013 06:32:35 +0000 (22:32 -0800)] 
grunt

12 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 23 Dec 2013 06:31:28 +0000 (22:31 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

12 years agoFixes #10492 and some of #11970: round the proper corner on table cells in panels
Mark Otto [Mon, 23 Dec 2013 06:31:13 +0000 (22:31 -0800)] 
Fixes #10492 and some of #11970: round the proper corner on table cells in panels

12 years agoMerge pull request #11974 from XhmikosR/meta
Mark Otto [Mon, 23 Dec 2013 06:20:23 +0000 (22:20 -0800)] 
Merge pull request #11974 from XhmikosR/meta

Normalize meta

12 years agoMerge pull request #11972 from XhmikosR/comma
Mark Otto [Mon, 23 Dec 2013 06:08:33 +0000 (22:08 -0800)] 
Merge pull request #11972 from XhmikosR/comma

Get rid of JSHint's `laxcomma` option now that the comma is used on the ...

12 years agofixes #11961: dropdown alignment docs improvements
Mark Otto [Mon, 23 Dec 2013 06:07:01 +0000 (22:07 -0800)] 
fixes #11961: dropdown alignment docs improvements

12 years agoMerge pull request #11963 from twbs/sass_docs
Mark Otto [Mon, 23 Dec 2013 05:47:11 +0000 (21:47 -0800)] 
Merge pull request #11963 from twbs/sass_docs

Add docs for Sass port

12 years agospace 11963/head
Mark Otto [Mon, 23 Dec 2013 05:42:08 +0000 (21:42 -0800)] 
space

12 years agoadd what's included
Mark Otto [Mon, 23 Dec 2013 05:27:12 +0000 (21:27 -0800)] 
add what's included

12 years agoMerge branch 'master' into sass_docs
Mark Otto [Mon, 23 Dec 2013 05:23:24 +0000 (21:23 -0800)] 
Merge branch 'master' into sass_docs

12 years agoRevert to CSScomb 1.1.0 because 1.2.0 and 1.2.1 fuck up our compiled CSS
Mark Otto [Mon, 23 Dec 2013 05:18:45 +0000 (21:18 -0800)] 
Revert to CSScomb 1.1.0 because 1.2.0 and 1.2.1 fuck up our compiled CSS

12 years agoRemove timestamp on generated Glyhpicons
Mark Otto [Mon, 23 Dec 2013 05:05:08 +0000 (21:05 -0800)] 
Remove timestamp on generated Glyhpicons

12 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 23 Dec 2013 05:01:00 +0000 (21:01 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

12 years agogrunt
Mark Otto [Mon, 23 Dec 2013 05:00:53 +0000 (21:00 -0800)] 
grunt

12 years agoMerge pull request #11979 from ZDroid/fix-old-links
Mark Otto [Mon, 23 Dec 2013 01:30:35 +0000 (17:30 -0800)] 
Merge pull request #11979 from ZDroid/fix-old-links

Fix old links

12 years agoMerge pull request #11982 from ZDroid/update-deps
Chris Rebert [Sun, 22 Dec 2013 20:23:52 +0000 (12:23 -0800)] 
Merge pull request #11982 from ZDroid/update-deps

Update dependencies

12 years agoUpdate dependencies 11982/head
Zlatan Vasović [Sun, 22 Dec 2013 18:01:00 +0000 (19:01 +0100)] 
Update dependencies

12 years agoFix old links 11979/head
Zlatan Vasović [Sun, 22 Dec 2013 15:26:05 +0000 (16:26 +0100)] 
Fix old links

Replace recess with less.

12 years agoJekyll: exclude more files/folders. 11978/head
XhmikosR [Sun, 22 Dec 2013 09:45:18 +0000 (11:45 +0200)] 
Jekyll: exclude more files/folders.

We still can't exclude `./fonts/" and "./js/" due to https://github.com/jekyll/jekyll/issues/906

12 years agoGet rid of JSHint's `laxcomma` option now that the comma is used on the right side. 11972/head
XhmikosR [Sat, 21 Dec 2013 20:59:40 +0000 (22:59 +0200)] 
Get rid of JSHint's `laxcomma` option now that the comma is used on the right side.

12 years agobower.json: sort by name. 11974/head
XhmikosR [Tue, 17 Dec 2013 12:41:15 +0000 (14:41 +0200)] 
bower.json: sort by name.

12 years agoNormalize package.json.
XhmikosR [Tue, 17 Dec 2013 12:39:36 +0000 (14:39 +0200)] 
Normalize package.json.

12 years agojs/.jscs.json: sort by name.
XhmikosR [Mon, 16 Dec 2013 09:36:31 +0000 (11:36 +0200)] 
js/.jscs.json: sort by name.

12 years agolink homepage sass and less
Mark Otto [Sat, 21 Dec 2013 21:42:10 +0000 (13:42 -0800)] 
link homepage sass and less

12 years agorework downloads to simplify and add sass
Mark Otto [Sat, 21 Dec 2013 21:40:42 +0000 (13:40 -0800)] 
rework downloads to simplify and add sass

12 years agoremove dat
Mark Otto [Sat, 21 Dec 2013 19:17:39 +0000 (11:17 -0800)] 
remove dat

12 years agoMerge branch 'master' into docs_derp
Mark Otto [Sat, 21 Dec 2013 19:17:29 +0000 (11:17 -0800)] 
Merge branch 'master' into docs_derp

Conflicts:
_layouts/default.html
components.html

12 years agoadd section for contents
Mark Otto [Sat, 21 Dec 2013 18:36:20 +0000 (10:36 -0800)] 
add section for contents

12 years agoconfig url
Mark Otto [Sat, 21 Dec 2013 18:09:39 +0000 (10:09 -0800)] 
config url

12 years agoTeam members on About page
Mark Otto [Sat, 21 Dec 2013 18:08:04 +0000 (10:08 -0800)] 
Team members on About page

12 years agoremove some unintional code
Mark Otto [Sat, 21 Dec 2013 17:59:24 +0000 (09:59 -0800)] 
remove some unintional code

12 years agoMerge branch 'master' into sass_docs
Mark Otto [Sat, 21 Dec 2013 17:45:47 +0000 (09:45 -0800)] 
Merge branch 'master' into sass_docs

12 years agoreadme typo from #11965
Mark Otto [Sat, 21 Dec 2013 17:36:51 +0000 (09:36 -0800)] 
readme typo from #11965

12 years agoMerge pull request #11965 from tomByrer/md-tweaks
Mark Otto [Sat, 21 Dec 2013 17:36:18 +0000 (09:36 -0800)] 
Merge pull request #11965 from tomByrer/md-tweaks

condenced README CONTRIB changes

12 years agohttps://github.com/twbs/bootstrap/pull/11950#issuecomment-31033824 11965/head
tomByrer [Sat, 21 Dec 2013 16:39:34 +0000 (09:39 -0700)] 
https://github.com/twbs/bootstrap/pull/11950#issuecomment-31033824

12 years agomore Less
Mark Otto [Sat, 21 Dec 2013 05:19:45 +0000 (21:19 -0800)] 
more Less

12 years agoSass docs; LESS to Less because fuck caps
Mark Otto [Sat, 21 Dec 2013 05:02:25 +0000 (21:02 -0800)] 
Sass docs; LESS to Less because fuck caps

12 years agoMerge pull request #11956 from tlindig/tl_pagination_customizing
Mark Otto [Fri, 20 Dec 2013 20:29:49 +0000 (12:29 -0800)] 
Merge pull request #11956 from tlindig/tl_pagination_customizing

add new variables for "pagination" to improve support of customizing

12 years agoMerge pull request #11960 from ZDroid/no-leading-commas-json
Mark Otto [Fri, 20 Dec 2013 19:18:04 +0000 (11:18 -0800)] 
Merge pull request #11960 from ZDroid/no-leading-commas-json

Drop remaining leading commas

12 years agoDrop remaining leading commas 11960/head
Zlatan Vasović [Fri, 20 Dec 2013 19:09:51 +0000 (20:09 +0100)] 
Drop remaining leading commas

12 years agoMerge pull request #11959 from ZDroid/update-grunt-csscomb
Mark Otto [Fri, 20 Dec 2013 19:08:39 +0000 (11:08 -0800)] 
Merge pull request #11959 from ZDroid/update-grunt-csscomb

Update grunt-csscomb dependency

12 years agoUpdate grunt-csscomb dependency 11959/head
Zlatan Vasović [Fri, 20 Dec 2013 18:59:18 +0000 (19:59 +0100)] 
Update grunt-csscomb dependency

Per David DM.

12 years agoadd new variables for "pagination" to improve support of customizing 11956/head
Tobias Lindig [Fri, 20 Dec 2013 16:06:53 +0000 (17:06 +0100)] 
add new variables for "pagination" to improve support of customizing

12 years agoFixes #11952: Refactor blockquote styles
Mark Otto [Fri, 20 Dec 2013 03:40:08 +0000 (19:40 -0800)] 
Fixes #11952: Refactor blockquote styles

* Deprecate .pull-right class for .blockquote-reverse
* Move font-size change to the parent, blockquote, instead of setting on the p element to allow more flexible content

12 years agocorrect jsbin link
Mark Otto [Fri, 20 Dec 2013 03:28:22 +0000 (19:28 -0800)] 
correct jsbin link

12 years agoMerge pull request #11951 from bnewcomb/master
Chris Rebert [Fri, 20 Dec 2013 03:10:16 +0000 (19:10 -0800)] 
Merge pull request #11951 from bnewcomb/master

Fix sentence grammar

12 years agoMinor grammar change 11951/head
Ben Newcomb [Fri, 20 Dec 2013 02:57:43 +0000 (18:57 -0800)] 
Minor grammar change

'as well' was used twice in sentence

12 years agoMerge pull request #11930 from ssorallen/master
Mark Otto [Thu, 19 Dec 2013 23:03:43 +0000 (15:03 -0800)] 
Merge pull request #11930 from ssorallen/master

Write Glyphicons to _data, generate Glyphicons markup

12 years agoMerge pull request #11941 from ZDroid/left-plus
Mark Otto [Thu, 19 Dec 2013 22:06:01 +0000 (14:06 -0800)] 
Merge pull request #11941 from ZDroid/left-plus

No leading pluses

12 years agoMerge pull request #11939 from ZDroid/weird-indents
Mark Otto [Thu, 19 Dec 2013 22:05:19 +0000 (14:05 -0800)] 
Merge pull request #11939 from ZDroid/weird-indents

2 instead of 4 spaces in .csscomb.json

12 years ago"Thosing" [sic] => "Those"
Chris Rebert [Thu, 19 Dec 2013 19:39:57 +0000 (11:39 -0800)] 
"Thosing" [sic] => "Those"

12 years agoFix sentence in css.html
Julian Thilo [Thu, 19 Dec 2013 19:12:31 +0000 (20:12 +0100)] 
Fix sentence in css.html

12 years agoMerge pull request #11945 from robertgentel/patch-1
Julian Thilo [Thu, 19 Dec 2013 18:56:36 +0000 (10:56 -0800)] 
Merge pull request #11945 from robertgentel/patch-1

Update css.html

12 years agoUpdate css.html 11945/head
robertgentel [Thu, 19 Dec 2013 17:06:45 +0000 (11:06 -0600)] 
Update css.html

Documentation (missing word)

12 years agoNo leading pluses 11941/head
Zlatan Vasović [Thu, 19 Dec 2013 14:32:37 +0000 (15:32 +0100)] 
No leading pluses

12 years ago2 instead of 4 spaces in .csscomb.json 11939/head
Zlatan Vasović [Thu, 19 Dec 2013 12:11:05 +0000 (13:11 +0100)] 
2 instead of 4 spaces in .csscomb.json

12 years agoFix: IE10 or lower incorrectly determines the scrollheight of the body. Use document... 11937/head
joep.joosten@ihomer.nl [Thu, 19 Dec 2013 11:41:33 +0000 (12:41 +0100)] 
Fix: IE10 or lower incorrectly determines the scrollheight of the body. Use document.documentElement for IE. To make this browser agnostic, the maximum scrollheight of both body and documentElement is used.

12 years agoFix: IE10 or lower incorrectly determines the scrollheight of the body. Use document...
joep.joosten@ihomer.nl [Thu, 19 Dec 2013 11:18:51 +0000 (12:18 +0100)] 
Fix: IE10 or lower incorrectly determines the scrollheight of the body. Use document.documentElement for IE. To make this browser agnostic, the maximum scrollheight of both body and documentElement is used.

12 years agoMerge pull request #11936 from KostyaTretyak/patch-1
Chris Rebert [Thu, 19 Dec 2013 09:23:10 +0000 (01:23 -0800)] 
Merge pull request #11936 from KostyaTretyak/patch-1

Deleted curly brackets (in css.html)

12 years agoDeleted curly brackets (in css.html) 11936/head
kostyatretyak [Thu, 19 Dec 2013 09:07:56 +0000 (11:07 +0200)] 
Deleted curly brackets (in css.html)

12 years agoMerge pull request #11935 from tlindig/tl_fix_typo_modal-open
Chris Rebert [Thu, 19 Dec 2013 08:30:04 +0000 (00:30 -0800)] 
Merge pull request #11935 from tlindig/tl_fix_typo_modal-open

Docu: typo fix: replaced 'model-open' with 'modal-open'

12 years agotypo fix: replaced 'model-open' with 'modal-open' 11935/head
Tobias Lindig [Thu, 19 Dec 2013 08:09:04 +0000 (09:09 +0100)] 
typo fix: replaced 'model-open' with 'modal-open'

12 years agoMerge pull request #11934 from twbs/auto-latest-browsers
Chris Rebert [Thu, 19 Dec 2013 07:39:03 +0000 (23:39 -0800)] 
Merge pull request #11934 from twbs/auto-latest-browsers

omit versions in Sauce browser config; no explicit version implies latest

12 years agoomit versions in Sauce browser config; no explicit version implies latest version 11934/head
Chris Rebert [Thu, 19 Dec 2013 07:21:33 +0000 (23:21 -0800)] 
omit versions in Sauce browser config; no explicit version implies latest version

12 years agoMerge pull request #11932 from dzwillia/th-td-position-static
Mark Otto [Thu, 19 Dec 2013 05:41:19 +0000 (21:41 -0800)] 
Merge pull request #11932 from dzwillia/th-td-position-static

Added position: static to table th and td when using grid classes for sizing

12 years agocheck that href id's are followed by valid char – fixes #10044
fat [Thu, 19 Dec 2013 05:14:01 +0000 (21:14 -0800)] 
check that href id's are followed by valid char – fixes #10044

12 years agoAdded position: static to table th and td. 11932/head
dzwillia [Thu, 19 Dec 2013 05:10:58 +0000 (00:10 -0500)] 
Added position: static to table th and td.

12 years agoWrite Glyphicons to _data, generate Glyphicons markup 11930/head
Ross Allen [Thu, 19 Dec 2013 04:15:23 +0000 (20:15 -0800)] 
Write Glyphicons to _data, generate Glyphicons markup

This generates a glyphicons.yml file from the glyphicons.less source,
and then components.html uses that data to generate the Glyphicons docs
by iterating through the data. The _data directory was introduced in
Jekyll 1.3.0, and GitHub Pages is already on [version 1.4.2][1].

Fixes #11862.

[1] https://github.com/github/pages-gem/blob/master/github-pages.gemspec#L16

12 years agoMerge pull request #11929 from twbs/maintainers
Mark Otto [Thu, 19 Dec 2013 03:04:18 +0000 (19:04 -0800)] 
Merge pull request #11929 from twbs/maintainers

mention core team maintenance & community contributors

12 years agomention core team maintenance & community contributors 11929/head
Chris Rebert [Thu, 19 Dec 2013 02:53:32 +0000 (18:53 -0800)] 
mention core team maintenance & community contributors

12 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Thu, 19 Dec 2013 01:34:40 +0000 (17:34 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

12 years agoFixes #11918: Fork the @h5bp contributing guidelines and combine with our coding...
Mark Otto [Thu, 19 Dec 2013 01:32:32 +0000 (17:32 -0800)] 
Fixes #11918: Fork the @h5bp contributing guidelines and combine with our coding guidelines

12 years agoFixes
Mark Otto [Thu, 19 Dec 2013 01:32:32 +0000 (17:32 -0800)] 
Fixes

12 years agofixes #11447: add docs warning about loading once for remote modal option
Mark Otto [Thu, 19 Dec 2013 00:56:41 +0000 (16:56 -0800)] 
fixes #11447: add docs warning about loading once for remote modal option

12 years agousing templating doesn't seem to work there; hardcode license URL instead
Chris Rebert [Wed, 18 Dec 2013 23:37:46 +0000 (15:37 -0800)] 
using templating doesn't seem to work there; hardcode license URL instead

Tested the customizer, the generated zip had:
    css/bootstrap.css:line 6: * Licensed under MIT (<%= _.pluck(pkg.licenses, "url").join(", ") %>)
Revised customizer generates:
    css/bootstrap.css:line 4: * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)

12 years agoMerge branch 'master' into docs_derp
Mark Otto [Thu, 19 Dec 2013 00:19:46 +0000 (16:19 -0800)] 
Merge branch 'master' into docs_derp

Conflicts:
_layouts/default.html

12 years agorebuild minified customizer JS so it reflects the licensing change
Chris Rebert [Wed, 18 Dec 2013 23:50:59 +0000 (15:50 -0800)] 
rebuild minified customizer JS so it reflects the licensing change

12 years agolicense in customizer
Mark Otto [Wed, 18 Dec 2013 23:35:24 +0000 (15:35 -0800)] 
license in customizer

12 years agoupdate licensing header in JS files & run grunt
Chris Rebert [Wed, 18 Dec 2013 23:28:08 +0000 (15:28 -0800)] 
update licensing header in JS files & run grunt

12 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Wed, 18 Dec 2013 23:26:17 +0000 (15:26 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

12 years agoupdate license faqs for apache
Mark Otto [Wed, 18 Dec 2013 23:26:07 +0000 (15:26 -0800)] 
update license faqs for apache

12 years agocleanup licensing section more
Chris Rebert [Wed, 18 Dec 2013 23:16:29 +0000 (15:16 -0800)] 
cleanup licensing section more

12 years agogrunt after that carousel merge
Mark Otto [Wed, 18 Dec 2013 23:13:50 +0000 (15:13 -0800)] 
grunt after that carousel merge