]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 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.

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

11 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

11 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

11 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

11 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

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

11 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

11 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.

11 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

11 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

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

11 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

11 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

11 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

11 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

11 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

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

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

11 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

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

Documentation (missing word)

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

11 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

11 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)

11 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)

11 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'

11 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'

11 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

11 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

11 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

11 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

11 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.

11 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

11 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

11 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

11 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

11 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

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

11 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

11 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)

11 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

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

11 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

11 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

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

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

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

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

11 years agoanother apache mention
Mark Otto [Wed, 18 Dec 2013 23:12:30 +0000 (15:12 -0800)] 
another apache mention

11 years agoremove license readme mention
Mark Otto [Wed, 18 Dec 2013 23:08:38 +0000 (15:08 -0800)] 
remove license readme mention

11 years agomore license mentions
Mark Otto [Wed, 18 Dec 2013 23:08:16 +0000 (15:08 -0800)] 
more license mentions

11 years agoMerge pull request #11416 from danielboendergaard/carousel-duration
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

11 years agoversion bump
Mark Otto [Wed, 18 Dec 2013 22:56:08 +0000 (14:56 -0800)] 
version bump

11 years agoPunt Apache license information and stick with MIT
Mark Otto [Wed, 18 Dec 2013 22:54:24 +0000 (14:54 -0800)] 
Punt Apache license information and stick with MIT

11 years agogrunt
Mark Otto [Wed, 18 Dec 2013 22:52:50 +0000 (14:52 -0800)] 
grunt

11 years agoMerge pull request #11928 from twbs/we_have_to_go_back_kate
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

11 years agodrop the the, it's cleaner 11928/head
Mark Otto [Wed, 18 Dec 2013 22:38:10 +0000 (14:38 -0800)] 
drop the the, it's cleaner

11 years agoderp
Mark Otto [Wed, 18 Dec 2013 22:37:30 +0000 (14:37 -0800)] 
derp

11 years agobuttons should be more mixin friendly
Mark Otto [Wed, 18 Dec 2013 22:29:33 +0000 (14:29 -0800)] 
buttons should be more mixin friendly

11 years agonavbars need to use prefixed nav class or they won't work as expected
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

11 years agorestore inline block on breadcrumbs and ensure proper code formatting for readibility
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

11 years agorun grunt dist
Mark Otto [Wed, 18 Dec 2013 22:26:37 +0000 (14:26 -0800)] 
run grunt dist

11 years agorewrite readme to restore lost information, only with a bit more formatting consistency
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

11 years agoMerge pull request #11927 from twbs/revert_commits
Mark Otto [Wed, 18 Dec 2013 22:21:35 +0000 (14:21 -0800)] 
Merge pull request #11927 from twbs/revert_commits

Revert commits

11 years agoRevert commits 11927/head
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

11 years agoMerge pull request #11881 from ZDroid/patch-1
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

11 years agoMerge pull request #11804 from twbs/css-source-maps
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

11 years agofix typo
Chris Rebert [Wed, 18 Dec 2013 19:45:30 +0000 (11:45 -0800)] 
fix typo

11 years agoadd source maps 11804/head
Mark Otto [Wed, 18 Dec 2013 18:23:46 +0000 (10:23 -0800)] 
add source maps

11 years agoMerge branch 'master' into css-source-maps
Mark Otto [Wed, 18 Dec 2013 18:22:18 +0000 (10:22 -0800)] 
Merge branch 'master' into css-source-maps

Conflicts:
Gruntfile.js

11 years agoFixes #11899: Ensure proper margins and .small/small usage for heading tags (e.g...
Mark Otto [Wed, 18 Dec 2013 17:49:05 +0000 (09:49 -0800)] 
Fixes #11899: Ensure proper margins and .small/small usage for heading tags (e.g., .h1-.h6)

