]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Ross Allen [Tue, 24 Sep 2013 06:29:45 +0000 (23:29 -0700)]
Use bootstrap.less file order in Customizer
Appending stylesheets by iterating the `__less` Hash creates an order
that is not the same as 'bootstrap.less'.
Some stylesheets like 'component-animations.less' and 'modals.less' have
selectors with matching specificity, and so file order decides which
style wins. This causes issue #10030 by putting `.fade.in` after
`.modal-backdrop.in` and gives the backdrop a higher opacity than
intended.
This change uses the Less ordering in 'bootstrap.less' to generate the
final stylesheets in the Customizer to make sure customized file
ordering matches the distribution file order.
Fixes #10030
Chris Rebert [Tue, 24 Sep 2013 05:34:36 +0000 (22:34 -0700)]
run grunt dist
Mark Otto [Tue, 24 Sep 2013 02:10:38 +0000 (19:10 -0700)]
Merge pull request #10768 from twbs/polaroid-thumbnail-docs
fix #10767; current .img-thumbnail is equivalent to old .img-polaroid
Mark Otto [Tue, 24 Sep 2013 02:08:50 +0000 (19:08 -0700)]
Merge pull request #10770 from twbs/rename-assets
move /assets/ to /docs-assets/ ; fixes #10715
Mark Otto [Tue, 24 Sep 2013 02:08:01 +0000 (19:08 -0700)]
Merge pull request #10769 from twbs/deprecate-hide
deprecate .hide; fixes #10446
Chris Rebert [Mon, 23 Sep 2013 20:01:11 +0000 (13:01 -0700)]
avoid using the term "assets" due to potential confusion
Chris Rebert [Mon, 23 Sep 2013 20:00:43 +0000 (13:00 -0700)]
move /assets/ to /docs-assets/ ; fixes #10715
Chris Rebert [Mon, 23 Sep 2013 19:46:57 +0000 (12:46 -0700)]
deprecate .hide; fixes #10446
Chris Rebert [Mon, 23 Sep 2013 19:06:33 +0000 (12:06 -0700)]
fix #10767; current .img-thumbnail is equivalent to old .img-polaroid
Chris Rebert [Mon, 23 Sep 2013 16:03:16 +0000 (09:03 -0700)]
Merge pull request #10763 from XhmikosR/html5shiv
Update html5shiv to v3.7.0.
XhmikosR [Mon, 23 Sep 2013 13:51:34 +0000 (16:51 +0300)]
Update html5shiv to v3.7.0.
Mark Otto [Sun, 22 Sep 2013 23:53:01 +0000 (16:53 -0700)]
Merge pull request #10695 from FredericoC/fix-nav-active-caret
Fixed issue where caret wouldn't inherit "active" li style on nav-pills
Mark Otto [Sun, 22 Sep 2013 14:25:33 +0000 (07:25 -0700)]
Merge pull request #10741 from ZDroid/patch-1
Avoid LESS nesting if isn't needed
Mark Otto [Sun, 22 Sep 2013 14:20:15 +0000 (09:20 -0500)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 22 Sep 2013 14:19:37 +0000 (09:19 -0500)]
Fixes #10755: Don't remove quotes around q element by default
Chris Rebert [Sat, 21 Sep 2013 21:19:21 +0000 (14:19 -0700)]
Merge pull request #10749 from ZDroid/patch-2
@headingsColor → @headings-color
Zlatan Vasović [Sat, 21 Sep 2013 12:19:11 +0000 (14:19 +0200)]
@headingsColor → @headings-color
Mark Otto [Sat, 21 Sep 2013 05:14:57 +0000 (22:14 -0700)]
Merge pull request #10693 from twbs/include-docs-license
include a copy of the CC-BY 3.0 License that the docs are under
Chris Rebert [Fri, 20 Sep 2013 18:49:32 +0000 (11:49 -0700)]
fix #10737
Chris Rebert [Fri, 20 Sep 2013 17:49:13 +0000 (10:49 -0700)]
Merge pull request #10743 from hnrch02/patch-1
Fix a silly typo
Heinrich Fenkart [Fri, 20 Sep 2013 17:43:47 +0000 (19:43 +0200)]
Fix a silly typo
Zlatan Vasović [Fri, 20 Sep 2013 16:06:48 +0000 (18:06 +0200)]
Avoid LESS nesting if isn't needed
Mark Otto [Fri, 20 Sep 2013 03:57:11 +0000 (22:57 -0500)]
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/css/bootstrap.min.css
Mark Otto [Fri, 20 Sep 2013 03:56:17 +0000 (22:56 -0500)]
Fixes #10694: Remove unnecessary `content` property from `.caret`
Mark Otto [Fri, 20 Sep 2013 00:20:47 +0000 (17:20 -0700)]
Merge pull request #10724 from ZDroid/patch-1
white → #fff
Chris Rebert [Thu, 19 Sep 2013 22:49:53 +0000 (15:49 -0700)]
fix #10732
Zlatan Vasović [Thu, 19 Sep 2013 14:41:06 +0000 (16:41 +0200)]
white → #fff
Chris Rebert [Thu, 19 Sep 2013 06:44:56 +0000 (23:44 -0700)]
Merge pull request #10710 from XhmikosR/patch-2
Patch 2
XhmikosR [Wed, 18 Sep 2013 17:00:45 +0000 (20:00 +0300)]
Update jszip.js to the latest git.
XhmikosR [Wed, 18 Sep 2013 06:04:09 +0000 (09:04 +0300)]
Show minification report for uglify-js.
Chris Rebert [Wed, 18 Sep 2013 20:15:18 +0000 (13:15 -0700)]
Merge pull request #10703 from XhmikosR/sort
Sort by name.
XhmikosR [Wed, 18 Sep 2013 05:20:46 +0000 (08:20 +0300)]
Sort by name.
Chris Rebert [Wed, 18 Sep 2013 16:54:41 +0000 (09:54 -0700)]
Merge pull request #10682 from gordonwoodhull/master
Suggest documenting changes to plugin classes
Chris Rebert [Wed, 18 Sep 2013 16:38:14 +0000 (09:38 -0700)]
Merge pull request #10680 from XhmikosR/master
Update normalize to v2.1.3.
Gordon Woodhull [Wed, 18 Sep 2013 11:44:56 +0000 (07:44 -0400)]
merge plugin changes into main table
XhmikosR [Wed, 18 Sep 2013 05:14:39 +0000 (08:14 +0300)]
Run grunt dist.
XhmikosR [Wed, 18 Sep 2013 05:14:19 +0000 (08:14 +0300)]
less/mixins.less: tabs to spaces.
XhmikosR [Tue, 17 Sep 2013 15:30:36 +0000 (18:30 +0300)]
Update normalize to v2.1.3.
Frederico Carvalho [Wed, 18 Sep 2013 04:45:56 +0000 (14:45 +1000)]
corrected caret colour when a nav dropdown is open
Frederico Carvalho [Wed, 18 Sep 2013 04:31:52 +0000 (14:31 +1000)]
fixed issue where caret wouldn't inherit "active" li style on nav-pills, which caused the caret to stay blue
Chris Rebert [Wed, 18 Sep 2013 01:58:15 +0000 (18:58 -0700)]
include a copy of the CC-BY 3.0 License that the docs are under
downloaded from http://creativecommons.org/licenses/by/3.0/legalcode.txt
Chris Rebert [Wed, 18 Sep 2013 00:41:58 +0000 (17:41 -0700)]
fix #10692
Gordon Woodhull [Tue, 17 Sep 2013 16:03:02 +0000 (12:03 -0400)]
a start at documenting plugin class changes
Mark Otto [Tue, 17 Sep 2013 05:00:39 +0000 (22:00 -0700)]
Merge pull request #10626 from buob/variablize-nav-pill-border-radius
Variablize nav pill border radius
Mark Otto [Tue, 17 Sep 2013 04:53:27 +0000 (21:53 -0700)]
Merge pull request #10641 from ggam/remove-accordion
Removed unneeded 'accordion-toggle' class from collapse examples
Mark Otto [Tue, 17 Sep 2013 04:49:12 +0000 (21:49 -0700)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 17 Sep 2013 04:49:01 +0000 (21:49 -0700)]
Merge pull request #10655 from Soben713/master
Remove unnecessary semicolons
Mark Otto [Tue, 17 Sep 2013 04:43:55 +0000 (21:43 -0700)]
run grunt
Mark Otto [Tue, 17 Sep 2013 04:42:43 +0000 (21:42 -0700)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 17 Sep 2013 03:36:04 +0000 (20:36 -0700)]
Merge pull request #10663 from lipis/patch-1
Changed the border-color of .navbar-form to @navbar-default-border
Mark Otto [Tue, 17 Sep 2013 01:59:06 +0000 (18:59 -0700)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 17 Sep 2013 01:58:52 +0000 (18:58 -0700)]
fixes #9908: add type attribute to customizer compile button to prevent accidental submissions
Chris Rebert [Mon, 16 Sep 2013 19:15:23 +0000 (12:15 -0700)]
Merge pull request #10664 from ZDroid/patch-1
Fix package.json
Zlatan Vasović [Mon, 16 Sep 2013 18:40:12 +0000 (20:40 +0200)]
Remove "js" keyword /cc @cvrebert
Chris Rebert [Mon, 16 Sep 2013 17:59:22 +0000 (10:59 -0700)]
Merge pull request #10661 from Shotster/simplified-responsive-invisibility
Simplified CSS responsive-invisibility mixin
Zlatan Vasović [Mon, 16 Sep 2013 17:42:52 +0000 (19:42 +0200)]
Fix package.json
* Add "js" keyword
* Fix homepage link
* Bump grunt-contrib-connect to newer version
Lipis [Mon, 16 Sep 2013 17:36:39 +0000 (19:36 +0200)]
Changed the border-color of .navbar-form to @navbar-default-border
Steve S [Mon, 16 Sep 2013 14:16:53 +0000 (09:16 -0500)]
Simplified CSS responsive-invisibility mixin
Soheil Behnezhad [Mon, 16 Sep 2013 12:07:03 +0000 (16:37 +0430)]
Derp, there were more
Soheil Behnezhad [Mon, 16 Sep 2013 11:55:53 +0000 (16:25 +0430)]
Remove some more unnecessary semicolons
Soheil Behnezhad [Mon, 16 Sep 2013 09:17:48 +0000 (13:47 +0430)]
Remove unnecessary semicolons
Chris Rebert [Mon, 16 Sep 2013 03:11:56 +0000 (20:11 -0700)]
Merge pull request #10653 from homeyer/patch-1
remove duplicate text in documentation for popover
Andrew Homeyer [Mon, 16 Sep 2013 03:07:15 +0000 (21:07 -0600)]
remove duplicate text in documentation for popover
ggam [Sat, 14 Sep 2013 17:15:42 +0000 (19:15 +0200)]
Removed unneeded 'accordion-toggle' class. Fixes #10481
Jake Buob [Fri, 13 Sep 2013 19:39:27 +0000 (15:39 -0400)]
Add nav-pills-border-radius variable
Jake Buob [Fri, 13 Sep 2013 19:56:30 +0000 (15:56 -0400)]
Make nav pills border-radius border-radius-base
Mark Otto [Fri, 13 Sep 2013 18:49:11 +0000 (11:49 -0700)]
Merge pull request #10623 from jdorfman/jdorfman-maxcdn-link
getting-started - Replace NetDNA.com with MaxCDN.com
Justin Dorfman [Fri, 13 Sep 2013 18:45:15 +0000 (11:45 -0700)]
getting-started - Replace NetDNA.com with MaxCDN.com
Chris Rebert [Fri, 13 Sep 2013 16:45:16 +0000 (09:45 -0700)]
Merge pull request #10619 from mathiasose/master
Further clarification about this step
Mathias Ose [Fri, 13 Sep 2013 15:54:48 +0000 (17:54 +0200)]
As a node.js noob, even with the previous clarification this was a bit unclear. This change should (hopefully) make it obvious.
Mark Otto [Fri, 13 Sep 2013 02:40:42 +0000 (19:40 -0700)]
Merge pull request #10598 from ZDroid/patch-1
Linux users also love Chrome
Chris Rebert [Thu, 12 Sep 2013 18:29:26 +0000 (11:29 -0700)]
rm irrelevant entries from .gitignore; fixes #10609
Zlatan Vasović [Thu, 12 Sep 2013 16:35:33 +0000 (18:35 +0200)]
Better? /cc @mdo
Mark Otto [Thu, 12 Sep 2013 16:04:52 +0000 (09:04 -0700)]
Merge pull request #10602 from mikefrancis/patch-2
Added in list elements for dividers
Mike Francis [Thu, 12 Sep 2013 11:46:03 +0000 (12:46 +0100)]
Added in list elements for dividers
Zlatan Vasović [Thu, 12 Sep 2013 08:15:38 +0000 (10:15 +0200)]
We also use Chrome :P
Chris Rebert [Thu, 12 Sep 2013 07:57:27 +0000 (00:57 -0700)]
Merge pull request #10597 from ZDroid/patch-1
@grid-float-breakpoint need to be @screen-sm-min
Zlatan Vasović [Thu, 12 Sep 2013 07:52:33 +0000 (09:52 +0200)]
@grid-float-breakpoint need to be @screen-sm-min
:smile:
Mark Otto [Thu, 12 Sep 2013 06:19:56 +0000 (23:19 -0700)]
Merge pull request #10573 from gribelu/tooltip-fix
Hardcoded Tooltip arrow positioning
Mark Otto [Thu, 12 Sep 2013 06:13:28 +0000 (23:13 -0700)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Thu, 12 Sep 2013 06:11:18 +0000 (23:11 -0700)]
Fixes #10492: Account for responsive tables in panels
Mark Otto [Thu, 12 Sep 2013 06:07:47 +0000 (23:07 -0700)]
Merge pull request #10569 from ZDroid/patch-2
Change @screen-* to @screen-*-min
Mark Otto [Thu, 12 Sep 2013 06:02:11 +0000 (23:02 -0700)]
Merge pull request #10594 from twbs/navbar-form-labels-warning
add same accessibility warning from .form-inline to .navbar-form docs
Chris Rebert [Thu, 12 Sep 2013 05:58:07 +0000 (22:58 -0700)]
add same accessibility warning from .form-inline to .navbar-form docs
Mark Otto [Thu, 12 Sep 2013 04:14:25 +0000 (21:14 -0700)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Thu, 12 Sep 2013 04:14:10 +0000 (21:14 -0700)]
Massive customizer audit and overhaul
I probably missed a few things and screwed up a few others, but this
takes the place of much of #9910. I haven't added many variables—that
should be reserved for v3.1—but I have rejiggered the layout, added
missing ones, corrected wrong values, etc.
/cc @cvrebert @juthilo @saas786
Mark Otto [Thu, 12 Sep 2013 04:12:58 +0000 (21:12 -0700)]
Remove unneeded comment in layouts
Mark Otto [Thu, 12 Sep 2013 03:22:33 +0000 (20:22 -0700)]
Merge pull request #10590 from twbs/doc-jquery-version
document jQuery version requirement; fixes #10355
Chris Rebert [Thu, 12 Sep 2013 03:17:18 +0000 (20:17 -0700)]
Merge pull request #10591 from twbs/modal-remote-migration-doc
add modal 'remote' option semantics change to migration docs
Chris Rebert [Thu, 12 Sep 2013 03:08:59 +0000 (20:08 -0700)]
add modal 'remote' option semantics change to migration docs; fixes #10585
Chris Rebert [Thu, 12 Sep 2013 02:53:32 +0000 (19:53 -0700)]
document jQuery version requirement; fixes #10355
Mark Otto [Wed, 11 Sep 2013 23:59:51 +0000 (16:59 -0700)]
scope customizer h4 change
Mark Otto [Wed, 11 Sep 2013 23:35:27 +0000 (16:35 -0700)]
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/css/bootstrap.min.css
Mark Otto [Wed, 11 Sep 2013 23:35:00 +0000 (16:35 -0700)]
run grunt
Chris Rebert [Wed, 11 Sep 2013 23:24:03 +0000 (16:24 -0700)]
re-fix typo in comment
Mark Otto [Wed, 11 Sep 2013 23:19:12 +0000 (16:19 -0700)]
Merge pull request #10584 from twbs/ie_viewports
Fixes #10497: Fix Windows 8 and Windows Phone 8 behavior and apply to docs
Mark Otto [Wed, 11 Sep 2013 23:15:12 +0000 (16:15 -0700)]
Merge branch 'ie_viewports' of github.com:twbs/bootstrap into ie_viewports
Conflicts:
getting-started.html
less/responsive-utilities.less
Mark Otto [Wed, 11 Sep 2013 21:46:31 +0000 (14:46 -0700)]
fixes #10497: Fix Windows 8 and Windows Phone 8 behavior and apply it to the docs
Mark Otto [Wed, 11 Sep 2013 21:56:02 +0000 (14:56 -0700)]
remove unnecessary right and left properties on .modal-dialog
Mark Otto [Wed, 11 Sep 2013 21:46:31 +0000 (14:46 -0700)]
fixes #10497: Fix Windows 8 and Windows Phone 8 behavior and apply it to the docs