]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Mark Otto [Wed, 18 Dec 2013 18:23:46 +0000 (10:23 -0800)]
add 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
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)
Mark Otto [Wed, 18 Dec 2013 17:48:04 +0000 (09:48 -0800)]
add inline note about navbar sizing
Mark Otto [Wed, 18 Dec 2013 17:42:45 +0000 (09:42 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Wed, 18 Dec 2013 17:42:37 +0000 (09:42 -0800)]
fixes #11925: cover template for firefox
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"
wangsai [Wed, 18 Dec 2013 08:57:55 +0000 (16:57 +0800)]
fix href of "Browser and device support"
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
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
Zlatan Vasović [Tue, 17 Dec 2013 19:39:32 +0000 (20:39 +0100)]
Downgrade Safari and OS X
Chris Rebert [Tue, 17 Dec 2013 09:35:16 +0000 (01:35 -0800)]
enable failHard grunt-html-validation option; fixes #11876
Chris Rebert [Tue, 17 Dec 2013 09:29:19 +0000 (01:29 -0800)]
upgrade to grunt-html-validation v0.1.11
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)
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
Chris Rebert [Mon, 16 Dec 2013 08:30:04 +0000 (00:30 -0800)]
move Sauce test browsers list out of Gruntfile into separate file
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
Chris Rebert [Sun, 15 Dec 2013 05:02:15 +0000 (21:02 -0800)]
use S3-cached Jekyll install
Mark Otto [Mon, 16 Dec 2013 06:10:05 +0000 (22:10 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
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
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
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
Chris Rebert [Mon, 16 Dec 2013 05:09:01 +0000 (21:09 -0800)]
make S3 caching significantly more generic
Chris Rebert [Mon, 16 Dec 2013 04:38:06 +0000 (20:38 -0800)]
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
Chris Rebert [Mon, 16 Dec 2013 03:42:47 +0000 (19:42 -0800)]
explicitly set more HTML5 validator options
Chris Rebert [Mon, 16 Dec 2013 03:15:26 +0000 (19:15 -0800)]
use unique IDs for input feedback 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
Chris Rebert [Mon, 16 Dec 2013 03:00:37 +0000 (19:00 -0800)]
simplify JS snippet slightly
Chris Rebert [Mon, 16 Dec 2013 02:45:56 +0000 (18:45 -0800)]
fix typo in docs
Chris Rebert [Mon, 16 Dec 2013 02:18:55 +0000 (18:18 -0800)]
fix var name in example to follow JS conventions
Chris Rebert [Mon, 16 Dec 2013 02:13:50 +0000 (18:13 -0800)]
copyediting
Mark Otto [Mon, 16 Dec 2013 01:22:55 +0000 (17:22 -0800)]
Fixes #10492 again, this time for last row's corners on striped tables
Mark Otto [Mon, 16 Dec 2013 01:15:09 +0000 (17:15 -0800)]
Add new form feedback states, clean up existing form styles
New stuff:
* Adds `.has-feedback` and `.form-control-feedback` to show icon-based
form feedback to users. Fixes #11836.
* Removes the `width: 1em` on `.glyphicon` because it makes it
impractical to resize the width of all icons, even if they’re not
“empty” (e.g., a simple `.glyphicon { width: 30px; }` wouldn’t work,
nor would a class preceeded by a parent class.
Clean up:
* Sets `width: auto;` on all `.form-control`s within inline forms.
* Removes all the inline `select` menu `width` styles because all
inputs are now `auto`.
* Update form states docs to separate out sections better.
Mark Otto [Sun, 15 Dec 2013 23:27:46 +0000 (15:27 -0800)]
Fixes #11266: Apply a pixel-based line-height to date inputs for iOS 7
Mark Otto [Sun, 15 Dec 2013 23:24:52 +0000 (15:24 -0800)]
formatting and comment
Mark Otto [Sun, 15 Dec 2013 23:07:38 +0000 (15:07 -0800)]
Merge branch 'master' into pr/11817
Conflicts:
dist/css/bootstrap.min.css
less/input-groups.less
Mark Otto [Sun, 15 Dec 2013 22:52:49 +0000 (14:52 -0800)]
Fixes #11402: Updated fix for select.form-control width in inline-forms
Mark Otto [Sun, 15 Dec 2013 22:32:14 +0000 (14:32 -0800)]
grunt
Mark Otto [Sun, 15 Dec 2013 22:28:49 +0000 (14:28 -0800)]
Merge pull request #11494 from blowsie/patch-2
Fixed single dropdown-toggle in btn-group-veritcal not being rounded
Mark Otto [Sun, 15 Dec 2013 22:23:55 +0000 (14:23 -0800)]
Fixes #11660: Depcreate small and .small in blockquote in favor of footer
Mark Otto [Sun, 15 Dec 2013 22:14:32 +0000 (14:14 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 15 Dec 2013 22:14:09 +0000 (14:14 -0800)]
revert an earlier change to move the component-animations.less file because it fubared modal backdrop .fade usage
Mark Otto [Sun, 15 Dec 2013 22:13:25 +0000 (14:13 -0800)]
run grunt on modal scrolling change
Mark Otto [Sun, 15 Dec 2013 22:10:48 +0000 (14:10 -0800)]
Merge branch 'master' into pr/11676
Conflicts:
less/modals.less
Mark Otto [Sun, 15 Dec 2013 22:09:50 +0000 (14:09 -0800)]
Merge branch 'master' into pr/11776
Conflicts:
package.json
Mark Otto [Sun, 15 Dec 2013 22:07:17 +0000 (14:07 -0800)]
Merge pull request #11732 from dak/include-dev-fonts-in-bower
Don't exclude fonts from bower installs
Mark Otto [Sun, 15 Dec 2013 21:53:41 +0000 (13:53 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 15 Dec 2013 21:52:56 +0000 (13:52 -0800)]
typo
Mark Otto [Sun, 15 Dec 2013 21:46:11 +0000 (13:46 -0800)]
Merge pull request #11840 from ZDroid/pagination-boom
Improve pager customization
Mark Otto [Sun, 15 Dec 2013 21:44:26 +0000 (13:44 -0800)]
Fixes #11783: Document requirement of .container(-fluid) in navbars
Mark Otto [Sun, 15 Dec 2013 21:39:45 +0000 (13:39 -0800)]
Fixes #11795: Update the contributing guidelines to include some more CSS guidelines
Mark Otto [Sun, 15 Dec 2013 21:08:17 +0000 (13:08 -0800)]
Clarify number of columns in nested grid
Mark Otto [Sun, 15 Dec 2013 20:41:47 +0000 (12:41 -0800)]
Fixes #11799: Mention support of number of add-ons in docs
Mark Otto [Sun, 15 Dec 2013 20:31:40 +0000 (12:31 -0800)]
Fixes #11770: Move component-animations.less to the utility section of import list to match Customizer
Mark Otto [Sun, 15 Dec 2013 20:27:46 +0000 (12:27 -0800)]
Browser/device support docs update
* Fixes #11055: add mention of select menu styling on Android stock
browsers with included optional fix
* Update IDs and docs nav to include bookmark links to each section
* Add callout to navbar docs about fixed position, inputs, and virtual
keyboard
Mark Otto [Sun, 15 Dec 2013 19:44:16 +0000 (11:44 -0800)]
Fixes #11833: add warning to docs for popover multiple line positioning; update it's docs with example markup, too
Mark Otto [Sun, 15 Dec 2013 19:41:46 +0000 (11:41 -0800)]
update tooltip docs
Mark Otto [Sun, 15 Dec 2013 19:36:16 +0000 (11:36 -0800)]
Fixes #11805 with docs mention of navbar
Mark Otto [Sun, 15 Dec 2013 19:33:06 +0000 (11:33 -0800)]
finalize blog template
Mark Otto [Sun, 15 Dec 2013 19:29:58 +0000 (11:29 -0800)]
Restyle the blockquote to not thin text or change line-height
Mark Otto [Sun, 15 Dec 2013 19:16:57 +0000 (11:16 -0800)]
Merge branch 'master' into cover_template
Mark Otto [Sun, 15 Dec 2013 19:09:03 +0000 (11:09 -0800)]
Change variable
Mark Otto [Sun, 15 Dec 2013 19:02:45 +0000 (11:02 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 15 Dec 2013 19:02:32 +0000 (11:02 -0800)]
Fixes #11829: Adds .make-xs-column mixins
Mark Otto [Sun, 15 Dec 2013 18:59:23 +0000 (10:59 -0800)]
Merge pull request #11861 from freeman/master
Issue #11852 : create a new variable for the list group active item link...
Mark Otto [Sun, 15 Dec 2013 18:56:51 +0000 (10:56 -0800)]
Fixes #11871: commas last
Mark Otto [Sun, 15 Dec 2013 18:53:53 +0000 (10:53 -0800)]
comments and spacing
Mark Otto [Sun, 15 Dec 2013 18:39:12 +0000 (10:39 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 15 Dec 2013 18:38:54 +0000 (10:38 -0800)]
Fixes #11801: use correct variables for grid containers
Mark Otto [Sun, 15 Dec 2013 18:28:32 +0000 (10:28 -0800)]
Merge pull request #11879 from ZDroid/wrong-variable
Fix wrong variable name
Zlatan Vasović [Sun, 15 Dec 2013 10:47:23 +0000 (11:47 +0100)]
Fix wrong variable name
Mark Otto [Sun, 15 Dec 2013 05:50:47 +0000 (21:50 -0800)]
Fixes #11588: Scope font-size to only p elements in a .jumbotron and remove the supersized line-height from the base class
Mark Otto [Sun, 15 Dec 2013 05:43:08 +0000 (21:43 -0800)]
Fixes #11555: Add `@tooltip-opacity` variable
Mark Otto [Sun, 15 Dec 2013 05:40:16 +0000 (21:40 -0800)]
Fixes #11572: Add contextual background-color classes to match text classes; move both sets of classes to Helper Classes section of the CSS docs
Mark Otto [Sun, 15 Dec 2013 05:25:57 +0000 (21:25 -0800)]
change class name
Mark Otto [Sun, 15 Dec 2013 04:04:52 +0000 (20:04 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 15 Dec 2013 04:04:12 +0000 (20:04 -0800)]
Fixes #11561: Add float: left; to .form-control within input groups to prevent IE9 from screwing up placeholder text and select menu arrows
Chris Rebert [Sun, 15 Dec 2013 03:40:28 +0000 (19:40 -0800)]
Merge pull request #11864 from twbs/parallelize-build
parallelize Travis using build matrix & test subsuites
Mark Otto [Sun, 15 Dec 2013 03:31:20 +0000 (19:31 -0800)]
correct bookmark prefix
Mark Otto [Sun, 15 Dec 2013 03:31:03 +0000 (19:31 -0800)]
document #11326
Chris Rebert [Sun, 15 Dec 2013 03:09:44 +0000 (19:09 -0800)]
parallelize Travis using build matrix & test subsuites
Mark Otto [Sun, 15 Dec 2013 02:58:41 +0000 (18:58 -0800)]
Merge pull request #11326 from ZDroid/animations
Add `.animation-*()` mixins
Mark Otto [Sun, 15 Dec 2013 02:55:25 +0000 (18:55 -0800)]
Merge pull request #10704 from XhmikosR/various
rm unused vars
Mark Otto [Sun, 15 Dec 2013 00:56:56 +0000 (16:56 -0800)]
Merge branch 'master' into pr/11435
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
Mark Otto [Sun, 15 Dec 2013 00:46:40 +0000 (16:46 -0800)]
Merge branch 'master' into pr/11302
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
Mark Otto [Sun, 15 Dec 2013 00:29:55 +0000 (16:29 -0800)]
Document new modal sizes
Mark Otto [Sun, 15 Dec 2013 00:29:47 +0000 (16:29 -0800)]
Merge branch 'master' into pr/11162
Conflicts:
less/modals.less
Mark Otto [Sun, 15 Dec 2013 00:20:19 +0000 (16:20 -0800)]
Merge branch 'master' into pr/11107
Conflicts:
docs-assets/js/raw-files.js
Mark Otto [Sun, 15 Dec 2013 00:17:41 +0000 (16:17 -0800)]
Merge pull request #11286 from BBosman/well-border
Add well-border variable
Mark Otto [Sun, 15 Dec 2013 00:03:21 +0000 (16:03 -0800)]
Fixes #10921: Add support for input groups within button toolbars
* Floats any `.input-group` within a toolbar
* Simplifies the CSS to remove sibling selectors and instead use a
negative amrgin on the parent with only `margin-left`
See it in action: http://jsbin.com/aGEcUqAT/1/.
Mark Otto [Sat, 14 Dec 2013 23:56:01 +0000 (15:56 -0800)]
mention lack of support for split button dropdowns in vertical button groups
Mark Otto [Sat, 14 Dec 2013 23:38:21 +0000 (15:38 -0800)]
Merge branch 'master' into pr/10951
Conflicts:
dist/css/bootstrap.min.css
less/modals.less
Mark Otto [Sat, 14 Dec 2013 22:18:43 +0000 (14:18 -0800)]
Fixes #10505: Document more of LESS vars and mixins
Mark Otto [Sat, 14 Dec 2013 21:23:25 +0000 (13:23 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sat, 14 Dec 2013 21:22:56 +0000 (13:22 -0800)]
Fixes #10370: Improved and deprecated dropdown menu alignment options
* Removes an old pair of selectors that didn’t properly target the
right-aligned navbar alignment of dropdown menus.
* Deprecates the `.pull-right` alignment in favor of a more specific
and unique class name.
* Adds `.dropdown-menu-right` as the new alignment class. This is then
mixin-ed into the `.navbar-right.navbar-nav` dropdown menus for
auto-alignment.
* To override that auto-alignment, use `.dropdown-menu-left` as needed.
Chris Rebert [Sat, 14 Dec 2013 21:13:24 +0000 (13:13 -0800)]
Merge pull request #11878 from ZDroid/patch-1
Add `try` and `catch` to keywords
Zlatan Vasović [Sat, 14 Dec 2013 20:57:59 +0000 (21:57 +0100)]
Add `try` and `catch` to keywords
Mark Otto [Sat, 14 Dec 2013 19:44:54 +0000 (11:44 -0800)]
Fixes #11867: Add `@panel-body-padding` variable
Mark Otto [Sat, 14 Dec 2013 19:36:54 +0000 (11:36 -0800)]
Merge branch 'master' into pr/11868
Conflicts:
dist/css/bootstrap.min.css