]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
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 #11861 from freeman/master
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...

11 years agoFixes #11871: commas last
Mark Otto [Sun, 15 Dec 2013 18:56:51 +0000 (10:56 -0800)] 
Fixes #11871: commas last

11 years agocomments and spacing
Mark Otto [Sun, 15 Dec 2013 18:53:53 +0000 (10:53 -0800)] 
comments and spacing

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

11 years agoFixes #11801: use correct variables for grid containers
Mark Otto [Sun, 15 Dec 2013 18:38:54 +0000 (10:38 -0800)] 
Fixes #11801: use correct variables for grid containers

11 years agoMerge pull request #11879 from ZDroid/wrong-variable
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

11 years agoFix wrong variable name 11879/head
Zlatan Vasović [Sun, 15 Dec 2013 10:47:23 +0000 (11:47 +0100)] 
Fix wrong variable name

11 years agoFixes #11588: Scope font-size to only p elements in a .jumbotron and remove the super...
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

11 years agoFixes #11555: Add `@tooltip-opacity` variable
Mark Otto [Sun, 15 Dec 2013 05:43:08 +0000 (21:43 -0800)] 
Fixes #11555: Add `@tooltip-opacity` variable

11 years agoFixes #11572: Add contextual background-color classes to match text classes; move...
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

