]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
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 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 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

11 years agogrunt
Mark Otto [Mon, 9 Dec 2013 01:21:37 +0000 (17:21 -0800)] 
grunt

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

11 years agoMatch customizer banner to Gruntfile banner
Mark Otto [Mon, 9 Dec 2013 01:17:51 +0000 (17:17 -0800)] 
Match customizer banner to Gruntfile banner

11 years agofix dependency mapping of buttons and button-groups in customizer
Mark Otto [Mon, 9 Dec 2013 01:17:04 +0000 (17:17 -0800)] 
fix dependency mapping of buttons and button-groups in customizer

11 years agofix <button>s with .btn but missing accompanying .btn-*
Chris Rebert [Mon, 9 Dec 2013 01:15:26 +0000 (17:15 -0800)] 
fix <button>s with .btn but missing accompanying .btn-*

11 years agoFix typo in new author meta tag
Julian Thilo [Sun, 8 Dec 2013 21:39:29 +0000 (22:39 +0100)] 
Fix typo in new author meta tag

11 years agoMerge pull request #11780 from ZDroid/grunt-dev
Mark Otto [Sun, 8 Dec 2013 18:47:24 +0000 (10:47 -0800)] 
Merge pull request #11780 from ZDroid/grunt-dev

Don't ignore Gruntfile, it's required for compile

11 years agoDon't ignore Gruntfile, it's required for compile 11780/head
Zlatan Vasović [Sun, 8 Dec 2013 11:25:52 +0000 (12:25 +0100)] 
Don't ignore Gruntfile, it's required for compile

11 years agoMerge pull request #10709 from XhmikosR/quotes
Mark Otto [Sun, 8 Dec 2013 10:52:15 +0000 (02:52 -0800)] 
Merge pull request #10709 from XhmikosR/quotes

Quotes

11 years agoUse single quotes consistently. 10709/head
XhmikosR [Wed, 18 Sep 2013 16:50:02 +0000 (19:50 +0300)] 
Use single quotes consistently.

11 years agoMerge pull request #11739 from XhmikosR/lint-assets
Mark Otto [Sun, 8 Dec 2013 10:16:16 +0000 (02:16 -0800)] 
Merge pull request #11739 from XhmikosR/lint-assets

Lint docs-assets/js/application.js and docs-assets/js/customizer.js.

11 years agofix validation failure
Mark Otto [Sun, 8 Dec 2013 10:14:43 +0000 (02:14 -0800)] 
fix validation failure

11 years agoFixes #11741: Don't set headings font-family again, just use inherit
Mark Otto [Sun, 8 Dec 2013 10:14:24 +0000 (02:14 -0800)] 
Fixes #11741: Don't set headings font-family again, just use inherit

11 years agoMerge branch 'master' into pr/11744
Mark Otto [Sun, 8 Dec 2013 10:00:37 +0000 (02:00 -0800)] 
Merge branch 'master' into pr/11744

Conflicts:
dist/css/bootstrap.min.css

11 years agoadd vertical-align back to where it's necessary since we reset from block to inline...
Mark Otto [Sun, 8 Dec 2013 09:59:44 +0000 (01:59 -0800)] 
add vertical-align back to where it's necessary since we reset from block to inline-block on several inputs

11 years agoMerge pull request #11748 from bganicky/patch-1
Mark Otto [Sun, 8 Dec 2013 09:49:38 +0000 (01:49 -0800)] 
Merge pull request #11748 from bganicky/patch-1

Updated .scale() mixin so that it accepts optional vertical scale factor...

