]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Michael Silber [Wed, 2 Jul 2014 20:49:03 +0000 (16:49 -0400)]
Add collapsed default class to navbar-toggle
XhmikosR [Wed, 2 Jul 2014 08:52:08 +0000 (11:52 +0300)]
Merge pull request #14001 from twbs/docs-dist
Copy all files in docs/dist.
XhmikosR [Tue, 1 Jul 2014 04:35:33 +0000 (07:35 +0300)]
Copy all files in docs/dist.
Now we are on par with what we have on the gh-pages dist/ folder.
XhmikosR [Tue, 1 Jul 2014 04:24:14 +0000 (07:24 +0300)]
Update dependencies.
Chris Rebert [Mon, 30 Jun 2014 21:49:11 +0000 (14:49 -0700)]
Merge pull request #13988 from twbs/fix-13896
doc that you can't use both data-ride and $().carousel() on the same carousel
Mark Otto [Mon, 30 Jun 2014 18:39:37 +0000 (11:39 -0700)]
Merge pull request #13993 from twbs/fix-13964
Fix #13964
Chris Rebert [Mon, 30 Jun 2014 17:27:55 +0000 (10:27 -0700)]
fix #13964
XhmikosR [Mon, 30 Jun 2014 15:35:17 +0000 (18:35 +0300)]
Update dependencies.
Julian Thilo [Mon, 30 Jun 2014 15:10:57 +0000 (17:10 +0200)]
Merge pull request #13992 from pjrobertson/master
Fix inconsistency between demo and displayed code for modal demo
Patrick Robertson [Mon, 30 Jun 2014 12:19:18 +0000 (19:19 +0700)]
Fix inconsistency between demo and displayed code for modal demo
Fixes #13991
Chris Rebert [Mon, 30 Jun 2014 04:16:44 +0000 (21:16 -0700)]
doc that you can't use both data-ride and $().carousel() on the same carousel; fixes #13896
[skip sauce]
Chris Rebert [Mon, 30 Jun 2014 02:58:09 +0000 (19:58 -0700)]
fix #13979
XhmikosR [Sun, 29 Jun 2014 05:39:40 +0000 (08:39 +0300)]
Update to Jekyll 2.1.x.
Mark Otto [Sun, 29 Jun 2014 04:43:04 +0000 (21:43 -0700)]
Merge pull request #13954 from hnrch02/persist-preview-theme
Save "Preview theme" state; resolves #13940
Mark Otto [Sat, 28 Jun 2014 23:23:06 +0000 (16:23 -0700)]
fixes #13968
XhmikosR [Fri, 27 Jun 2014 04:35:22 +0000 (07:35 +0300)]
Update "grunt-autoprefixer".
Heinrich Fenkart [Fri, 27 Jun 2014 00:08:58 +0000 (02:08 +0200)]
Save "Preview theme" state; resolves #13940
Mark Otto [Thu, 26 Jun 2014 21:47:44 +0000 (14:47 -0700)]
Merge pull request #13931 from ByScripts/patch-1
Remove "pointer" cursor on disabled list-group-item
Chris Rebert [Thu, 26 Jun 2014 20:01:15 +0000 (13:01 -0700)]
JSCS hotfix
[skip sauce] [skip validator]
Chris Rebert [Thu, 26 Jun 2014 19:25:05 +0000 (12:25 -0700)]
Merge pull request #13947 from twbs/fix-13937
Fix popover live demos in docs
Chris Rebert [Thu, 26 Jun 2014 19:17:37 +0000 (12:17 -0700)]
regenerate docs.min.js
[skip sauce]
Chris Rebert [Thu, 26 Jun 2014 19:15:20 +0000 (12:15 -0700)]
docs: minor correction to the focus-triggered popover demo explanation
Chris Rebert [Thu, 26 Jun 2014 18:41:40 +0000 (11:41 -0700)]
add docs JS to activate popover demos; fixes #13937
Chris Rebert [Thu, 26 Jun 2014 19:12:37 +0000 (12:12 -0700)]
Merge pull request #13946 from rufo/patch-1
Fixed apostrophe typo on home page
Rufo Sanchez [Thu, 26 Jun 2014 19:09:59 +0000 (15:09 -0400)]
Fixed crazy-making typo on home page
...at least if you're a writing nerd :P "Bootstrap ships with vanilla CSS, but *its* source code..."
Mark Otto [Thu, 26 Jun 2014 18:46:45 +0000 (11:46 -0700)]
Merge pull request #13939 from twbs/tree-shaking
Remove apparent dead code from docs JS
Chris Rebert [Thu, 26 Jun 2014 18:38:41 +0000 (11:38 -0700)]
Merge pull request #13942 from twbs/docs-grunt-13938
Fix link to compiling info.
XhmikosR [Thu, 26 Jun 2014 18:05:50 +0000 (21:05 +0300)]
Fix link to compiling info. Fixes #13938.
[skip sauce]
Chris Rebert [Thu, 26 Jun 2014 17:53:55 +0000 (10:53 -0700)]
rm apparent dead code from docs JS
.bs-docs-navbar class doesn't seem to be used anywhere at all
Chris Rebert [Thu, 26 Jun 2014 17:52:12 +0000 (10:52 -0700)]
add comment explaining which demos this JS is for
Chris Rebert [Thu, 26 Jun 2014 17:51:07 +0000 (10:51 -0700)]
fix class names in popover live examples in docs
Mark Otto [Thu, 26 Jun 2014 16:36:48 +0000 (09:36 -0700)]
maxcdn urls
Mark Otto [Thu, 26 Jun 2014 16:13:24 +0000 (09:13 -0700)]
bump to v3.2.0
Thierry Goettelmann [Thu, 26 Jun 2014 14:31:37 +0000 (16:31 +0200)]
Change cursor from "default" to "not-allowed" if disabled
Thierry Goettelmann [Thu, 26 Jun 2014 13:50:20 +0000 (15:50 +0200)]
Remove "pointer" cursor on disabled list-group-item
Mark Otto [Thu, 26 Jun 2014 09:49:35 +0000 (02:49 -0700)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Thu, 26 Jun 2014 09:49:21 +0000 (02:49 -0700)]
grunt
Mark Otto [Thu, 26 Jun 2014 07:06:02 +0000 (00:06 -0700)]
Merge pull request #13574 from twbs/reinstate-13470
Delete redundant Grunt info in README (Merge before shipping)
Mark Otto [Thu, 26 Jun 2014 06:03:40 +0000 (23:03 -0700)]
grunt
Mark Otto [Thu, 26 Jun 2014 05:29:02 +0000 (22:29 -0700)]
Merge pull request #13905 from Jimtrim/patch-1
Update cover.css
Chris Rebert [Thu, 26 Jun 2014 01:04:49 +0000 (18:04 -0700)]
Mozilla bug says the fix targeted v31
Mark Otto [Wed, 25 Jun 2014 23:57:22 +0000 (16:57 -0700)]
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Mark Otto [Wed, 25 Jun 2014 23:56:36 +0000 (16:56 -0700)]
fixes #13912: make radios/checkboxes work with inline forms again
XhmikosR [Tue, 24 Jun 2014 22:53:18 +0000 (01:53 +0300)]
XhmikosR [Tue, 24 Jun 2014 22:53:10 +0000 (01:53 +0300)]
Revert "Revert "Turn off clean-css' advanced optimizations.""
This reverts commit
e31c2edf885efd42d2e755f189cc15125d977d70 .
Chris Rebert [Tue, 24 Jun 2014 21:55:51 +0000 (14:55 -0700)]
grunt dist; closes #13914
Chris Rebert [Tue, 24 Jun 2014 21:54:51 +0000 (14:54 -0700)]
Revert "Turn off clean-css' advanced optimizations."
This reverts commit
25ca51319b016bc4e42e1ba882d6f191e001d65d .
Chris Rebert [Tue, 24 Jun 2014 21:49:44 +0000 (14:49 -0700)]
update shrinkwrap to get clean-css v2.2.3
Refs #13914
Refs https://github.com/GoalSmashers/clean-css/issues/302
Chris Rebert [Tue, 24 Jun 2014 20:18:46 +0000 (13:18 -0700)]
Merge pull request #13781 from twbs/saucier
Reenable additional Sauce browsers
Chris Rebert [Tue, 10 Jun 2014 19:24:56 +0000 (12:24 -0700)]
reenable Win7 IE8-9 in Sauce
Chris Rebert [Tue, 10 Jun 2014 19:23:48 +0000 (12:23 -0700)]
reenable OS X Chrome in Sauce
Chris Rebert [Tue, 24 Jun 2014 19:36:18 +0000 (12:36 -0700)]
Merge pull request #13918 from twbs/sauce-with-retries
Enable retrying of timed-out Sauce tests
Mark Otto [Tue, 24 Jun 2014 19:21:10 +0000 (12:21 -0700)]
Merge pull request #13916 from glebm/variable-order
Move variable declaration before its use (for Sass)
Chris Rebert [Tue, 24 Jun 2014 19:12:21 +0000 (12:12 -0700)]
retry each test up to 3 times in the event of timeout
Big thanks to @gvas for https://github.com/axemclion/grunt-saucelabs/pull/136 ! <3
Chris Rebert [Tue, 24 Jun 2014 19:11:39 +0000 (12:11 -0700)]
upgrade grunt-saucelabs to ~8.1.0
update shrinkwrap too
Gleb Mazovetskiy [Tue, 24 Jun 2014 16:30:24 +0000 (18:30 +0200)]
Move variable declaration before its use for Sass
In Sass, variable must be declared before it is used.
This also removes Miscellaneous section, because horizontal line color
and form / list paddings are Typography.
Chris Rebert [Tue, 24 Jun 2014 16:12:27 +0000 (09:12 -0700)]
Merge pull request #13913 from hnrch02/webkit-keyframes
Partly revert
cb7eb674accd24b6b73f26ef23cf4a301b6ebfaf
XhmikosR [Tue, 24 Jun 2014 16:00:14 +0000 (19:00 +0300)]
Run `grunt`.
XhmikosR [Tue, 24 Jun 2014 15:57:33 +0000 (18:57 +0300)]
Turn off clean-css' advanced optimizations.
Works around #13914.
We might give it another go in the future but the stuff this breaks over the time does not justify having it enabled. The gain in size is negligible:
dist/css/bootstrap.min.css: 108.65 kB → 109.5 kB
dist/css/bootstrap-theme.min.css: 18.84 kB → 18.86 kB
docs/assets/css/docs.min.css: 20.44 kB → 20.61 kB
XhmikosR [Tue, 24 Jun 2014 07:54:19 +0000 (10:54 +0300)]
Update dependencies.
Heinrich Fenkart [Tue, 24 Jun 2014 15:08:16 +0000 (17:08 +0200)]
fat [Tue, 24 Jun 2014 06:08:44 +0000 (23:08 -0700)]
Merge branch 'fix-13386'
fat [Tue, 24 Jun 2014 06:08:23 +0000 (23:08 -0700)]
Merge branch 'master' into fix-13386
Conflicts:
js/carousel.js
Jacob [Tue, 24 Jun 2014 05:54:44 +0000 (22:54 -0700)]
Merge pull request #13904 from twbs/revert-umd
Revert UMD for now, due to #13812.
Julian Thilo [Mon, 23 Jun 2014 21:36:18 +0000 (23:36 +0200)]
grid class inconsistency 2
https://github.com/twbs/bootstrap/commit/
32bde78e1996a92e6b801e1f4a475d5ab48685f8
Jim Frode Hoff [Mon, 23 Jun 2014 20:50:38 +0000 (22:50 +0200)]
Update cover.css
Moved the inset box-shadow to .site-wrapper in order to keep the shadow at the edges even if content exceeds viewport and needs scrolling.
Mark Otto [Mon, 23 Jun 2014 19:59:46 +0000 (12:59 -0700)]
Merge pull request #13882 from thomaswelton/issue-13713-use-variable-small
Use @font-size-small variable to calculate <small> font-size
Chris Rebert [Mon, 23 Jun 2014 18:07:18 +0000 (11:07 -0700)]
Revert UMD (#13772 & friends) for now, due to #13812.
Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0.
Revert "some changes from #13801 - add strict mode back and =="
This reverts commit
2b302f69eea416bc85e7827b7d7a74d49f879662 .
Revert "Fix regression of #10038 introduced by #13772"
This reverts commit
e9d6756a1ac76a9db31a41e8e03f663bedc41b70 .
Revert "MD/CommonJS/Globals #12909"
This reverts commit
1c6fa9010daf0d0c21de9e20fe6ac4dba1788d90 .
Revert "address #13811"
This reverts commit
f347d7d955bbb17234b8e12c68efae7d516ce62c .
Conflicts:
js/carousel.js
js/collapse.js
js/dropdown.js
js/modal.js
js/tab.js
js/tooltip.js
Mark Otto [Mon, 23 Jun 2014 17:42:13 +0000 (10:42 -0700)]
Merge pull request #13900 from twbs/customize_on_your_own
Remove broken link
Mark Otto [Mon, 23 Jun 2014 17:41:45 +0000 (10:41 -0700)]
grid class inconsistency /cc @juthilo
Mark Otto [Mon, 23 Jun 2014 17:39:08 +0000 (10:39 -0700)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 23 Jun 2014 17:38:45 +0000 (10:38 -0700)]
Fixes #13903: Restore side padding on .btn-block
Thomas Welton [Fri, 20 Jun 2014 09:31:49 +0000 (10:31 +0100)]
Use @font-size-small variable to calculate <small> font-size fixes #13713 #13809
Chris Rebert [Mon, 23 Jun 2014 16:34:59 +0000 (09:34 -0700)]
Merge pull request #13901 from knownasilya/typo
Fix typo in css - buttons docs
Ilya Radchenko [Mon, 23 Jun 2014 16:25:14 +0000 (12:25 -0400)]
fix typo in css - buttons
Julian Thilo [Mon, 23 Jun 2014 15:51:02 +0000 (17:51 +0200)]
Remove broken link to Customizing Bootstrap
Mark Otto [Mon, 23 Jun 2014 01:04:28 +0000 (18:04 -0700)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 23 Jun 2014 01:04:19 +0000 (18:04 -0700)]
new homepage expo features
XhmikosR [Mon, 23 Jun 2014 00:06:12 +0000 (03:06 +0300)]
Update dependencies.
Mark Otto [Fri, 20 Jun 2014 20:24:14 +0000 (13:24 -0700)]
Fixes #13872 more: add overrides for lg and sm input modifiers
Mark Otto [Fri, 20 Jun 2014 02:54:25 +0000 (19:54 -0700)]
tweak alert per #13875
Mark Otto [Fri, 20 Jun 2014 01:33:41 +0000 (18:33 -0700)]
Fixes #13872: Always apply padding to .form-control-static for that vertical alignment
Mark Otto [Fri, 20 Jun 2014 01:15:42 +0000 (18:15 -0700)]
formatting
Mark Otto [Fri, 20 Jun 2014 01:14:56 +0000 (18:14 -0700)]
fixes #13881: restore existing striped progress bar behavior with theme styles
Chris Rebert [Thu, 19 Jun 2014 23:04:18 +0000 (16:04 -0700)]
bump npm-shrinkwrap to ~3.1.4
Mark Otto [Thu, 19 Jun 2014 22:25:50 +0000 (15:25 -0700)]
grunt
Mark Otto [Thu, 19 Jun 2014 22:24:24 +0000 (15:24 -0700)]
grunt dist
Mark Otto [Thu, 19 Jun 2014 22:22:49 +0000 (15:22 -0700)]
ids over names
Chris Rebert [Thu, 19 Jun 2014 21:51:52 +0000 (14:51 -0700)]
Merge pull request #13867 from hnrch02/remove-depreacted-jscs-rules
Remove deprecated JSCS rules
Heinrich Fenkart [Thu, 19 Jun 2014 21:37:01 +0000 (23:37 +0200)]
S H R I N K W R A P
Mark Otto [Thu, 19 Jun 2014 19:45:57 +0000 (12:45 -0700)]
Merge pull request #13866 from BBosman/ie8fontface
Document #13863
Heinrich Fenkart [Thu, 19 Jun 2014 09:41:23 +0000 (11:41 +0200)]
Update a few source files to comply to new JSCS rules
Heinrich Fenkart [Thu, 19 Jun 2014 09:40:56 +0000 (11:40 +0200)]
Remove deprecated JSCS rules and add requireSpaceAfterLineComment
Heinrich Fenkart [Thu, 19 Jun 2014 09:40:16 +0000 (11:40 +0200)]
Bump grunt-jscs-checker to 0.5.1
Chris Rebert [Thu, 19 Jun 2014 18:58:41 +0000 (11:58 -0700)]
Merge pull request #13877 from twbs/npm-shrinkwrap
Switch to uber/npm-shrinkwrap for npm-shrinkwrap.json generation
Chris Rebert [Thu, 19 Jun 2014 17:47:55 +0000 (10:47 -0700)]
Switch to uber/npm-shrinkwrap for npm-shrinkwrap.json generation
Instead of our homegrown grunt/shrinkwrap.js
Fixes #13483.
New npm-shrinkwrap.json is human-readable but still in a consistent/stable format.
Should aid debugging, produce better diffs, and be less prone to merge conflicts
Bas Bosman [Thu, 19 Jun 2014 09:26:55 +0000 (11:26 +0200)]
Document IE8 font-face weirdness
Chris Rebert [Thu, 19 Jun 2014 13:35:32 +0000 (06:35 -0700)]
Merge pull request #13870 from BBosman/gray-light
Fix @gray-light in docs
Bas Bosman [Thu, 19 Jun 2014 12:56:43 +0000 (14:56 +0200)]
Fix @gray-light in docs
XhmikosR [Thu, 19 Jun 2014 09:58:34 +0000 (12:58 +0300)]
Run `grunt`.