]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoMerge branch 'master' into deprecate-screen-device-vars 10005/head
Mark Otto [Sat, 24 Aug 2013 05:56:23 +0000 (22:56 -0700)] 
Merge branch 'master' into deprecate-screen-device-vars

Conflicts:
less/variables.less

11 years agomore specific deprecation comment
Mark Otto [Sat, 24 Aug 2013 05:51:39 +0000 (22:51 -0700)] 
more specific deprecation comment

11 years agoMerge pull request #9963 from twbs/min-breakpoint-naming
Mark Otto [Sat, 24 Aug 2013 05:50:41 +0000 (22:50 -0700)] 
Merge pull request #9963 from twbs/min-breakpoint-naming

rename @screen-XX to @screen-XX-min for clarity+unambiguity

11 years agoMerge pull request #10100 from twbs/document_hide_text
Chris Rebert [Sat, 24 Aug 2013 05:39:26 +0000 (22:39 -0700)] 
Merge pull request #10100 from twbs/document_hide_text

Fixes #10076: Document hide text

11 years agoUse jekyll var for current version in docs; update banner in gruntfile to match ...
Mark Otto [Sat, 24 Aug 2013 05:38:51 +0000 (22:38 -0700)] 
Use jekyll var for current version in docs; update banner in gruntfile to match .less banner

11 years agosplit mixin and grunt dist to be sure 10100/head
Mark Otto [Sat, 24 Aug 2013 05:19:58 +0000 (22:19 -0700)] 
split mixin and grunt dist to be sure

11 years agoDeprecate .hide-text mixin for .text-hide as mixin and class
Mark Otto [Sat, 24 Aug 2013 05:11:41 +0000 (22:11 -0700)] 
Deprecate .hide-text mixin for .text-hide as mixin and class

11 years agoDocument .hide-text and .text-hide
Mark Otto [Sat, 24 Aug 2013 05:01:42 +0000 (22:01 -0700)] 
Document .hide-text and .text-hide