11 years agoadd inline note about navbar sizing
Mark Otto [Wed, 18 Dec 2013 17:48:04 +0000 (09:48 -0800)] 
add inline note about navbar sizing

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Wed, 18 Dec 2013 17:42:45 +0000 (09:42 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofixes #11925: cover template for firefox
Mark Otto [Wed, 18 Dec 2013 17:42:37 +0000 (09:42 -0800)] 
fixes #11925: cover template for firefox

11 years agoMerge pull request #11923 from wangsai/fix-id
Chris Rebert [Wed, 18 Dec 2013 09:05:48 +0000 (01:05 -0800)] 
Merge pull request #11923 from wangsai/fix-id

fix href of "Browser and device support"

11 years agofix href of "Browser and device support" 11923/head
wangsai [Wed, 18 Dec 2013 08:57:55 +0000 (16:57 +0800)] 
fix href of "Browser and device support"

11 years agoMerge pull request #11910 from InWayOpenSource/btn-group-inside-input-group-btn
Mark Otto [Wed, 18 Dec 2013 06:49:55 +0000 (22:49 -0800)] 
Merge pull request #11910 from InWayOpenSource/btn-group-inside-input-group-btn

Fix handling of .btn-group placed inside .input-group-btn

11 years agoMerge pull request #11916 from ZDroid/fix-iversions
Chris Rebert [Tue, 17 Dec 2013 19:46:54 +0000 (11:46 -0800)] 
Merge pull request #11916 from ZDroid/fix-iversions

Downgrade Safari and OS X

11 years agoDowngrade Safari and OS X 11916/head
Zlatan Vasović [Tue, 17 Dec 2013 19:39:32 +0000 (20:39 +0100)] 
Downgrade Safari and OS X

11 years agoenable failHard grunt-html-validation option; fixes #11876 11917/head
Chris Rebert [Tue, 17 Dec 2013 09:35:16 +0000 (01:35 -0800)] 
enable failHard grunt-html-validation option; fixes #11876

11 years agoupgrade to grunt-html-validation v0.1.11
Chris Rebert [Tue, 17 Dec 2013 09:29:19 +0000 (01:29 -0800)] 
upgrade to grunt-html-validation v0.1.11

11 years agoFix handling of btn-group placed inside input-group-btn (used for mixing dropdowns... 11910/head
Sebastian Podjasek [Mon, 16 Dec 2013 21:47:09 +0000 (22:47 +0100)] 
Fix handling of btn-group placed inside input-group-btn (used for mixing dropdowns with normal buttons)

11 years agoRequire comma on left side 11881/head
Zlatan Vasović [Sun, 15 Dec 2013 19:04:32 +0000 (20:04 +0100)] 
Require comma on left side

11 years agoMerge pull request #11893 from twbs/separate-browsers-file
Chris Rebert [Mon, 16 Dec 2013 08:43:21 +0000 (00:43 -0800)] 
Merge pull request #11893 from twbs/separate-browsers-file

move Sauce test browsers list out of Gruntfile into separate file

11 years agomove Sauce test browsers list out of Gruntfile into separate file 11893/head
Chris Rebert [Mon, 16 Dec 2013 08:30:04 +0000 (00:30 -0800)] 
move Sauce test browsers list out of Gruntfile into separate file

11 years agoMerge pull request #11891 from twbs/cache-jekyll-bundle
Chris Rebert [Mon, 16 Dec 2013 08:02:42 +0000 (00:02 -0800)] 
Merge pull request #11891 from twbs/cache-jekyll-bundle

use S3-cached Jekyll install to further speed up the Travis build

11 years agouse S3-cached Jekyll install 11891/head
Chris Rebert [Sun, 15 Dec 2013 05:02:15 +0000 (21:02 -0800)] 
use S3-cached Jekyll install

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 16 Dec 2013 06:10:05 +0000 (22:10 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoinform the people that fixed positioning ain't all it's cracked up to be /cc #11888
Mark Otto [Mon, 16 Dec 2013 06:09:45 +0000 (22:09 -0800)] 
inform the people that fixed positioning ain't all it's cracked up to be /cc #11888

11 years agoMerge pull request #11887 from twbs/minor-panels-refactor
Mark Otto [Mon, 16 Dec 2013 06:04:57 +0000 (22:04 -0800)] 
Merge pull request #11887 from twbs/minor-panels-refactor

minor refactoring of 4ee93c9f8529cfeef56d4178b91e1ddcb0bff09c

11 years agoMerge pull request #11890 from twbs/generic-caching
Chris Rebert [Mon, 16 Dec 2013 05:26:52 +0000 (21:26 -0800)] 
Merge pull request #11890 from twbs/generic-caching

make S3 caching significantly more generic

11 years agomake S3 caching significantly more generic 11890/head
Chris Rebert [Mon, 16 Dec 2013 05:09:01 +0000 (21:09 -0800)] 
make S3 caching significantly more generic

11 years agominor refactoring of 4ee93c9f8529cfeef56d4178b91e1ddcb0bff09c 11887/head
Chris Rebert [Mon, 16 Dec 2013 04:38:06 +0000 (20:38 -0800)] 
minor refactoring of 4ee93c9f8529cfeef56d4178b91e1ddcb0bff09c

11 years agoMerge pull request #11886 from twbs/html-validator-config
Chris Rebert [Mon, 16 Dec 2013 03:45:34 +0000 (19:45 -0800)] 
Merge pull request #11886 from twbs/html-validator-config

explicitly set more HTML5 validator options

11 years agoexplicitly set more HTML5 validator options 11886/head
Chris Rebert [Mon, 16 Dec 2013 03:42:47 +0000 (19:42 -0800)] 
explicitly set more HTML5 validator options

11 years agouse unique IDs for input feedback examples so HTML validates
Chris Rebert [Mon, 16 Dec 2013 03:15:26 +0000 (19:15 -0800)] 
use unique IDs for input feedback examples so HTML validates

11 years agouse unique IDs for modal labels in doc examples so HTML validates
Chris Rebert [Mon, 16 Dec 2013 03:07:14 +0000 (19:07 -0800)] 
use unique IDs for modal labels in doc examples so HTML validates

11 years agosimplify JS snippet slightly
Chris Rebert [Mon, 16 Dec 2013 03:00:37 +0000 (19:00 -0800)] 
simplify JS snippet slightly

11 years agofix typo in docs
Chris Rebert [Mon, 16 Dec 2013 02:45:56 +0000 (18:45 -0800)] 
fix typo in docs

11 years agofix var name in example to follow JS conventions
Chris Rebert [Mon, 16 Dec 2013 02:18:55 +0000 (18:18 -0800)] 
fix var name in example to follow JS conventions