11 years agochange class name
Mark Otto [Sun, 15 Dec 2013 05:25:57 +0000 (21:25 -0800)] 
change class name

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 15 Dec 2013 04:04:52 +0000 (20:04 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #11561: Add float: left; to .form-control within input groups to prevent IE9...
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

11 years agoMerge pull request #11864 from twbs/parallelize-build
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

11 years agocorrect bookmark prefix
Mark Otto [Sun, 15 Dec 2013 03:31:20 +0000 (19:31 -0800)] 
correct bookmark prefix

11 years agodocument #11326
Mark Otto [Sun, 15 Dec 2013 03:31:03 +0000 (19:31 -0800)] 
document #11326

11 years agoparallelize Travis using build matrix & test subsuites 11864/head
Chris Rebert [Sun, 15 Dec 2013 03:09:44 +0000 (19:09 -0800)] 
parallelize Travis using build matrix & test subsuites

11 years agoMerge pull request #11326 from ZDroid/animations
Mark Otto [Sun, 15 Dec 2013 02:58:41 +0000 (18:58 -0800)] 
Merge pull request #11326 from ZDroid/animations

Add `.animation-*()` mixins

11 years agoMerge pull request #10704 from XhmikosR/various
Mark Otto [Sun, 15 Dec 2013 02:55:25 +0000 (18:55 -0800)] 
Merge pull request #10704 from XhmikosR/various

rm unused vars

11 years agoMerge branch 'master' into pr/11435
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

11 years agoMerge branch 'master' into pr/11302
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

11 years agoDocument new modal sizes
Mark Otto [Sun, 15 Dec 2013 00:29:55 +0000 (16:29 -0800)] 
Document new modal sizes

11 years agoMerge branch 'master' into pr/11162
Mark Otto [Sun, 15 Dec 2013 00:29:47 +0000 (16:29 -0800)] 
Merge branch 'master' into pr/11162

Conflicts:
less/modals.less

11 years agoMerge branch 'master' into pr/11107
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

11 years agoMerge pull request #11286 from BBosman/well-border
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

11 years agoFixes #10921: Add support for input groups within button toolbars
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/.

11 years agomention lack of support for split button dropdowns in vertical button groups
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

11 years agoMerge branch 'master' into pr/10951
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

11 years agoFixes #10505: Document more of LESS vars and mixins
Mark Otto [Sat, 14 Dec 2013 22:18:43 +0000 (14:18 -0800)] 
Fixes #10505: Document more of LESS vars and mixins

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sat, 14 Dec 2013 21:23:25 +0000 (13:23 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #10370: Improved and deprecated dropdown menu alignment options
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.

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

11 years agoAdd `try` and `catch` to keywords 11878/head
Zlatan Vasović [Sat, 14 Dec 2013 20:57:59 +0000 (21:57 +0100)] 
Add `try` and `catch` to keywords

11 years agoFixes #11867: Add `@panel-body-padding` variable
Mark Otto [Sat, 14 Dec 2013 19:44:54 +0000 (11:44 -0800)] 
Fixes #11867: Add `@panel-body-padding` variable

11 years agoMerge branch 'master' into pr/11868
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

11 years agoFixes #10495: Float Glyphicon and set margins in .navbar-brand to ensure there is...
Mark Otto [Sat, 14 Dec 2013 07:06:04 +0000 (23:06 -0800)] 
Fixes #10495: Float Glyphicon and set margins in .navbar-brand to ensure there is no added height because wtf even is CSS

11 years agoMerge pull request #11869 from twbs/cache-node_modules
Chris Rebert [Sat, 14 Dec 2013 01:35:39 +0000 (17:35 -0800)] 
Merge pull request #11869 from twbs/cache-node_modules

use S3-based node_modules caching

11 years agotime all the things 11869/head
Chris Rebert [Sat, 14 Dec 2013 01:20:45 +0000 (17:20 -0800)] 
time all the things

11 years agouse S3-based node_modules caching
Chris Rebert [Fri, 13 Dec 2013 11:03:15 +0000 (03:03 -0800)] 
use S3-based node_modules caching

11 years agoMerge pull request #11874 from ZDroid/hotfix
Chris Rebert [Fri, 13 Dec 2013 22:31:15 +0000 (14:31 -0800)] 
Merge pull request #11874 from ZDroid/hotfix

';' isn't needed

11 years ago';' isn't needed 11874/head
Zlatan Vasović [Fri, 13 Dec 2013 22:15:02 +0000 (23:15 +0100)] 
';' isn't needed

11 years agoadd dist files. 11868/head
Tobias Lindig [Fri, 13 Dec 2013 11:27:56 +0000 (12:27 +0100)] 
add dist files.

11 years agouse @zindex-modal for .modal and @zindex-modal-background for .modal-backdrop.
Tobias Lindig [Fri, 13 Dec 2013 11:24:20 +0000 (12:24 +0100)] 
use @zindex-modal for .modal and @zindex-modal-background for .modal-backdrop.
removed z-index for .modal-dialog, it was not necessary because the parent element (.modal) already has a z-index.

11 years ago-ms-transform is for IE9 only, IE10+ don't require it
Mark Otto [Fri, 13 Dec 2013 07:01:11 +0000 (23:01 -0800)] 
-ms-transform is for IE9 only, IE10+ don't require it

11 years agoMerge pull request #11819 from janpanschab/ms-transform-origin
Mark Otto [Fri, 13 Dec 2013 06:59:08 +0000 (22:59 -0800)] 
Merge pull request #11819 from janpanschab/ms-transform-origin

Transform-origin mixin for IE

11 years agoMerge pull request #11863 from twbs/update-osx
Chris Rebert [Fri, 13 Dec 2013 06:16:31 +0000 (22:16 -0800)] 
Merge pull request #11863 from twbs/update-osx

Sauce tests: update to later browsers supported by OS X 10.9

11 years agoSauce tests: update to later browsers supported by OS X 10.9 11863/head
Chris Rebert [Fri, 13 Dec 2013 05:58:44 +0000 (21:58 -0800)] 
Sauce tests: update to later browsers supported by OS X 10.9

11 years agoIssue #11852 : create a new variable for the list group active item link text. 11861/head
mrasscha [Thu, 12 Dec 2013 19:47:16 +0000 (20:47 +0100)] 
Issue #11852 : create a new variable for the list group active item link text.

11 years agoMerge pull request #11859 from dzwillia/add_dropdown_caret_color
Chris Rebert [Thu, 12 Dec 2013 18:02:53 +0000 (10:02 -0800)] 
Merge pull request #11859 from dzwillia/add_dropdown_caret_color

Add @dropdown-caret-color variable back to variables.less

11 years agoAdded @dropdown-caret-color variable back to variables.less (deprecated) 11859/head
dzwillia [Thu, 12 Dec 2013 17:53:59 +0000 (12:53 -0500)] 
Added @dropdown-caret-color variable back to variables.less (deprecated)

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

11 years agoFixes #11837: grid containers are fixed width now, no longer max-width
Mark Otto [Wed, 11 Dec 2013 18:52:47 +0000 (10:52 -0800)] 
Fixes #11837: grid containers are fixed width now, no longer max-width

11 years agoMerge pull request #11841 from ZDroid/breadcrumbs
Mark Otto [Wed, 11 Dec 2013 18:48:51 +0000 (10:48 -0800)] 
Merge pull request #11841 from ZDroid/breadcrumbs

Use variables for breadcrumb padding

11 years agoMerge pull request #11839 from XhmikosR/readme
Mark Otto [Wed, 11 Dec 2013 18:47:54 +0000 (10:47 -0800)] 
Merge pull request #11839 from XhmikosR/readme

Clarify Windows workarounds.

11 years agoUse variables for breadcrumb padding 11841/head
Zlatan Vasović [Wed, 11 Dec 2013 13:36:26 +0000 (14:36 +0100)] 
Use variables for breadcrumb padding

11 years agoMerge pull request #11838 from XhmikosR/customizer
Chris Rebert [Wed, 11 Dec 2013 11:53:44 +0000 (03:53 -0800)] 
Merge pull request #11838 from XhmikosR/customizer

customizer.js: Remove a workaround for older less.js.

11 years agocustomizer.js: remove a workaround for older less.js. 11838/head
XhmikosR [Tue, 10 Dec 2013 22:29:42 +0000 (00:29 +0200)] 
customizer.js: remove a workaround for older less.js.

11 years agoClarify Windows workarounds. 11839/head
XhmikosR [Wed, 11 Dec 2013 09:59:25 +0000 (11:59 +0200)] 
Clarify Windows workarounds.

11 years agoCombine updates to Windows Jekyll stuff
Mark Otto [Wed, 11 Dec 2013 03:43:52 +0000 (19:43 -0800)] 
Combine updates to Windows Jekyll stuff

11 years agoMerge pull request #11830 from XhmikosR/jekyll-windows
Mark Otto [Wed, 11 Dec 2013 03:40:51 +0000 (19:40 -0800)] 
Merge pull request #11830 from XhmikosR/jekyll-windows

Update Jekyll on Windows info

11 years agoMerge pull request #11832 from twbs/run_jekyll_on_windows
Mark Otto [Wed, 11 Dec 2013 03:40:31 +0000 (19:40 -0800)] 
Merge pull request #11832 from twbs/run_jekyll_on_windows

Help Windows users install Jekyll

11 years agoHelp Windows users install Jekyll 11832/head
Julian Thilo [Tue, 10 Dec 2013 23:13:02 +0000 (00:13 +0100)] 
Help Windows users install Jekyll

11 years agoREADME.md: mention an alternative workaround for the jekyll issue on Windows. 11830/head
XhmikosR [Tue, 10 Dec 2013 22:04:59 +0000 (00:04 +0200)] 
README.md: mention an alternative workaround for the jekyll issue on Windows.

11 years agoUpdate README.md.
XhmikosR [Tue, 10 Dec 2013 22:02:24 +0000 (00:02 +0200)] 
Update README.md.

Mention that Python needs to be in PATH for Pygments to work and thus jekyll not fail.

11 years agoMerge pull request #11818 from XhmikosR/less.js
Mark Otto [Tue, 10 Dec 2013 18:03:33 +0000 (10:03 -0800)] 
Merge pull request #11818 from XhmikosR/less.js

Update less.js to v1.5.1.

11 years agoMerge pull request #11812 from tlindig/load_grunt_tasks
Mark Otto [Tue, 10 Dec 2013 18:02:01 +0000 (10:02 -0800)] 
Merge pull request #11812 from tlindig/load_grunt_tasks

Build process: use module "load-grunt-tasks" to load grunt tasks

11 years agotransform origin mixin for explorer 11819/head
Jan Panschab [Tue, 10 Dec 2013 16:15:41 +0000 (17:15 +0100)] 
transform origin mixin for explorer

11 years agoUpdate less.js to v1.5.1. 11818/head
XhmikosR [Tue, 10 Dec 2013 16:08:33 +0000 (18:08 +0200)] 
Update less.js to v1.5.1.

This fixes an error with `&:extend(.clearfix all)` when using the customizer.

11 years agocorrect indentation 11812/head
Tobias Lindig [Tue, 10 Dec 2013 13:47:50 +0000 (14:47 +0100)] 
correct indentation

11 years agoBuildprocess: use module "load-grunt-tasks" to load grunt tasks directly from the...
Tobias Lindig [Tue, 10 Dec 2013 09:28:44 +0000 (10:28 +0100)] 
Buildprocess: use module "load-grunt-tasks" to load grunt tasks directly from the package.json

11 years agoRemove unused variables. 10704/head
XhmikosR [Wed, 18 Sep 2013 06:06:53 +0000 (09:06 +0300)] 
Remove unused variables.

11 years agoMerge pull request #11809 from twbs/enable-LESS-strictMath
Mark Otto [Tue, 10 Dec 2013 02:16:18 +0000 (18:16 -0800)] 
Merge pull request #11809 from twbs/enable-LESS-strictMath

enable strictMath in grunt-contrib-less config

11 years agoenable strictMath in grunt-contrib-less config 11809/head
Chris Rebert [Tue, 10 Dec 2013 00:06:35 +0000 (16:06 -0800)] 
enable strictMath in grunt-contrib-less config

11 years agoMerge pull request #11808 from twbs/strict-math-fixes
Chris Rebert [Tue, 10 Dec 2013 00:20:26 +0000 (16:20 -0800)] 
Merge pull request #11808 from twbs/strict-math-fixes

more LESS strictMath fixes

11 years agomisc strictMath compliance fixes 11808/head
Chris Rebert [Tue, 10 Dec 2013 00:12:41 +0000 (16:12 -0800)] 
misc strictMath compliance fixes

11 years agoadd parens around arithmetic in recursive mixin calls to comply with LESS strictMath
Chris Rebert [Mon, 9 Dec 2013 23:59:50 +0000 (15:59 -0800)] 
add parens around arithmetic in recursive mixin calls to comply with LESS strictMath

<3 @seven-phases-max for helping to confirm & debug this
X-Ref: https://github.com/less/less.js/issues/1725

11 years agoMerge pull request #11807 from twbs/stricter-math
Chris Rebert [Mon, 9 Dec 2013 23:37:56 +0000 (15:37 -0800)] 
Merge pull request #11807 from twbs/stricter-math

improve compliance with LESS's strictMath

11 years agoimprove compliance with LESS's strictMath 11807/head
Chris Rebert [Mon, 9 Dec 2013 23:35:13 +0000 (15:35 -0800)] 
improve compliance with LESS's strictMath

11 years agoMerge pull request #11790 from twbs/drop_recess_for_less
Mark Otto [Mon, 9 Dec 2013 19:30:10 +0000 (11:30 -0800)] 
Merge pull request #11790 from twbs/drop_recess_for_less

Drop grunt-recess for grunt-contrib-less

11 years agoUndo merge of #11778 and use cleancss min option 11790/head
Mark Otto [Mon, 9 Dec 2013 08:12:11 +0000 (00:12 -0800)] 
Undo merge of #11778 and use cleancss min option

11 years agogrunt
Mark Otto [Mon, 9 Dec 2013 08:09:52 +0000 (00:09 -0800)] 
grunt

11 years agoMerge branch 'pr/11779' into drop_recess_for_less
Mark Otto [Mon, 9 Dec 2013 07:56:22 +0000 (23:56 -0800)] 
Merge branch 'pr/11779' into drop_recess_for_less

Conflicts:
Gruntfile.js
package.json

11 years agoMerge pull request #11792 from twbs/list-group-nest
Mark Otto [Mon, 9 Dec 2013 07:55:03 +0000 (23:55 -0800)] 
Merge pull request #11792 from twbs/list-group-nest

more nesting in .list-group-item-variant mixin

11 years agoMerge branch 'pr/11778' into drop_recess_for_less
Mark Otto [Mon, 9 Dec 2013 07:48:07 +0000 (23:48 -0800)] 
Merge branch 'pr/11778' into drop_recess_for_less

Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.min.css

11 years agomore nesting in .list-group-item-variant mixin 11792/head
Chris Rebert [Mon, 9 Dec 2013 07:34:24 +0000 (23:34 -0800)] 
more nesting in .list-group-item-variant mixin

11 years agoSwitch to `&:extend(.clearfix all)` for clearfix mixin
Mark Otto [Mon, 9 Dec 2013 07:18:28 +0000 (23:18 -0800)] 
Switch to `&:extend(.clearfix all)` for clearfix mixin

Original discussion:
https://github.com/less/less.js/issues/1437#issuecomment-21383639.

Since we’re switching to `grunt-contrib-less`, we can take advantage of
newer LESS features than what RECESS supported. Included in that is the
ability to `:extend`, and not only that, but `:extend(.mixin-name
all)`. By doing so, we remove duplicate CSS for all our elements that
were being clearfix-ed.

Fixes #8947, #8968, #8991, #9257, #9268, #9291, #9430, #9604, #9686,
#9929, #10731, #10793, #11305, #11498, #11533, #11570, #11604, #11652.

(dem issues, tho)

11 years agoMerge branch 'master' into drop_recess_for_less
Mark Otto [Mon, 9 Dec 2013 07:00:01 +0000 (23:00 -0800)] 
Merge branch 'master' into drop_recess_for_less

Conflicts:
dist/css/bootstrap.min.css

11 years agomore closely align property order with recess
Mark Otto [Mon, 9 Dec 2013 06:55:09 +0000 (22:55 -0800)] 
more closely align property order with recess

11 years agospecify block indent as numeral to prevent fubared media query output
Mark Otto [Mon, 9 Dec 2013 06:33:24 +0000 (22:33 -0800)] 
specify block indent as numeral to prevent fubared media query output

11 years agosingle array == no rogue spaces
Mark Otto [Mon, 9 Dec 2013 06:32:07 +0000 (22:32 -0800)] 
single array == no rogue spaces

11 years agoderp, don't sort min /cc @cvrebert
Mark Otto [Mon, 9 Dec 2013 06:16:43 +0000 (22:16 -0800)] 
derp, don't sort min /cc @cvrebert

11 years agomerge, compile
Mark Otto [Mon, 9 Dec 2013 06:11:46 +0000 (22:11 -0800)] 
merge, compile

11 years agofixups to csscomb grunt task
Chris Rebert [Mon, 9 Dec 2013 04:46:12 +0000 (20:46 -0800)] 
fixups to csscomb grunt task

11 years agoFixes #11786: Nest media queries within print utilities for mixin-friendliness
Mark Otto [Mon, 9 Dec 2013 03:19:06 +0000 (19:19 -0800)] 
Fixes #11786: Nest media queries within print utilities for mixin-friendliness

11 years agoadding json
Mark Otto [Mon, 9 Dec 2013 03:17:43 +0000 (19:17 -0800)] 
adding json

11 years agorestore original options value
Mark Otto [Mon, 9 Dec 2013 03:12:37 +0000 (19:12 -0800)] 
restore original options value

11 years agoDrop grunt-recess for grunt-contrib-less & co
Mark Otto [Mon, 9 Dec 2013 03:09:27 +0000 (19:09 -0800)] 
Drop grunt-recess for grunt-contrib-less & co

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 9 Dec 2013 01:50:26 +0000 (17:50 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofix #11787: document stateful button JS
Chris Rebert [Mon, 9 Dec 2013 01:42:59 +0000 (17:42 -0800)] 
fix #11787: document stateful button JS