11 years agoRearrange helper classes docs section; add subnav list items to docs side nav
Mark Otto [Sat, 24 Aug 2013 05:00:54 +0000 (22:00 -0700)] 
Rearrange helper classes docs section; add subnav list items to docs side nav

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sat, 24 Aug 2013 04:45:58 +0000 (21:45 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofixes #10095: note about backwards incompatibility
Mark Otto [Sat, 24 Aug 2013 04:45:46 +0000 (21:45 -0700)] 
fixes #10095: note about backwards incompatibility

11 years agoMerge pull request #10098 from wangsai/fix-form
Mark Otto [Sat, 24 Aug 2013 04:34:44 +0000 (21:34 -0700)] 
Merge pull request #10098 from wangsai/fix-form

fix form

11 years agoMerge pull request #10097 from wangsai/complete-td
Mark Otto [Sat, 24 Aug 2013 04:34:25 +0000 (21:34 -0700)] 
Merge pull request #10097 from wangsai/complete-td

complete missed </td>

11 years agofix form 10098/head
wangsai [Sat, 24 Aug 2013 03:39:34 +0000 (11:39 +0800)] 
fix form

11 years agocomplete missed </td> 10097/head
wangsai [Sat, 24 Aug 2013 03:09:33 +0000 (11:09 +0800)] 
complete missed </td>

11 years agoMerge pull request #9931 from realityking/toolbar
Chris Rebert [Fri, 23 Aug 2013 23:19:30 +0000 (16:19 -0700)] 
Merge pull request #9931 from realityking/toolbar

Add role="toolbar" to elements with .btn-toolbar.

11 years agofix #10054; mention .muted -> .text-muted in migration docs
Chris Rebert [Fri, 23 Aug 2013 23:12:24 +0000 (16:12 -0700)] 
fix #10054; mention .muted -> .text-muted in migration docs

11 years agoMerge pull request #9966 from twbs/header-font-size-vars
Mark Otto [Fri, 23 Aug 2013 21:26:40 +0000 (14:26 -0700)] 
Merge pull request #9966 from twbs/header-font-size-vars

add variables for heading font sizes; fixes #9921

11 years agorun grunt 9966/head
Mark Otto [Fri, 23 Aug 2013 21:26:16 +0000 (14:26 -0700)] 
run grunt

11 years agoRun grunt dist on theme for some reason
Mark Otto [Fri, 23 Aug 2013 21:23:13 +0000 (14:23 -0700)] 
Run grunt dist on theme for some reason

11 years agoUpdate and document use of `small` in headings
Mark Otto [Fri, 23 Aug 2013 21:22:51 +0000 (14:22 -0700)] 
Update and document use of `small` in headings

11 years agoMerge branch 'master' into header-font-size-vars
Mark Otto [Fri, 23 Aug 2013 21:00:28 +0000 (14:00 -0700)] 
Merge branch 'master' into header-font-size-vars

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Fri, 23 Aug 2013 20:46:40 +0000 (13:46 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofixes #10087: add version number to all docs pages in footer
Mark Otto [Fri, 23 Aug 2013 20:46:28 +0000 (13:46 -0700)] 
fixes #10087: add version number to all docs pages in footer

11 years agofix data-api portion of #10084
Chris Rebert [Fri, 23 Aug 2013 18:14:54 +0000 (11:14 -0700)] 
fix data-api portion of #10084

11 years agorepeat #10081 caveat for popovers too
Chris Rebert [Fri, 23 Aug 2013 18:09:01 +0000 (11:09 -0700)] 
repeat #10081 caveat for popovers too

11 years agotweak #10081 phrasing
Chris Rebert [Fri, 23 Aug 2013 18:08:37 +0000 (11:08 -0700)] 
tweak #10081 phrasing

11 years agoMerge pull request #10081 from bcarrell/master
Chris Rebert [Fri, 23 Aug 2013 18:02:46 +0000 (11:02 -0700)] 
Merge pull request #10081 from bcarrell/master

docs: add explanation for adding tooltips to disabled elements

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Fri, 23 Aug 2013 17:47:36 +0000 (10:47 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
css.html

11 years agofixes #9877: improve active state on nav list items in theme
Mark Otto [Fri, 23 Aug 2013 17:44:13 +0000 (10:44 -0700)] 
fixes #9877: improve active state on nav list items in theme

11 years agofixes #9879: add hover state to theme buttons
Mark Otto [Fri, 23 Aug 2013 17:36:37 +0000 (10:36 -0700)] 
fixes #9879: add hover state to theme buttons

11 years agofix #10070 by resyncing fieldset disabled live example & example code
Chris Rebert [Fri, 23 Aug 2013 17:18:39 +0000 (10:18 -0700)] 
fix #10070 by resyncing fieldset disabled live example & example code

11 years agodocs: add explanation for adding tooltips to disabled elements, closes #10049 10081/head
bcarrell [Fri, 23 Aug 2013 16:10:52 +0000 (12:10 -0400)] 
docs: add explanation for adding tooltips to disabled elements, closes #10049

11 years agofixes #9880: use correct grid classes on jumbotron example
Mark Otto [Fri, 23 Aug 2013 06:25:26 +0000 (23:25 -0700)] 
fixes #9880: use correct grid classes on jumbotron example

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Fri, 23 Aug 2013 06:19:49 +0000 (23:19 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoadd blog link to homepage
Mark Otto [Fri, 23 Aug 2013 06:18:45 +0000 (23:18 -0700)] 
add blog link to homepage

11 years agoMerge pull request #10012 from twbs/david-badge
Mark Otto [Fri, 23 Aug 2013 02:26:18 +0000 (19:26 -0700)] 
Merge pull request #10012 from twbs/david-badge

add David (david-dm.org) badge to monitor currentness of dependencies

11 years agoMerge pull request #10040 from twbs/pull-navbar-docs
Mark Otto [Fri, 23 Aug 2013 02:23:21 +0000 (19:23 -0700)] 
Merge pull request #10040 from twbs/pull-navbar-docs

add cross-reference to .navbar-left/right in .pull-left/right docs

11 years agoupdate outdated JSFiddle example
Chris Rebert [Thu, 22 Aug 2013 23:51:57 +0000 (16:51 -0700)] 
update outdated JSFiddle example

11 years agofix #10029
Chris Rebert [Thu, 22 Aug 2013 19:30:32 +0000 (12:30 -0700)] 
fix #10029

11 years agoadd cross-reference to .navbar-left/right in .pull-left/right docs 10040/head
Chris Rebert [Thu, 22 Aug 2013 19:26:04 +0000 (12:26 -0700)] 
add cross-reference to .navbar-left/right in .pull-left/right docs

11 years agoMerge pull request #10034 from nschonni/use-published-version-for-grunt-html-validation
Chris Rebert [Thu, 22 Aug 2013 17:10:13 +0000 (10:10 -0700)] 
Merge pull request #10034 from nschonni/use-published-version-for-grunt-html-validation

Use NPM version of grunt-html-validation

11 years agoUse NPM version of grunt-html-validation 10034/head
Nick Schonning [Thu, 22 Aug 2013 16:20:56 +0000 (12:20 -0400)] 
Use NPM version of grunt-html-validation

The package is now published, so the direct git url is no longer
required

11 years agoMerge pull request #10011 from nschonni/patch-1
Chris Rebert [Wed, 21 Aug 2013 22:42:58 +0000 (15:42 -0700)] 
Merge pull request #10011 from nschonni/patch-1

Update Grunt instruction links and wording

11 years agoAlways wrap form examples in .bs-example; add some missing role='form'
Mark Otto [Wed, 21 Aug 2013 22:12:55 +0000 (15:12 -0700)] 
Always wrap form examples in .bs-example; add some missing role='form'

11 years agoadd David (david-dm.org) badge to monitor currentness of dependencies 10012/head
Chris Rebert [Wed, 21 Aug 2013 22:11:56 +0000 (15:11 -0700)] 
add David (david-dm.org) badge to monitor currentness of dependencies

11 years agoUpdate Grunt instruction links and wording 10011/head
Nick Schonning [Wed, 21 Aug 2013 22:11:33 +0000 (18:11 -0400)] 
Update Grunt instruction links and wording

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Wed, 21 Aug 2013 21:30:27 +0000 (14:30 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoMerge pull request #10006 from jodytate/master
Mark Otto [Wed, 21 Aug 2013 21:25:49 +0000 (14:25 -0700)] 
Merge pull request #10006 from jodytate/master

remove .btn-group

11 years agoremove .btn-group 10006/head
jody tate [Wed, 21 Aug 2013 20:31:17 +0000 (13:31 -0700)] 
remove .btn-group

Removing this class--it's not used in the example and using it causes "bad things to happen."

http://jsfiddle.net/josephtate/Jn6H4/

11 years agodeprecate @screen-{phone,tablet,desktop} vars
Chris Rebert [Wed, 21 Aug 2013 19:26:20 +0000 (12:26 -0700)] 
deprecate @screen-{phone,tablet,desktop} vars

11 years agoMerge pull request #9999 from sqrt4/fix-9974
Chris Rebert [Wed, 21 Aug 2013 18:36:02 +0000 (11:36 -0700)] 
Merge pull request #9999 from sqrt4/fix-9974

Fixes #9974

11 years agoFixes #9974 9999/head
James Lawrence [Wed, 21 Aug 2013 16:56:36 +0000 (17:56 +0100)] 
Fixes #9974

Added th selector in .table-row-variant mixin

11 years agoMerge pull request #9987 from wangsai/fix-typo
Chris Rebert [Wed, 21 Aug 2013 16:23:31 +0000 (09:23 -0700)] 
Merge pull request #9987 from wangsai/fix-typo

change `else if` to `else`

11 years agochange `else if` to `else` 9987/head
wangsai [Wed, 21 Aug 2013 11:36:33 +0000 (19:36 +0800)] 
change `else if` to `else`

11 years agoMerge pull request #9973 from coliff/patch-6
Chris Rebert [Wed, 21 Aug 2013 07:35:15 +0000 (00:35 -0700)] 
Merge pull request #9973 from coliff/patch-6

Update justified-nav.css (Removed unnecessary ms-linear-gradient prefix)

11 years agoUpdate justified-nav.css 9973/head
Christian [Wed, 21 Aug 2013 07:30:12 +0000 (16:30 +0900)] 
Update justified-nav.css

Removed unnecessary ms-linear-gradient prefix. There was never a stable release of IE that supported -ms- prefixed gradients, those were only in preview versions (stable IE10 supports both prefixed and unprefixed gradients). (source: http://lea.verou.me/2013/04/can-we-get-rid-of-gradient-prefixes/)

11 years agorename @screen-XX to @screen-XX-min for clarity+unambiguity 9963/head
Chris Rebert [Wed, 21 Aug 2013 00:31:02 +0000 (17:31 -0700)] 
rename @screen-XX to @screen-XX-min for clarity+unambiguity

11 years agoadd header font size vars to customizer page
Chris Rebert [Wed, 21 Aug 2013 01:47:04 +0000 (18:47 -0700)] 
add header font size vars to customizer page

11 years agoregenerate customizer's raw-files.js
Chris Rebert [Wed, 21 Aug 2013 01:46:20 +0000 (18:46 -0700)] 
regenerate customizer's raw-files.js

11 years agoadd variables for heading font sizes; fixes #9921
Chris Rebert [Wed, 21 Aug 2013 00:49:17 +0000 (17:49 -0700)] 
add variables for heading font sizes; fixes #9921

11 years agoupdate copyright year
Chris Rebert [Tue, 20 Aug 2013 23:34:57 +0000 (16:34 -0700)] 
update copyright year

11 years agofix #9915
Chris Rebert [Tue, 20 Aug 2013 23:21:18 +0000 (16:21 -0700)] 
fix #9915

11 years agomaster branch is no longer stationary, so don't imply otherwise
Chris Rebert [Tue, 20 Aug 2013 21:18:30 +0000 (14:18 -0700)] 
master branch is no longer stationary, so don't imply otherwise

11 years agolinks to a release instead of master, so rephrase description accordingly
Chris Rebert [Tue, 20 Aug 2013 21:16:31 +0000 (14:16 -0700)] 
links to a release instead of master, so rephrase description accordingly

11 years agopoint release download link to an actual release instead of `master`
Chris Rebert [Tue, 20 Aug 2013 21:00:48 +0000 (14:00 -0700)] 
point release download link to an actual release instead of `master`

11 years agoCONTRIBUTING: reflect move away from *-wip branch style of development
Chris Rebert [Tue, 20 Aug 2013 20:45:52 +0000 (13:45 -0700)] 
CONTRIBUTING: reflect move away from *-wip branch style of development

Per http://blog.getbootstrap.com/2012/12/10/bootstrap-3-plans/ :
> * Drop the `*-wip` branch style of development.

11 years agofix #9917
Chris Rebert [Tue, 20 Aug 2013 20:36:22 +0000 (13:36 -0700)] 
fix #9917

11 years agofix #9924
Chris Rebert [Tue, 20 Aug 2013 19:41:41 +0000 (12:41 -0700)] 
fix #9924

11 years agoMerge pull request #9930 from tagliala/whitespaces-fix
Chris Rebert [Tue, 20 Aug 2013 17:35:00 +0000 (10:35 -0700)] 
Merge pull request #9930 from tagliala/whitespaces-fix

Removed trailing whitespaces in responsive-utilities.less

11 years agoMerge pull request #9918 from lamby/master
Chris Rebert [Tue, 20 Aug 2013 16:36:00 +0000 (09:36 -0700)] 
Merge pull request #9918 from lamby/master

Correct "Aligninment" -> "Alignment" typo.

11 years agoAdd role="toolbar" to elements with .btn-toolbar. 9931/head
Rouven Weßling [Tue, 20 Aug 2013 13:07:43 +0000 (15:07 +0200)] 
Add role="toolbar" to elements with .btn-toolbar.

11 years agoRemoving whitespaces 9930/head
Geremia Taglialatela [Tue, 20 Aug 2013 12:56:10 +0000 (14:56 +0200)] 
Removing whitespaces

11 years agoCorrect "Aligninment" -> "Alignment" typo. 9918/head
Chris Lamb [Tue, 20 Aug 2013 10:18:23 +0000 (11:18 +0100)] 
Correct "Aligninment" -> "Alignment" typo.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
11 years agoquick fix for docs mention
Mark Otto [Mon, 19 Aug 2013 22:12:25 +0000 (15:12 -0700)] 
quick fix for docs mention

11 years agoupdate grunt-html-validation output file ignores
Chris Rebert [Mon, 19 Aug 2013 21:23:07 +0000 (14:23 -0700)] 
update grunt-html-validation output file ignores

11 years agoremove dumb validation reports v3.0.0
fat [Mon, 19 Aug 2013 21:18:20 +0000 (14:18 -0700)] 
remove dumb validation reports

11 years agofix customizer
fat [Mon, 19 Aug 2013 21:16:52 +0000 (14:16 -0700)] 
fix customizer

11 years agoreally do the raw liquid tag
Mark Otto [Mon, 19 Aug 2013 20:58:29 +0000 (13:58 -0700)] 
really do the raw liquid tag

11 years agowrap generated customizer code in raw liquid tag for proper jekyll serve
Mark Otto [Mon, 19 Aug 2013 20:49:58 +0000 (13:49 -0700)] 
wrap generated customizer code in raw liquid tag for proper jekyll serve

11 years agofix broken panels in js example 6342/head
Mark Otto [Mon, 19 Aug 2013 20:27:45 +0000 (13:27 -0700)] 
fix broken panels in js example

11 years agorun grunt to generate customizer
Mark Otto [Mon, 19 Aug 2013 20:17:16 +0000 (13:17 -0700)] 
run grunt to generate customizer

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Mon, 19 Aug 2013 20:16:39 +0000 (13:16 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agofixes #9855: account for modal overflow on body hiding scrollbar
Mark Otto [Mon, 19 Aug 2013 20:16:32 +0000 (13:16 -0700)] 
fixes #9855: account for modal overflow on body hiding scrollbar

11 years agoupdate gruntfile not to run validation + remove validation status
fat [Mon, 19 Aug 2013 19:22:42 +0000 (12:22 -0700)] 
update gruntfile not to run validation + remove validation status

11 years agoadd glyphicons to customizer
fat [Mon, 19 Aug 2013 19:19:00 +0000 (12:19 -0700)] 
add glyphicons to customizer

11 years agorun grunt dist for #9864
Mark Otto [Mon, 19 Aug 2013 17:43:58 +0000 (10:43 -0700)] 
run grunt dist for #9864

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Mon, 19 Aug 2013 17:43:45 +0000 (10:43 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agoMerge pull request #9864 from boomsb/3.0.0-wip
Mark Otto [Mon, 19 Aug 2013 17:43:26 +0000 (10:43 -0700)] 
Merge pull request #9864 from boomsb/3.0.0-wip

Update tables.less

11 years agofix 144 apple icon
Mark Otto [Mon, 19 Aug 2013 16:54:16 +0000 (09:54 -0700)] 
fix 144 apple icon

11 years agoFixes secondary issue in #9798
Mark Otto [Mon, 19 Aug 2013 16:36:56 +0000 (09:36 -0700)] 
Fixes secondary issue in #9798

11 years agoAdd default navbar z-index to fix #9844
Mark Otto [Mon, 19 Aug 2013 16:31:16 +0000 (09:31 -0700)] 
Add default navbar z-index to fix #9844

iOS doesn't pick up the z-indexing properly on the dropdowns unless you
specify one for the parent navbar.

11 years agoUpdate tables.less 9864/head
boomsb [Mon, 19 Aug 2013 16:30:38 +0000 (11:30 -0500)] 
Update tables.less

Fixed Table cell sizing with multiple classes by using *= instead of ^=

11 years agoComment out grid cols var until we get mixins back in v3.1
Mark Otto [Mon, 19 Aug 2013 16:17:49 +0000 (09:17 -0700)] 
Comment out grid cols var until we get mixins back in v3.1

11 years agoGenerate customizer stuff
Mark Otto [Mon, 19 Aug 2013 16:12:34 +0000 (09:12 -0700)] 
Generate customizer stuff

11 years agoUpdate thumbnails col classes
Mark Otto [Mon, 19 Aug 2013 16:10:19 +0000 (09:10 -0700)] 
Update thumbnails col classes

11 years agorun grunt dist on #9847
Mark Otto [Mon, 19 Aug 2013 15:59:12 +0000 (08:59 -0700)] 
run grunt dist on #9847

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Mon, 19 Aug 2013 15:58:59 +0000 (08:58 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agoMerge pull request #9847 from wangsai/remove-duplicate-code
Mark Otto [Mon, 19 Aug 2013 15:58:47 +0000 (08:58 -0700)] 
Merge pull request #9847 from wangsai/remove-duplicate-code

`.table` style is duplicate in `List groups in panels` and `Tables in panels`

11 years agoUpdate jsbin example
Mark Otto [Mon, 19 Aug 2013 15:56:08 +0000 (08:56 -0700)] 
Update jsbin example