]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Zlatan Vasović [Mon, 23 Dec 2013 17:02:42 +0000 (18:02 +0100)]
Improve banner
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.
Mark Otto [Mon, 23 Dec 2013 06:32:35 +0000 (22:32 -0800)]
grunt
Mark Otto [Mon, 23 Dec 2013 06:31:28 +0000 (22:31 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
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
Mark Otto [Mon, 23 Dec 2013 06:20:23 +0000 (22:20 -0800)]
Merge pull request #11974 from XhmikosR/meta
Normalize meta
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 ...
Mark Otto [Mon, 23 Dec 2013 06:07:01 +0000 (22:07 -0800)]
fixes #11961: dropdown alignment docs improvements
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
Mark Otto [Mon, 23 Dec 2013 05:42:08 +0000 (21:42 -0800)]
space
Mark Otto [Mon, 23 Dec 2013 05:27:12 +0000 (21:27 -0800)]
add what's included
Mark Otto [Mon, 23 Dec 2013 05:23:24 +0000 (21:23 -0800)]
Merge branch 'master' into sass_docs
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
Mark Otto [Mon, 23 Dec 2013 05:05:08 +0000 (21:05 -0800)]
Remove timestamp on generated Glyhpicons
Mark Otto [Mon, 23 Dec 2013 05:01:00 +0000 (21:01 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 23 Dec 2013 05:00:53 +0000 (21:00 -0800)]
grunt
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
Chris Rebert [Sun, 22 Dec 2013 20:23:52 +0000 (12:23 -0800)]
Merge pull request #11982 from ZDroid/update-deps
Update dependencies
Zlatan Vasović [Sun, 22 Dec 2013 18:01:00 +0000 (19:01 +0100)]
Update dependencies
Zlatan Vasović [Sun, 22 Dec 2013 15:26:05 +0000 (16:26 +0100)]
Fix old links
Replace recess with less.
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
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.
XhmikosR [Tue, 17 Dec 2013 12:41:15 +0000 (14:41 +0200)]
bower.json: sort by name.
XhmikosR [Tue, 17 Dec 2013 12:39:36 +0000 (14:39 +0200)]
Normalize package.json.
XhmikosR [Mon, 16 Dec 2013 09:36:31 +0000 (11:36 +0200)]
js/.jscs.json: sort by name.
Mark Otto [Sat, 21 Dec 2013 18:36:20 +0000 (10:36 -0800)]
add section for contents
Mark Otto [Sat, 21 Dec 2013 18:09:39 +0000 (10:09 -0800)]
config url
Mark Otto [Sat, 21 Dec 2013 18:08:04 +0000 (10:08 -0800)]
Team members on About page
Mark Otto [Sat, 21 Dec 2013 17:59:24 +0000 (09:59 -0800)]
remove some unintional code
Mark Otto [Sat, 21 Dec 2013 17:45:47 +0000 (09:45 -0800)]
Merge branch 'master' into sass_docs
Mark Otto [Sat, 21 Dec 2013 17:36:51 +0000 (09:36 -0800)]
readme typo from #11965
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
tomByrer [Sat, 21 Dec 2013 16:39:34 +0000 (09:39 -0700)]
https://github.com/twbs/bootstrap/pull/11950#issuecomment-
31033824
Mark Otto [Sat, 21 Dec 2013 05:19:45 +0000 (21:19 -0800)]
more Less
Mark Otto [Sat, 21 Dec 2013 05:02:25 +0000 (21:02 -0800)]
Sass docs; LESS to Less because fuck caps
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
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
Zlatan Vasović [Fri, 20 Dec 2013 19:09:51 +0000 (20:09 +0100)]
Drop remaining leading commas
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
Zlatan Vasović [Fri, 20 Dec 2013 18:59:18 +0000 (19:59 +0100)]
Update grunt-csscomb dependency
Per David DM.
Tobias Lindig [Fri, 20 Dec 2013 16:06:53 +0000 (17:06 +0100)]
add new variables for "pagination" to improve support of customizing
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
Mark Otto [Fri, 20 Dec 2013 03:28:22 +0000 (19:28 -0800)]
correct jsbin link
Chris Rebert [Fri, 20 Dec 2013 03:10:16 +0000 (19:10 -0800)]
Merge pull request #11951 from bnewcomb/master
Fix sentence grammar
Ben Newcomb [Fri, 20 Dec 2013 02:57:43 +0000 (18:57 -0800)]
Minor grammar change
'as well' was used twice in sentence
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
Mark Otto [Thu, 19 Dec 2013 22:06:01 +0000 (14:06 -0800)]
Merge pull request #11941 from ZDroid/left-plus
No leading pluses
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
Chris Rebert [Thu, 19 Dec 2013 19:39:57 +0000 (11:39 -0800)]
"Thosing" [sic] => "Those"
Julian Thilo [Thu, 19 Dec 2013 19:12:31 +0000 (20:12 +0100)]
Fix sentence in css.html
Julian Thilo [Thu, 19 Dec 2013 18:56:36 +0000 (10:56 -0800)]
Merge pull request #11945 from robertgentel/patch-1
Update css.html
robertgentel [Thu, 19 Dec 2013 17:06:45 +0000 (11:06 -0600)]
Update css.html
Documentation (missing word)
Zlatan Vasović [Thu, 19 Dec 2013 14:32:37 +0000 (15:32 +0100)]
No leading pluses
Zlatan Vasović [Thu, 19 Dec 2013 12:11:05 +0000 (13:11 +0100)]
2 instead of 4 spaces in .csscomb.json
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)
kostyatretyak [Thu, 19 Dec 2013 09:07:56 +0000 (11:07 +0200)]
Deleted curly brackets (in css.html)
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'
Tobias Lindig [Thu, 19 Dec 2013 08:09:04 +0000 (09:09 +0100)]
typo fix: replaced 'model-open' with 'modal-open'
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
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
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
fat [Thu, 19 Dec 2013 05:14:01 +0000 (21:14 -0800)]
check that href id's are followed by valid char – fixes #10044
dzwillia [Thu, 19 Dec 2013 05:10:58 +0000 (00:10 -0500)]
Added position: static to table th and td.
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
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
Chris Rebert [Thu, 19 Dec 2013 02:53:32 +0000 (18:53 -0800)]
mention core team maintenance & community contributors
Mark Otto [Thu, 19 Dec 2013 01:34:40 +0000 (17:34 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
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
Mark Otto [Thu, 19 Dec 2013 01:32:32 +0000 (17:32 -0800)]
Fixes
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
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)
Chris Rebert [Wed, 18 Dec 2013 23:50:59 +0000 (15:50 -0800)]
rebuild minified customizer JS so it reflects the licensing change
Mark Otto [Wed, 18 Dec 2013 23:35:24 +0000 (15:35 -0800)]
license in customizer
Chris Rebert [Wed, 18 Dec 2013 23:28:08 +0000 (15:28 -0800)]
update licensing header in JS files & run grunt
Mark Otto [Wed, 18 Dec 2013 23:26:17 +0000 (15:26 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Wed, 18 Dec 2013 23:26:07 +0000 (15:26 -0800)]
update license faqs for apache
Chris Rebert [Wed, 18 Dec 2013 23:16:29 +0000 (15:16 -0800)]
cleanup licensing section more
Mark Otto [Wed, 18 Dec 2013 23:13:50 +0000 (15:13 -0800)]
grunt after that carousel merge
Mark Otto [Wed, 18 Dec 2013 23:12:51 +0000 (15:12 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Wed, 18 Dec 2013 23:12:30 +0000 (15:12 -0800)]
another apache mention
Mark Otto [Wed, 18 Dec 2013 23:08:38 +0000 (15:08 -0800)]
remove license readme mention
Mark Otto [Wed, 18 Dec 2013 23:08:16 +0000 (15:08 -0800)]
more license mentions
Mark Otto [Wed, 18 Dec 2013 23:01:47 +0000 (15:01 -0800)]
Merge pull request #11416 from danielboendergaard/carousel-duration
Carousel: Use the transition duration from CSS
Mark Otto [Wed, 18 Dec 2013 22:56:08 +0000 (14:56 -0800)]
version bump
Mark Otto [Wed, 18 Dec 2013 22:54:24 +0000 (14:54 -0800)]
Punt Apache license information and stick with MIT
Mark Otto [Wed, 18 Dec 2013 22:52:50 +0000 (14:52 -0800)]
grunt
Mark Otto [Wed, 18 Dec 2013 22:49:05 +0000 (14:49 -0800)]
Merge pull request #11928 from twbs/we_have_to_go_back_kate
Follow up to reverted commits
Mark Otto [Wed, 18 Dec 2013 22:38:10 +0000 (14:38 -0800)]
drop the the, it's cleaner
Mark Otto [Wed, 18 Dec 2013 22:37:30 +0000 (14:37 -0800)]
derp
Mark Otto [Wed, 18 Dec 2013 22:29:33 +0000 (14:29 -0800)]
buttons should be more mixin friendly
Mark Otto [Wed, 18 Dec 2013 22:28:03 +0000 (14:28 -0800)]
navbars need to use prefixed nav class or they won't work as expected
Mark Otto [Wed, 18 Dec 2013 22:27:21 +0000 (14:27 -0800)]
restore inline block on breadcrumbs and ensure proper code formatting for readibility
Mark Otto [Wed, 18 Dec 2013 22:26:37 +0000 (14:26 -0800)]
run grunt dist
Mark Otto [Wed, 18 Dec 2013 22:24:59 +0000 (14:24 -0800)]
rewrite readme to restore lost information, only with a bit more formatting consistency
Mark Otto [Wed, 18 Dec 2013 22:21:35 +0000 (14:21 -0800)]
Merge pull request #11927 from twbs/revert_commits
Revert commits
Julian Thilo [Wed, 18 Dec 2013 21:58:13 +0000 (22:58 +0100)]
Revert commits
Bootstrap is being relicensed from Apache 2.0 to MIT so that more of our community can use the free and open source software we lovely create together. As commits are copyright their original authors, the commits of any individual not agreeing to relicense their contributions are being removed to be later rewritten by the @twbs/team.
This undoes the changes introduced by the following commits:
https://github.com/twbs/bootstrap/commit/
7ea34ae0ef79c793e9a9d393b4eef825b71e84b5 , https://github.com/twbs/bootstrap/commit/
7376eef378fe7d5e69b8b8cce93c7c64b751d55a , https://github.com/twbs/bootstrap/commit/
303ba1326bbe367598ab4cc063b4607507208e56 , https://github.com/twbs/bootstrap/commit/
7d1c8c2a0ce16331583a965821690f7715e62908 , https://github.com/twbs/bootstrap/commit/
11319f6da9f9a19ec40743cdfe868ac732698149 , https://github.com/twbs/bootstrap/commit/
110fc8860117d8675345806219ba313b18086db2 , https://github.com/twbs/bootstrap/commit/
ced08f69359f3a70771804a98fa3c499f388cc74
Mark Otto [Wed, 18 Dec 2013 21:01:43 +0000 (13:01 -0800)]
Merge pull request #11881 from ZDroid/patch-1
Require comma on left side
Mark Otto [Wed, 18 Dec 2013 20:57:38 +0000 (12:57 -0800)]
Merge pull request #11804 from twbs/css-source-maps
enable CSS source maps in grunt-contrib-less
Chris Rebert [Wed, 18 Dec 2013 19:45:30 +0000 (11:45 -0800)]
fix typo
Mark Otto [Wed, 18 Dec 2013 18:23:46 +0000 (10:23 -0800)]
add source maps