]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoFixes #9008: remove `alert-block` class from example 10128/head
Joel Kuzmarski [Sun, 25 Aug 2013 04:01:08 +0000 (23:01 -0500)] 
Fixes #9008: remove `alert-block` class from example

11 years agoupdate raw files (should fix builds)
Mark Otto [Sat, 24 Aug 2013 21:47:58 +0000 (14:47 -0700)] 
update raw files (should fix builds)

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

11 years agofixes #9887: documents show and hide classes
Mark Otto [Sat, 24 Aug 2013 21:40:24 +0000 (14:40 -0700)] 
fixes #9887: documents show and hide classes

11 years agoMerge pull request #10112 from kevinSuttle/button-roles
Mark Otto [Sat, 24 Aug 2013 21:31:33 +0000 (14:31 -0700)] 
Merge pull request #10112 from kevinSuttle/button-roles

Add role="button" to <a> buttons

11 years agogrunt dist on glyphicons width change
Mark Otto [Sat, 24 Aug 2013 20:59:03 +0000 (13:59 -0700)] 
grunt dist on glyphicons width change

11 years agoMerge pull request #9996 from jodytate/master
Mark Otto [Sat, 24 Aug 2013 20:41:24 +0000 (13:41 -0700)] 
Merge pull request #9996 from jodytate/master

changed description of default button

11 years agoAdd even more role="button" attributes 10112/head
Kevin Suttle [Sat, 24 Aug 2013 15:32:23 +0000 (11:32 -0400)] 
Add even more  role="button" attributes

Missed the <a class="btw" in my regex search

11 years agoAdd role="button" to <a> buttons
Kevin Suttle [Sat, 24 Aug 2013 15:16:08 +0000 (11:16 -0400)] 
Add role="button" to <a> buttons

These should really be <button> elements, but until that gets squared away, this will suffice.

11 years agoforgot a pair of buttons
Mark Otto [Sat, 24 Aug 2013 19:30:46 +0000 (12:30 -0700)] 
forgot a pair of buttons

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

11 years agoturn some buttons into <button> elements where possible
Mark Otto [Sat, 24 Aug 2013 18:46:24 +0000 (11:46 -0700)] 
turn some buttons into <button> elements where possible

11 years agoMerge pull request #10103 from hero-m/patch-1
Mark Otto [Sat, 24 Aug 2013 08:33:04 +0000 (01:33 -0700)] 
Merge pull request #10103 from hero-m/patch-1

Another case for Issue #10099

11 years agoAnother case for Issue #10099 10103/head
hero-m [Sat, 24 Aug 2013 07:41:12 +0000 (12:11 +0430)] 
Another case for Issue #10099

Another case for Issue #10099

11 years agoMerge pull request #10059 from felixhirschfeld/patch-1
Mark Otto [Sat, 24 Aug 2013 07:19:37 +0000 (00:19 -0700)] 
Merge pull request #10059 from felixhirschfeld/patch-1

Add mixin for transition-property

11 years agoMerge pull request #10022 from thomaswelton/proposal-glyphicon-block
Mark Otto [Sat, 24 Aug 2013 07:15:34 +0000 (00:15 -0700)] 
Merge pull request #10022 from thomaswelton/proposal-glyphicon-block

Proposal - Fixed width for glypicons

11 years agofixes #9969: add support for output element
Mark Otto [Sat, 24 Aug 2013 07:14:09 +0000 (00:14 -0700)] 
fixes #9969: add support for output element

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

11 years agoRemove footnote links and inline them; link to contributing guidelines in readme
Mark Otto [Sat, 24 Aug 2013 06:58:38 +0000 (23:58 -0700)] 
Remove footnote links and inline them; link to contributing guidelines in readme

11 years agoMerge pull request #9964 from thomaswelton/patch-1
Mark Otto [Sat, 24 Aug 2013 06:52:24 +0000 (23:52 -0700)] 
Merge pull request #9964 from thomaswelton/patch-1

Bower - Added fonts to "main" files

11 years agoMerge branch 'master' of https://github.com/charnog/bootstrap into charnog-master
Mark Otto [Sat, 24 Aug 2013 06:40:12 +0000 (23:40 -0700)] 
Merge branch 'master' of https://github.com/charnog/bootstrap into charnog-master

Conflicts:
dist/css/bootstrap.min.css

11 years agofixes #9876: avoid dropdowns in navbar examples to prevent overlap
Mark Otto [Sat, 24 Aug 2013 06:39:11 +0000 (23:39 -0700)] 
fixes #9876: avoid dropdowns in navbar examples to prevent overlap

