]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Chris Rebert [Mon, 14 Oct 2013 06:18:30 +0000 (23:18 -0700)]
use CDN for respond.js
Mark Otto [Mon, 14 Oct 2013 03:26:36 +0000 (20:26 -0700)]
Merge pull request #11046 from ZDroid/patch-3
Nicer docs license name
Mark Otto [Mon, 14 Oct 2013 03:12:07 +0000 (20:12 -0700)]
run grunt
Mark Otto [Mon, 14 Oct 2013 03:04:28 +0000 (20:04 -0700)]
no trailing decimal place
Mark Otto [Mon, 14 Oct 2013 03:04:00 +0000 (20:04 -0700)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 14 Oct 2013 03:03:02 +0000 (20:03 -0700)]
Merge pull request #10949 from StevenBlack/jumbotron.fontsize
Jumbotron: remove the hard-coded font-size from jumbotron.less and moved...
Mark Otto [Mon, 14 Oct 2013 03:02:24 +0000 (20:02 -0700)]
scope top padding of .form-control-static to be within horizontal forms only; fixes #10927
Mark Otto [Mon, 14 Oct 2013 02:59:42 +0000 (19:59 -0700)]
move .hidden to utilities; fixes #10997
Mark Otto [Mon, 14 Oct 2013 02:57:45 +0000 (19:57 -0700)]
run grunt on that scaffolding change
Mark Otto [Mon, 14 Oct 2013 02:57:23 +0000 (19:57 -0700)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 14 Oct 2013 02:57:14 +0000 (19:57 -0700)]
fix #10257
Mark Otto [Mon, 14 Oct 2013 02:41:12 +0000 (19:41 -0700)]
Merge pull request #10955 from ZDroid/patch-1
Insert comma to fix validation warning
Mark Otto [Mon, 14 Oct 2013 02:36:39 +0000 (19:36 -0700)]
clarify more grid stuff, specifically 100% fluid designs; fixes #10711
Mark Otto [Mon, 14 Oct 2013 02:31:39 +0000 (19:31 -0700)]
mention rows must be in containers in grid docs
Mark Otto [Mon, 14 Oct 2013 02:24:13 +0000 (19:24 -0700)]
docs notice for #11010
Mark Otto [Mon, 14 Oct 2013 02:12:23 +0000 (19:12 -0700)]
follow up to #10102, cc @cvrebert
Mark Otto [Mon, 14 Oct 2013 02:10:17 +0000 (19:10 -0700)]
add docs example for #10938 to show responsive column clearing in grid
Mark Otto [Mon, 14 Oct 2013 02:03:29 +0000 (19:03 -0700)]
Merge pull request #11050 from twbs/restore_grid_mixins
Restore grid mixins
Mark Otto [Mon, 14 Oct 2013 01:59:40 +0000 (18:59 -0700)]
Merge branch 'master' into restore_grid_mixins
Conflicts:
dist/css/bootstrap.min.css
Mark Otto [Mon, 14 Oct 2013 01:58:09 +0000 (18:58 -0700)]
comment and spacing
Mark Otto [Mon, 14 Oct 2013 01:56:31 +0000 (18:56 -0700)]
drop .tabbable since it's unused and undocumented /cc #10102
Mark Otto [Mon, 14 Oct 2013 01:56:03 +0000 (18:56 -0700)]
mention .invisible in docs per #10102
Mark Otto [Mon, 14 Oct 2013 01:54:15 +0000 (18:54 -0700)]
mention .invisible in docs per #10102
Mark Otto [Mon, 14 Oct 2013 01:49:13 +0000 (18:49 -0700)]
mention tooltip markup in docs per #10102
Mark Otto [Mon, 14 Oct 2013 01:44:06 +0000 (18:44 -0700)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 14 Oct 2013 01:43:19 +0000 (18:43 -0700)]
mention .modal-open and .modal-backdrop in docs /cc #10102
Mark Otto [Mon, 14 Oct 2013 01:40:47 +0000 (18:40 -0700)]
mention .dropdown-backdrop and .open in dropdown docs /cc #10102
Mark Otto [Mon, 14 Oct 2013 01:35:10 +0000 (18:35 -0700)]
Merge pull request #11016 from twbs/address-10965
address #10965; mention Glyphicons-over-file:// problem in Carousel example
Mark Otto [Mon, 14 Oct 2013 01:32:34 +0000 (18:32 -0700)]
Merge branch 'master' into restore_grid_mixins
Conflicts:
dist/css/bootstrap.min.css
Mark Otto [Mon, 14 Oct 2013 00:25:27 +0000 (17:25 -0700)]
another grid .row mention
Mark Otto [Mon, 14 Oct 2013 00:12:04 +0000 (17:12 -0700)]
finish grid docs intro for now; needs work though
Mark Otto [Sun, 13 Oct 2013 23:02:56 +0000 (16:02 -0700)]
mention .small in docs /cc #10102
Mark Otto [Sun, 13 Oct 2013 22:55:13 +0000 (15:55 -0700)]
remove undocumented and unsupported .pill-content and .pill-pane /cc #10102
Mark Otto [Sun, 13 Oct 2013 22:54:49 +0000 (15:54 -0700)]
run grunt dist on .small additions
Mark Otto [Sun, 13 Oct 2013 22:24:48 +0000 (15:24 -0700)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 13 Oct 2013 22:24:39 +0000 (15:24 -0700)]
remove screen from all docs media queries
Mark Otto [Sun, 13 Oct 2013 22:23:58 +0000 (15:23 -0700)]
Document caret /cc #10102
Zlatan Vasović [Sun, 13 Oct 2013 10:53:48 +0000 (12:53 +0200)]
Sort dependencies A-Z
Mark Otto [Sat, 12 Oct 2013 23:58:49 +0000 (16:58 -0700)]
Merge pull request #11059 from ZDroid/patch-5
Add more functionality to .small to match <small>
Mark Otto [Sat, 12 Oct 2013 22:35:07 +0000 (15:35 -0700)]
Merge pull request #10933 from ZDroid/patch-2
Change border to border-radius
Zlatan Vasović [Sat, 12 Oct 2013 21:28:50 +0000 (23:28 +0200)]
Add more functionality to .small
Mark Otto [Sat, 12 Oct 2013 05:01:11 +0000 (22:01 -0700)]
restore var to customizer
Mark Otto [Sat, 12 Oct 2013 05:00:37 +0000 (22:00 -0700)]
Combine separate efforts for grid mixins into one, cleanup and reorganize
Mark Otto [Sat, 12 Oct 2013 01:52:57 +0000 (18:52 -0700)]
Merge pull request #11049 from alexdahl/multiple-modals-doc
documentation that multiple modals are not supported
Alex Dahl [Sat, 12 Oct 2013 01:11:58 +0000 (18:11 -0700)]
documentation that multiple modals are not supported
Zlatan Vasović [Fri, 11 Oct 2013 20:53:38 +0000 (22:53 +0200)]
Nicer docs license name
DOCUMENTATION-LICENSE is so long.
Mark Otto [Thu, 10 Oct 2013 20:37:06 +0000 (13:37 -0700)]
Merge pull request #11018 from twbs/use-https
use https:// for CDN links
Chris Rebert [Thu, 10 Oct 2013 09:27:26 +0000 (02:27 -0700)]
fix typo in Getting Started docs prose
Chris Rebert [Thu, 10 Oct 2013 08:51:09 +0000 (01:51 -0700)]
use https:// for CDN links
- works when viewing page via file://
- sets a good example security-wise
Chris Rebert [Thu, 10 Oct 2013 08:42:34 +0000 (01:42 -0700)]
address #10965; mention Glyphicons-over-file:// problem in Carousel example
Mark Otto [Thu, 10 Oct 2013 03:05:21 +0000 (20:05 -0700)]
Merge pull request #11013 from twbs/fix-10989
Use CDNs for more example JavaScripts
Chris Rebert [Thu, 10 Oct 2013 02:49:44 +0000 (19:49 -0700)]
Merge pull request #11015 from twbs/use-data-ride-carousel
use data-ride="carousel" in the docs & examples; fixes #11005
Chris Rebert [Thu, 10 Oct 2013 02:29:25 +0000 (19:29 -0700)]
use data-ride="carousel" in the docs & examples; fixes #11005
Chris Rebert [Thu, 10 Oct 2013 01:58:50 +0000 (18:58 -0700)]
re-remove execute permissions; apparent upstream bug
Chris Rebert [Thu, 10 Oct 2013 01:52:19 +0000 (18:52 -0700)]
upgrade holder.js to v2.1
Chris Rebert [Thu, 10 Oct 2013 01:31:17 +0000 (18:31 -0700)]
Merge pull request #10956 from ZDroid/patch-4
Sort tasks alphabetically
Kurt Maine [Sat, 5 Oct 2013 00:57:03 +0000 (19:57 -0500)]
Convert "Recess" to "RECESS"
Except when speaking of the "recess" Node package, RECESS should be in all-caps.
Chris Rebert [Thu, 10 Oct 2013 01:07:08 +0000 (18:07 -0700)]
fix #10805
Chris Rebert [Thu, 10 Oct 2013 00:57:52 +0000 (17:57 -0700)]
trivial refactor in build-customizer grunt task
herom [Wed, 21 Aug 2013 09:46:45 +0000 (14:16 +0430)]
Fixes #9925: convert font data to base64, fixing 0xefbfbd (Unicode Replacement Character) chars in customizer fonts.
Merges #9982
Stuart P. Bentley [Sat, 14 Sep 2013 08:26:42 +0000 (04:26 -0400)]
Customizer: include config.json in bootstrap.zip
merges #10633; fixes part of #9951
Chris Rebert [Wed, 9 Oct 2013 22:21:03 +0000 (15:21 -0700)]
use CDN for jQuery instead of vendoring it; fixes part of #10989
Chris Rebert [Wed, 9 Oct 2013 22:09:50 +0000 (15:09 -0700)]
use CDN for html5shiv instead of vendoring it; fixes part of #10989
Chris Rebert [Wed, 9 Oct 2013 22:27:14 +0000 (15:27 -0700)]
there's no reason for holder.js to be executable
Chris Rebert [Wed, 9 Oct 2013 19:45:43 +0000 (12:45 -0700)]
Merge pull request #10896 from ZDroid/patch-3
Change clone protocol from git:// to https://
Mark Otto [Wed, 9 Oct 2013 17:12:17 +0000 (10:12 -0700)]
Merge pull request #10998 from ZDroid/patch-7
Remove [type]
Chris Rebert [Wed, 9 Oct 2013 08:39:56 +0000 (01:39 -0700)]
Merge pull request #10996 from ZDroid/patch-6
Updare grunt-jekyll dependency
Zlatan Vasović [Wed, 9 Oct 2013 07:45:05 +0000 (09:45 +0200)]
Remove [type]
type="text/css" isn't needed
Zlatan Vasović [Wed, 9 Oct 2013 06:33:03 +0000 (08:33 +0200)]
Updare grunt-jekyll dependency
Chris Rebert [Tue, 8 Oct 2013 18:44:30 +0000 (11:44 -0700)]
fix #10986
Mark Otto [Mon, 7 Oct 2013 20:00:46 +0000 (15:00 -0500)]
Fixes #10126: Update responsive test cases to properly highlight hidden class examples
Mark Otto [Mon, 7 Oct 2013 19:39:11 +0000 (14:39 -0500)]
Half fix for #9855: Don't fuck with margins for open modal dialog on account of Lion non-scrollbars and inconsistencies elsewhere
Mark Otto [Mon, 7 Oct 2013 19:32:29 +0000 (14:32 -0500)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 7 Oct 2013 19:32:23 +0000 (14:32 -0500)]
Fixes #10959: round the .lead values down to nearest pixel via floor()
Mark Otto [Mon, 7 Oct 2013 19:31:41 +0000 (14:31 -0500)]
run grunt
Chris Rebert [Mon, 7 Oct 2013 07:55:21 +0000 (00:55 -0700)]
Merge pull request #10962 from twbs/doc-h1-thru-h6-classes
document .h1 thru .h6; fixes part of #10102
Chris Rebert [Mon, 7 Oct 2013 03:18:03 +0000 (20:18 -0700)]
document .h1 thru .h6; fixes part of #10102
Mark Otto [Mon, 7 Oct 2013 00:06:40 +0000 (19:06 -0500)]
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
css.html
Mark Otto [Sun, 6 Oct 2013 23:35:07 +0000 (18:35 -0500)]
update gitignore to restore the ruby-version ignore and rename section to all docs stuff
Chris Rebert [Sun, 6 Oct 2013 23:17:32 +0000 (16:17 -0700)]
fix #10961
Mark Otto [Sun, 6 Oct 2013 22:24:32 +0000 (17:24 -0500)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 6 Oct 2013 22:24:26 +0000 (17:24 -0500)]
fixes #10961: change variable names in grid docs
Steven Black [Sun, 6 Oct 2013 00:48:28 +0000 (20:48 -0400)]
Good catch by @juthilo - omitted the modified in a prior commit.
Steven Black [Sat, 5 Oct 2013 22:38:45 +0000 (18:38 -0400)]
The customizer now displays and collects the new Jumbotron font-size LESS variable
Steven Black [Sat, 5 Oct 2013 22:37:53 +0000 (18:37 -0400)]
The Jumbotron font-size LESS variable now conforms to the '@{bootstrapClass}-font-size' naming scheme.
Zlatan Vasović [Sat, 5 Oct 2013 19:17:49 +0000 (21:17 +0200)]
Sort tasks alphabetically
Zlatan Vasović [Sat, 5 Oct 2013 18:14:19 +0000 (20:14 +0200)]
Insert comma to fix validation warning
BS doesn't support IE6/IE7, so comma can be inserted.
Mark Otto [Sat, 5 Oct 2013 17:59:44 +0000 (10:59 -0700)]
Merge pull request #10950 from twbs/docs-navbar-class
Fix #10948: Clarify navbar example target in docs
Julian Thilo [Sat, 5 Oct 2013 17:32:52 +0000 (19:32 +0200)]
Change all navbar example targets
According to comment on https://github.com/twbs/bootstrap/issues/10948#issuecomment-
25751889 .
Mark Otto [Wed, 2 Oct 2013 05:11:51 +0000 (00:11 -0500)]
merge in new ads
Julian Thilo [Sat, 5 Oct 2013 09:37:52 +0000 (11:37 +0200)]
Fix #10948: Clarify navbar example target in docs
Steven Black [Sat, 5 Oct 2013 01:43:31 +0000 (21:43 -0400)]
Jumbotron: remove the hard-coded font-size from jumbotron.less and moved it into variables.less where other .font-size-xxxxx things now live.
Julian Thilo [Fri, 4 Oct 2013 06:21:30 +0000 (23:21 -0700)]
Merge pull request #10932 from ZDroid/patch-1
Correct grammar
Zlatan Vasović [Thu, 3 Oct 2013 21:15:49 +0000 (23:15 +0200)]
Change border to border-radius
Border isn't set, but border-radius is.
Zlatan Vasović [Thu, 3 Oct 2013 21:05:23 +0000 (23:05 +0200)]
Correct grammar
Jekyll is the third person singular (it), so it should be 'its documentation', not 'their documentation'.
Tobias Lindig [Thu, 12 Sep 2013 08:45:15 +0000 (10:45 +0200)]
unify button sizing, use mixin ".button-size" also for the base sized button
Chris Rebert [Thu, 3 Oct 2013 17:42:55 +0000 (10:42 -0700)]
run grunt
Chris Rebert [Thu, 3 Oct 2013 17:21:39 +0000 (10:21 -0700)]
Merge pull request #10871 from ZDroid/patch-2
Remove .ruby-version from excludes
Mark Otto [Wed, 2 Oct 2013 17:59:03 +0000 (10:59 -0700)]
Merge pull request #10908 from ZDroid/patch-4
Indent banner to match the *'s
Zlatan Vasović [Wed, 2 Oct 2013 12:33:17 +0000 (14:33 +0200)]
Indent banner to match the *'s