11 years agoMerge branch 'master' into pr/11750
Mark Otto [Sun, 8 Dec 2013 09:45:42 +0000 (01:45 -0800)] 
Merge branch 'master' into pr/11750

Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 8 Dec 2013 08:17:17 +0000 (00:17 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoimage compression
Mark Otto [Sun, 8 Dec 2013 07:49:03 +0000 (23:49 -0800)] 
image compression

11 years agoMerge pull request #11772 from KostyaTretyak/correction
Mark Otto [Sun, 8 Dec 2013 07:29:36 +0000 (23:29 -0800)] 
Merge pull request #11772 from KostyaTretyak/correction

Fixed some errors in the docs javascript.html

11 years agoAdd new template, Cover
Mark Otto [Sun, 8 Dec 2013 07:23:41 +0000 (23:23 -0800)] 
Add new template, Cover

11 years agoMerge branch 'master' of https://github.com/twbs/bootstrap into correction 11772/head
kostyatretyak [Sun, 8 Dec 2013 07:13:22 +0000 (09:13 +0200)] 
Merge branch 'master' of https://github.com/twbs/bootstrap into correction

11 years agoFixed some errors in the docs javascript.html
kostyatretyak [Sun, 8 Dec 2013 07:11:43 +0000 (09:11 +0200)] 
Fixed some errors in the docs javascript.html

11 years agoAdd .container-fluid variation for full-width containers and layouts
Mark Otto [Sun, 8 Dec 2013 04:52:51 +0000 (20:52 -0800)] 
Add .container-fluid variation for full-width containers and layouts

/cc #10711 #9862

11 years agoAdd new template, Dashboard
Mark Otto [Sun, 8 Dec 2013 04:51:25 +0000 (20:51 -0800)] 
Add new template, Dashboard

11 years agoimprove icon display on narrow devices
Mark Otto [Sun, 8 Dec 2013 00:28:29 +0000 (16:28 -0800)] 
improve icon display on narrow devices

11 years agoprevent horizontal scroll on components
Mark Otto [Sun, 8 Dec 2013 00:22:43 +0000 (16:22 -0800)] 
prevent horizontal scroll on components

11 years agoShorter download text because narrow viewports
Mark Otto [Sun, 8 Dec 2013 00:22:00 +0000 (16:22 -0800)] 
Shorter download text because narrow viewports

11 years agoFixes #11729: Show code snippets on mobile views
Mark Otto [Sun, 8 Dec 2013 00:21:46 +0000 (16:21 -0800)] 
Fixes #11729: Show code snippets on mobile views

11 years agoFixes #11756: Mention document mode checking ability in IE comaptibility modes
Mark Otto [Sat, 7 Dec 2013 23:57:17 +0000 (15:57 -0800)] 
Fixes #11756: Mention document mode checking ability in IE comaptibility modes

11 years agoMerge branch 'pr/11138'
Mark Otto [Sat, 7 Dec 2013 22:10:41 +0000 (14:10 -0800)] 
Merge branch 'pr/11138'

Conflicts:
dist/css/bootstrap.min.css
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js

11 years agoContextual list group cleanup
Mark Otto [Sat, 7 Dec 2013 22:09:03 +0000 (14:09 -0800)] 
Contextual list group cleanup

* Adds nav link to sidebar for contextual classes
* Refactors to use prefixed classes, like .list-group-item-info, instead of chained classes
* Adds default and linked variations to example in docs

11 years agogrunt dist after adding .text-justify
Mark Otto [Sat, 7 Dec 2013 20:19:17 +0000 (12:19 -0800)] 
grunt dist after adding .text-justify

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

11 years agoFixes #11193: Add kbd element styles to indicate user input via keyboard
Mark Otto [Sat, 7 Dec 2013 20:18:13 +0000 (12:18 -0800)] 
Fixes #11193: Add kbd element styles to indicate user input via keyboard

11 years agoMerge pull request #11675 from GraceNut/feature/text-justify
Mark Otto [Sat, 7 Dec 2013 19:58:31 +0000 (11:58 -0800)] 
Merge pull request #11675 from GraceNut/feature/text-justify

Added text-justify class to type.less

11 years agoFixes #10884: Adds .info variant to contextual table classes
Mark Otto [Sat, 7 Dec 2013 19:56:35 +0000 (11:56 -0800)] 
Fixes #10884: Adds .info variant to contextual table classes

11 years agoReorder button and table variants for consistent order
Mark Otto [Sat, 7 Dec 2013 19:47:37 +0000 (11:47 -0800)] 
Reorder button and table variants for consistent order

11 years agoFixes #11766: Use color var for background on badges in buttons to restore proper...
Mark Otto [Sat, 7 Dec 2013 19:45:11 +0000 (11:45 -0800)] 
Fixes #11766: Use color var for background on badges in buttons to restore proper background to default button badge

11 years agogrunt dist
Mark Otto [Sat, 7 Dec 2013 19:44:32 +0000 (11:44 -0800)] 
grunt dist

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sat, 7 Dec 2013 19:41:02 +0000 (11:41 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #11764: Add meta data to docs for description, keywords, and authors
Mark Otto [Sat, 7 Dec 2013 19:40:08 +0000 (11:40 -0800)] 
Fixes #11764: Add meta data to docs for description, keywords, and authors

11 years agoMerge pull request #11757 from ZDroid/darken-toggle
Mark Otto [Sat, 7 Dec 2013 19:34:03 +0000 (11:34 -0800)] 
Merge pull request #11757 from ZDroid/darken-toggle

Darken navbar toggle icon bar to meet WCAG

11 years agogrunt
Mark Otto [Sat, 7 Dec 2013 19:32:39 +0000 (11:32 -0800)] 
grunt

11 years agoFixes #11760: Remove mailing list links from readme and about pages
Mark Otto [Sat, 7 Dec 2013 19:22:38 +0000 (11:22 -0800)] 
Fixes #11760: Remove mailing list links from readme and about pages

Links are dead now since Google blacklisted the group for massive spam,
which they could be of no help in resolving. We’ll have a new official
forum for discussions soon folks <3.

11 years agoMerge pull request #11765 from ZDroid/docs-min-js
Mark Otto [Sat, 7 Dec 2013 19:09:43 +0000 (11:09 -0800)] 
Merge pull request #11765 from ZDroid/docs-min-js

Load minified Bootstrap JS code

11 years agoLoad minified Bootstrap JS code 11765/head
Zlatan Vasović [Sat, 7 Dec 2013 09:27:28 +0000 (10:27 +0100)] 
Load minified Bootstrap JS code

11 years agoMerge pull request #11761 from twbs/jscs
Mark Otto [Sat, 7 Dec 2013 03:33:53 +0000 (19:33 -0800)] 
Merge pull request #11761 from twbs/jscs

add JavaScript Code Style checker integration

11 years agoLint docs-assets/js/application.js and docs-assets/js/customizer.js. 11739/head
XhmikosR [Wed, 18 Sep 2013 18:37:55 +0000 (21:37 +0300)] 
Lint docs-assets/js/application.js and docs-assets/js/customizer.js.

11 years agoRemove incompatible properties. 11744/head
XhmikosR [Fri, 6 Dec 2013 10:42:21 +0000 (12:42 +0200)] 
Remove incompatible properties.

11 years agointegrate JSCS 11761/head
Chris Rebert [Sat, 7 Dec 2013 00:51:38 +0000 (16:51 -0800)] 
integrate JSCS

11 years agofix some JS to pass jscs
Chris Rebert [Sat, 7 Dec 2013 00:51:59 +0000 (16:51 -0800)] 
fix some JS to pass jscs

11 years agoMerge pull request #11745 from XhmikosR/function-spaces
Chris Rebert [Sat, 7 Dec 2013 00:43:09 +0000 (16:43 -0800)] 
Merge pull request #11745 from XhmikosR/function-spaces

Be consistent with function () spaces

11 years agoMerge pull request #11758 from ZDroid/rm-brstck-bower
Chris Rebert [Fri, 6 Dec 2013 21:45:58 +0000 (13:45 -0800)] 
Merge pull request #11758 from ZDroid/rm-brstck-bower

Drop browserstack.json from bower.json ignore

11 years agoDrop browserstack.json from bower.json ignore 11758/head
Zlatan Vasović [Fri, 6 Dec 2013 21:45:17 +0000 (22:45 +0100)] 
Drop browserstack.json from bower.json ignore

11 years agoDarken icon bar to meet WCAG 11757/head
Zlatan Vasović [Fri, 6 Dec 2013 21:34:29 +0000 (22:34 +0100)] 
Darken icon bar to meet WCAG

11 years agoMerge pull request #11755 from twbs/track-customize-js
Mark Otto [Fri, 6 Dec 2013 21:21:00 +0000 (13:21 -0800)] 
Merge pull request #11755 from twbs/track-customize-js

track customize.js so that customizer works on GitHub Pages site

11 years agoneed customize.js to be tracked for it to work on GitHub Pages 11755/head
Chris Rebert [Fri, 6 Dec 2013 19:35:46 +0000 (11:35 -0800)] 
need customize.js to be tracked for it to work on GitHub Pages

follow-up to #11738

11 years agogrunt
Chris Rebert [Fri, 6 Dec 2013 19:33:18 +0000 (11:33 -0800)] 
grunt

11 years agoMerge pull request #11738 from XhmikosR/min-assets
Mark Otto [Fri, 6 Dec 2013 19:27:19 +0000 (11:27 -0800)] 
Merge pull request #11738 from XhmikosR/min-assets

Minify docs-assets too.

11 years agoMerge pull request #11742 from vincentchan/master
Chris Rebert [Fri, 6 Dec 2013 17:44:15 +0000 (09:44 -0800)] 
Merge pull request #11742 from vincentchan/master

Added link to Bootstrap in French (in about.html)

11 years agoMerge pull request #11740 from XhmikosR/trailing-spaces
Chris Rebert [Fri, 6 Dec 2013 17:42:39 +0000 (09:42 -0800)] 
Merge pull request #11740 from XhmikosR/trailing-spaces

Remove trailing spaces

11 years agoreverted changes in commit 96109d3 which seemed to break conditional classes in strip... 11750/head
Luke Noel-Storr [Fri, 6 Dec 2013 14:11:58 +0000 (14:11 +0000)] 
reverted changes in commit 96109d3 which seemed to break conditional classes in striped tables (ignoring the comment above that the previous rules were needed for just this purpose)

fixes issue twbs/bootstrap#11728

11 years agoUpdated .scale() mixin so that it accepts optional vertical scale factor parameter. 11748/head
Bohdan Ganicky [Fri, 6 Dec 2013 13:09:55 +0000 (14:09 +0100)] 
Updated .scale() mixin so that it accepts optional vertical scale factor parameter.

11 years agoUse a space before functions' bracket consistently. 11745/head
XhmikosR [Fri, 6 Dec 2013 10:23:08 +0000 (12:23 +0200)] 
Use a space before functions' bracket consistently.

11 years agoUse a space after function consistently.
XhmikosR [Fri, 6 Dec 2013 10:20:59 +0000 (12:20 +0200)] 
Use a space after function consistently.

11 years agoAdding Bootstrap in French 11742/head
Vincent Chan [Fri, 6 Dec 2013 10:33:20 +0000 (18:33 +0800)] 
Adding Bootstrap in French

11 years agobower.json: remove trailing spaces. 11740/head
XhmikosR [Fri, 6 Dec 2013 09:32:10 +0000 (11:32 +0200)] 
bower.json: remove trailing spaces.

11 years agoMinify docs-assets too. 11738/head
XhmikosR [Thu, 19 Sep 2013 14:41:14 +0000 (17:41 +0300)] 
Minify docs-assets too.

11 years agoMerge pull request #11723 from stof/patch-1
Chris Rebert [Fri, 6 Dec 2013 00:53:15 +0000 (16:53 -0800)] 
Merge pull request #11723 from stof/patch-1

Added the removal of tab-content and tab-pane in the migration guide

11 years agoMerge pull request #11733 from KostyaTretyak/edit
Chris Rebert [Fri, 6 Dec 2013 00:50:03 +0000 (16:50 -0800)] 
Merge pull request #11733 from KostyaTretyak/edit

Fixed some errors in the documentation

11 years agoThis is error? 11733/head
kostyatretyak [Fri, 6 Dec 2013 00:28:42 +0000 (02:28 +0200)] 
This is error?

11 years agoFixed another small error
kostyatretyak [Fri, 6 Dec 2013 00:03:35 +0000 (02:03 +0200)] 
Fixed another small error

11 years agoMerge branch 'master' of https://github.com/twbs/bootstrap into edit
kostyatretyak [Thu, 5 Dec 2013 23:36:53 +0000 (01:36 +0200)] 
Merge branch 'master' of https://github.com/twbs/bootstrap into edit

11 years agoAdded the removal of tab-content and tab-pane in the migration guide 11723/head
Christophe Coevoet [Thu, 5 Dec 2013 16:45:22 +0000 (17:45 +0100)] 
Added the removal of tab-content and tab-pane in the migration guide

11 years agoMerge pull request #11718 from KostyaTretyak/once v3.0.3
Mark Otto [Thu, 5 Dec 2013 16:09:10 +0000 (08:09 -0800)] 
Merge pull request #11718 from KostyaTretyak/once

Added link to Ukrainian translation website (in about.html)

11 years agoAdded links to Ukrainian translation website 11718/head
kostyatretyak [Thu, 5 Dec 2013 10:33:55 +0000 (12:33 +0200)] 
Added links to Ukrainian translation website

11 years agoone last grunt
Mark Otto [Thu, 5 Dec 2013 06:54:03 +0000 (22:54 -0800)] 
one last grunt

11 years agoMerge pull request #11714 from ZDroid/redundant-comment
Mark Otto [Thu, 5 Dec 2013 06:52:12 +0000 (22:52 -0800)] 
Merge pull request #11714 from ZDroid/redundant-comment

Remove redundant, duplicate comment

11 years agoRemove redundant, duplicate comment 11714/head
Zlatan Vasović [Thu, 5 Dec 2013 06:43:50 +0000 (07:43 +0100)] 
Remove redundant, duplicate comment

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Thu, 5 Dec 2013 06:34:25 +0000 (22:34 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #11610: Add @grid-float-breakpoint-max to better link navbar behavior across...
Mark Otto [Thu, 5 Dec 2013 06:32:56 +0000 (22:32 -0800)] 
Fixes #11610: Add @grid-float-breakpoint-max to better link navbar behavior across viewports and improve customization.

Also addresses #10371, #10395, and #10465.

11 years agoMerge pull request #11671 from XhmikosR/updates
Mark Otto [Thu, 5 Dec 2013 05:58:00 +0000 (21:58 -0800)] 
Merge pull request #11671 from XhmikosR/updates

Update 3rd party asset libraries

11 years agoMerge branch 'master' into gradient-prefix-cleanup 11694/head
Mark Otto [Thu, 5 Dec 2013 05:23:09 +0000 (21:23 -0800)] 
Merge branch 'master' into gradient-prefix-cleanup

Conflicts:
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js

11 years agogrunt
Mark Otto [Thu, 5 Dec 2013 05:22:24 +0000 (21:22 -0800)] 
grunt

11 years agoFixes #11712: Better support for .table-responsive within .panel's
Mark Otto [Thu, 5 Dec 2013 05:13:33 +0000 (21:13 -0800)] 
Fixes #11712: Better support for .table-responsive within .panel's

11 years agoFixes #11436: mention in docs that .container isn't nestable; update docs to mention...
Mark Otto [Thu, 5 Dec 2013 05:10:13 +0000 (21:10 -0800)] 
Fixes #11436: mention in docs that .container isn't nestable; update docs to mention width, not max-width

11 years agoMerge pull request #11710 from JoahG/bootstrap-thumb
Mark Otto [Thu, 5 Dec 2013 04:45:57 +0000 (20:45 -0800)] 
Merge pull request #11710 from JoahG/bootstrap-thumb

Updates Jumbotron thumbnail

11 years agoMerge pull request #11709 from mdxs/patch-1
Chris Rebert [Wed, 4 Dec 2013 18:50:50 +0000 (10:50 -0800)] 
Merge pull request #11709 from mdxs/patch-1

Dropping unused variable in dropdown.js

11 years agoAdd a migration tip for .label-important to .label-danger
Cyrus Stoller [Wed, 4 Dec 2013 09:16:33 +0000 (01:16 -0800)] 
Add a migration tip for .label-important to .label-danger

11 years agoUpdates Bootstrap thumbnail 11710/head
Joah Gerstenberg [Wed, 4 Dec 2013 12:26:12 +0000 (06:26 -0600)] 
Updates Bootstrap thumbnail

11 years agoDropping unused variable in dropdown.js 11709/head
mdxs [Wed, 4 Dec 2013 10:15:48 +0000 (11:15 +0100)] 
Dropping unused variable in dropdown.js

Dropping an unused variable in the Dropdown function inside the `dropdown.js` code.

There are no new/changed unit tests, as there are no feature/bug changes requiring new test cases.

For the record: I agree to dual-license this contribution under the Apache 2 and MIT licenses.

11 years agoMerge pull request #11705 from cyrusstoller/migration-guide
Chris Rebert [Wed, 4 Dec 2013 08:51:13 +0000 (00:51 -0800)] 
Merge pull request #11705 from cyrusstoller/migration-guide

Add a migration tip for .label to .label-default

11 years agoAdd a migration tip for .label to .label-default 11705/head
Cyrus Stoller [Wed, 4 Dec 2013 08:34:38 +0000 (00:34 -0800)] 
Add a migration tip for .label to .label-default

11 years agoMerge branch 'master' into responsive-visibility-table
Mark Otto [Wed, 4 Dec 2013 06:58:25 +0000 (22:58 -0800)] 
Merge branch 'master' into responsive-visibility-table

Conflicts:
dist/css/bootstrap.min.css

11 years agoMerge pull request #11697 from twbs/btn-xs-10979
Mark Otto [Wed, 4 Dec 2013 06:55:11 +0000 (22:55 -0800)] 
Merge pull request #11697 from twbs/btn-xs-10979

fix .btn-group-xs portion of #10979