11 years agofollow up to #9963 and #10005: update docs to use .screen-*-min vars, update customiz...
Mark Otto [Sat, 24 Aug 2013 06:33:16 +0000 (23:33 -0700)] 
follow up to #9963 and #10005: update docs to use .screen-*-min vars, update customizer as well; run grunt to adjust raw files

11 years agogrunt on previous ms scroll fix
Mark Otto [Sat, 24 Aug 2013 06:32:06 +0000 (23:32 -0700)] 
grunt on previous ms scroll fix

11 years agoMerge pull request #10057 from sambowler/patch-1
Mark Otto [Sat, 24 Aug 2013 06:19:05 +0000 (23:19 -0700)] 
Merge pull request #10057 from sambowler/patch-1

Fix responsive table scrolling on Windows Phone 8.

11 years agoMerge branch 'master' of https://github.com/apexskier/bootstrap into apexskier-master
Mark Otto [Sat, 24 Aug 2013 06:16:37 +0000 (23:16 -0700)] 
Merge branch 'master' of https://github.com/apexskier/bootstrap into apexskier-master

Conflicts:
dist/css/bootstrap.min.css

11 years agoMerge pull request #10005 from twbs/deprecate-screen-device-vars
Mark Otto [Sat, 24 Aug 2013 06:14:13 +0000 (23:14 -0700)] 
Merge pull request #10005 from twbs/deprecate-screen-device-vars

deprecate @screen-{phone,tablet,desktop} vars

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 agoAdded -webkit-overflow-scrolling: touch to responsive tables 10079/head
Cameron Little [Fri, 23 Aug 2013 15:55:02 +0000 (08:55 -0700)] 
Added -webkit-overflow-scrolling: touch to responsive tables

11 years agoAdd mixin for transition-property 10059/head
Felix Hirschfeld [Fri, 23 Aug 2013 07:22:54 +0000 (09:22 +0200)] 
Add mixin for transition-property

It's quite handy if a transition needs the same duration, timing-function or delay and only specific properties to animate.

11 years agoFix responsive table scrolling on Windows Phone 8. 10057/head
Sam Bowler [Fri, 23 Aug 2013 06:53:09 +0000 (07:53 +0100)] 
Fix responsive table scrolling on Windows Phone 8.

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 agoRemoved glyphicon-block instead target :empty .glyphicons 10022/head
Thomas Welton [Thu, 22 Aug 2013 09:28:54 +0000 (10:28 +0100)] 
Removed glyphicon-block instead target :empty .glyphicons

11 years agoAdded glyphicon-block class
Thomas Welton [Thu, 22 Aug 2013 01:54:54 +0000 (02:54 +0100)] 
Added glyphicon-block class

Prevents elements moving around the page after the font file has loaded by setting a defined width on elements using the icon font.

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 agoremove .btn-group 9996/head
jody tate [Wed, 21 Aug 2013 20:06:46 +0000 (13:06 -0700)] 
remove .btn-group

The example doesn't use .btn-group and adding the class causes "bad things to happen," as the saying goes.

http://jsfiddle.net/josephtate/g6AWF

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 agoremoved extraneous space
jody tate [Wed, 21 Aug 2013 15:46:13 +0000 (08:46 -0700)] 
removed extraneous space

11 years agoremoved reference to button color and gradient
jody tate [Wed, 21 Aug 2013 15:44:54 +0000 (08:44 -0700)] 
removed reference to button color and gradient

Changed the wording to reflect the default button's new look since it's no longer grey and doesn't have a gradient. I'd say this new wording isn't ideal and needs something a bit more, well, descriptive.

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 agofix #9941 9981/head
Denis Gonchar [Wed, 21 Aug 2013 09:57:48 +0000 (15:57 +0600)] 
fix #9941

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 agoAdded fonts to "main" files 9964/head
Thomas Welton [Wed, 21 Aug 2013 00:32:39 +0000 (01:32 +0100)] 
Added fonts to "main" files

When using bower the "main" property is used to specify the files that should be consumed by applications including the package as a dependency.
Without including the fonts in this array the glyphicons do not work correctly as the relative font paths do not work after the "main" files are copied into my projects public dir using tools like https://github.com/yatskevich/grunt-bower-task

For now I have manually copied the fonts dir in the location needed for my project. But by accepting this pull request this will not be necessary for me or for other people that use bower.

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