]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoSwitch to the minified JSZip.
XhmikosR [Wed, 12 Feb 2014 16:47:08 +0000 (18:47 +0200)] 
Switch to the minified JSZip.

11 years agoFixes #11659, #12698, and #12349: Always apply position and z-index form controls...
Mark Otto [Tue, 11 Feb 2014 22:20:01 +0000 (14:20 -0800)] 
Fixes #11659, #12698, and #12349: Always apply position and z-index form controls in input groups for proper borders

11 years agoMerge pull request #12696 from twbs/rm-browserstack
Chris Rebert [Tue, 11 Feb 2014 18:38:39 +0000 (10:38 -0800)] 
Merge pull request #12696 from twbs/rm-browserstack

rm BrowserStack testing from build

11 years agorm BrowserStack testing from build 12696/head
Chris Rebert [Mon, 10 Feb 2014 19:20:50 +0000 (11:20 -0800)] 
rm BrowserStack testing from build

11 years agoMerge pull request #12695 from martikaljuve/offcanvas-transition
Mark Otto [Tue, 11 Feb 2014 17:57:15 +0000 (09:57 -0800)] 
Merge pull request #12695 from martikaljuve/offcanvas-transition

Fixed transitions on offcanvas example by adding initial left and right properties

11 years agoMerge branch 'master' into pr/12412
Mark Otto [Tue, 11 Feb 2014 17:50:40 +0000 (09:50 -0800)] 
Merge branch 'master' into pr/12412

Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
test-infra/npm-shrinkwrap.canonical.json

11 years agoAdd initial right and left properties to offcanvas example for transitions. 12695/head
Marti Kaljuve [Tue, 11 Feb 2014 16:18:21 +0000 (18:18 +0200)] 
Add initial right and left properties to offcanvas example for transitions.

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 11 Feb 2014 08:05:34 +0000 (00:05 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoMerge pull request #12689 from ZDroid/fonts-x
Chris Rebert [Tue, 11 Feb 2014 07:04:21 +0000 (23:04 -0800)] 
Merge pull request #12689 from ZDroid/fonts-x

Remove execute permission on font files

11 years agoRemove execute permission on font files 12689/head
Zlatan Vasović [Tue, 11 Feb 2014 06:57:31 +0000 (07:57 +0100)] 
Remove execute permission on font files

11 years agoadd version to getting started page
Mark Otto [Tue, 11 Feb 2014 06:12:28 +0000 (22:12 -0800)] 
add version to getting started page

11 years agogrunt
Mark Otto [Tue, 11 Feb 2014 05:41:14 +0000 (21:41 -0800)] 
grunt

11 years agoUpdate Glyphicons
Mark Otto [Tue, 11 Feb 2014 05:28:05 +0000 (21:28 -0800)] 
Update Glyphicons

11 years agoMerge pull request #12673 from tlindig/tl_popover_arrow_size
Mark Otto [Tue, 11 Feb 2014 04:52:43 +0000 (20:52 -0800)] 
Merge pull request #12673 from tlindig/tl_popover_arrow_size

use @popover-arrow-width for offset the popover

11 years agohttp://www.youtube.com/watch?v=YQwYNca4iog
Mark Otto [Tue, 11 Feb 2014 04:52:20 +0000 (20:52 -0800)] 
http://www.youtube.com/watch?v=YQwYNca4iog

11 years agoFixes #12674
Mark Otto [Tue, 11 Feb 2014 04:49:17 +0000 (20:49 -0800)] 
Fixes #12674

* The problem with #12674 is that it reassigns the same variable, but the color values were purposely different.
* This uses Less's color functions to generate the proper darker colors.
* Why darker colors? Because those CSS carets render lighter than their solid border counterparts. Consider it a design hack.

11 years agoFixes #12685: Display current version under download button on homepage
Mark Otto [Tue, 11 Feb 2014 04:23:29 +0000 (20:23 -0800)] 
Fixes #12685: Display current version under download button on homepage

11 years agoMerge pull request #12665 from twbs/docs_teams
Mark Otto [Tue, 11 Feb 2014 03:19:52 +0000 (19:19 -0800)] 
Merge pull request #12665 from twbs/docs_teams

Update teams

11 years agoMerge pull request #12680 from twbs/googlechrome
Chris Rebert [Mon, 10 Feb 2014 20:40:51 +0000 (12:40 -0800)] 
Merge pull request #12680 from twbs/googlechrome

chrome => googlechrome in Sauce

11 years agochrome => googlechrome in Sauce; fixes #12647 12680/head
Chris Rebert [Mon, 10 Feb 2014 19:22:08 +0000 (11:22 -0800)] 
chrome => googlechrome in Sauce; fixes #12647

11 years agoUse different coding style for Gruntfile
Zlatan Vasović [Sat, 8 Feb 2014 20:59:17 +0000 (21:59 +0100)] 
Use different coding style for Gruntfile

Fixes #12657

11 years agofix indentation in Gruntfile
Chris Rebert [Mon, 10 Feb 2014 19:09:59 +0000 (11:09 -0800)] 
fix indentation in Gruntfile

11 years agotweak phrasing for hopefully greater clarity
Chris Rebert [Mon, 10 Feb 2014 18:12:28 +0000 (10:12 -0800)] 
tweak phrasing for hopefully greater clarity

11 years agoadd copyright header to shrinkwrap.js; fixes #12643
Chris Rebert [Mon, 10 Feb 2014 18:06:33 +0000 (10:06 -0800)] 
add copyright header to shrinkwrap.js; fixes #12643

11 years agouse @popover-arrow-width for offset the popover to account for the popover arrow 12673/head
Tobias Lindig [Mon, 10 Feb 2014 09:57:11 +0000 (10:57 +0100)] 
use @popover-arrow-width for offset the popover to account for the popover arrow

11 years agoMerge pull request #12671 from Quy/master
Julian Thilo [Sun, 9 Feb 2014 21:04:01 +0000 (22:04 +0100)] 
Merge pull request #12671 from Quy/master

Update docs prefixing

11 years agoUpdate docs prefixing 12671/head
Quy Ton [Sun, 9 Feb 2014 20:41:47 +0000 (12:41 -0800)] 
Update docs prefixing

11 years agoMerge pull request #12668 from Quy/master
Julian Thilo [Sun, 9 Feb 2014 18:50:54 +0000 (19:50 +0100)] 
Merge pull request #12668 from Quy/master

Reorder links

11 years agoReorder links 12668/head
Quy Ton [Sun, 9 Feb 2014 17:18:11 +0000 (09:18 -0800)] 
Reorder links

11 years agoFixes #12610: Better and more consistent prefixing of docs CSS with .bs-docs-
Mark Otto [Sun, 9 Feb 2014 07:24:16 +0000 (23:24 -0800)] 
Fixes #12610: Better and more consistent prefixing of docs CSS with .bs-docs-

11 years agoi'm an idiot 12665/head
Mark Otto [Sun, 9 Feb 2014 06:46:25 +0000 (22:46 -0800)] 
i'm an idiot

11 years agoUpdate teams to remove two Sass folks and add new Core member
Mark Otto [Sun, 9 Feb 2014 06:13:29 +0000 (22:13 -0800)] 
Update teams to remove two Sass folks and add new Core member

11 years agogrunt dist
Mark Otto [Sun, 9 Feb 2014 01:30:40 +0000 (17:30 -0800)] 
grunt dist

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 9 Feb 2014 01:29:25 +0000 (17:29 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #12625: Only remove first list group item's top and last list group item's...
Mark Otto [Sun, 9 Feb 2014 01:29:10 +0000 (17:29 -0800)] 
Fixes #12625: Only remove first list group item's top and last list group item's bottom borders when the list group is first or last

11 years agoMention limitation of form validation feedback icons with input groups
Mark Otto [Sun, 9 Feb 2014 01:19:45 +0000 (17:19 -0800)] 
Mention limitation of form validation feedback icons with input groups

11 years agoMerge pull request #12433 from tagliala/list-inline-first-element-fix
Mark Otto [Sun, 9 Feb 2014 00:59:59 +0000 (16:59 -0800)] 
Merge pull request #12433 from tagliala/list-inline-first-element-fix

Fix first element padding of list-inline

11 years agobrace position
Mark Otto [Sun, 9 Feb 2014 00:56:59 +0000 (16:56 -0800)] 
brace position

11 years agoMerge branch 'master' into fix-12154
Mark Otto [Sun, 9 Feb 2014 00:52:22 +0000 (16:52 -0800)] 
Merge branch 'master' into fix-12154

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

11 years agogrunt
Mark Otto [Sun, 9 Feb 2014 00:46:12 +0000 (16:46 -0800)] 
grunt

11 years agogrunt
Mark Otto [Sun, 9 Feb 2014 00:43:58 +0000 (16:43 -0800)] 
grunt

11 years agogrunt with new mixins
Mark Otto [Sun, 9 Feb 2014 00:31:42 +0000 (16:31 -0800)] 
grunt with new mixins

11 years agogrunt
Mark Otto [Sun, 9 Feb 2014 00:13:30 +0000 (16:13 -0800)] 
grunt

11 years agoMerge pull request #12552 from stoudenmire/carousel-icon-classname-fix
Mark Otto [Sun, 9 Feb 2014 00:03:25 +0000 (16:03 -0800)] 
Merge pull request #12552 from stoudenmire/carousel-icon-classname-fix

Fixes two typos in carousel.less

11 years agoMerge branch 'master' into pr/12462
Mark Otto [Sun, 9 Feb 2014 00:01:56 +0000 (16:01 -0800)] 
Merge branch 'master' into pr/12462

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

11 years agoMerge branch 'pr/12579'
Mark Otto [Sat, 8 Feb 2014 23:53:18 +0000 (15:53 -0800)] 
Merge branch 'pr/12579'

11 years agogrunt
Mark Otto [Sat, 8 Feb 2014 23:51:38 +0000 (15:51 -0800)] 
grunt

11 years agoMerge pull request #12655 from twbs/holder.js
XhmikosR [Sat, 8 Feb 2014 23:48:13 +0000 (01:48 +0200)] 
Merge pull request #12655 from twbs/holder.js

Update holder.js to v2.3.1.

11 years agoMerge pull request #12645 from ZDroid/docs-js-semicolons
Mark Otto [Sat, 8 Feb 2014 23:46:51 +0000 (15:46 -0800)] 
Merge pull request #12645 from ZDroid/docs-js-semicolons

Omit semicolons consistently in docs

11 years agogrunt
Mark Otto [Sat, 8 Feb 2014 23:44:13 +0000 (15:44 -0800)] 
grunt

11 years agoMerge branch 'master' into pr/12639
Mark Otto [Sat, 8 Feb 2014 23:37:35 +0000 (15:37 -0800)] 
Merge branch 'master' into pr/12639

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

11 years agoMerge pull request #12659 from ZDroid/blockquote-font-size
Mark Otto [Sat, 8 Feb 2014 23:24:43 +0000 (15:24 -0800)] 
Merge pull request #12659 from ZDroid/blockquote-font-size

Fix #12656: add @blockquote-font-size

11 years agoMerge pull request #12632 from ZDroid/exclude-jade
Chris Rebert [Sat, 8 Feb 2014 21:34:36 +0000 (13:34 -0800)] 
Merge pull request #12632 from ZDroid/exclude-jade

Exclude jade files from docs

11 years agoMove jade files to docs/jade/ 12632/head
Zlatan Vasović [Sat, 8 Feb 2014 19:34:26 +0000 (20:34 +0100)] 
Move jade files to docs/jade/

11 years agoFix #12656: add @blockquote-font-size 12659/head
Zlatan Vasović [Sat, 8 Feb 2014 21:11:49 +0000 (22:11 +0100)] 
Fix #12656: add @blockquote-font-size

11 years agoUpdate holder.js to v2.3.1. 12655/head
XhmikosR [Sat, 8 Feb 2014 06:20:17 +0000 (08:20 +0200)] 
Update holder.js to v2.3.1.

Fix #12653.

11 years agodisable BrowserStack tests due to flakiness
Chris Rebert [Sat, 8 Feb 2014 02:51:32 +0000 (18:51 -0800)] 
disable BrowserStack tests due to flakiness

Running "browserstack_runner" task
Using config: /home/travis/build/twbs/bootstrap/browserstack.json
Launching server on port: 8888
Downloading tunnel jar to `/home/travis/build/twbs/bootstrap/node_modules/browserstack-runner/lib/BrowserStackTunnel.jar`
Launching tunnel
Error: Invalid or corrupt jarfile /home/travis/build/twbs/bootstrap/node_modules/browserstack-runner/lib/BrowserStackTunnel.jar
[Runner alert] Tunnel launch timeout
Exiting
Non existent tunnel

11 years agoMerge pull request #12633 from twbs/panels_and_tables
Mark Otto [Sat, 8 Feb 2014 02:50:41 +0000 (18:50 -0800)] 
Merge pull request #12633 from twbs/panels_and_tables

Properly reset borders on table cells in panels

11 years agoMerge branch 'master' into panels_and_tables 12633/head
Mark Otto [Sat, 8 Feb 2014 02:36:27 +0000 (18:36 -0800)] 
Merge branch 'master' into panels_and_tables

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

11 years agoNuke shit I added in 4d7b2ddba92e47f923d22d9d7b23cb7b0a3e0bc2 that shouldn't come...
Mark Otto [Fri, 7 Feb 2014 23:44:50 +0000 (15:44 -0800)] 
Nuke shit I added in 4d7b2ddba92e47f923d22d9d7b23cb7b0a3e0bc2 that shouldn't come until v4

11 years agoFix wrong id
Julian Thilo [Fri, 7 Feb 2014 22:21:32 +0000 (23:21 +0100)] 
Fix wrong id

11 years agoMerge pull request #12648 from ZDroid/index.html-only
Chris Rebert [Fri, 7 Feb 2014 20:44:51 +0000 (12:44 -0800)] 
Merge pull request #12648 from ZDroid/index.html-only

Replace wildcard with file name

11 years agoReplace wildcard with file name 12648/head
Zlatan Vasović [Fri, 7 Feb 2014 19:48:12 +0000 (20:48 +0100)] 
Replace wildcard with file name

11 years agoOmit semicolons consistently in docs 12645/head
Zlatan Vasović [Fri, 7 Feb 2014 18:31:08 +0000 (19:31 +0100)] 
Omit semicolons consistently in docs

11 years agoMerge pull request #12636 from ZDroid/grunt-jshintrc
Chris Rebert [Fri, 7 Feb 2014 17:36:39 +0000 (09:36 -0800)] 
Merge pull request #12636 from ZDroid/grunt-jshintrc

Avoid setting `jshint node: true` in every Grunt JS file

11 years agoMerge pull request #12637 from ZDroid/text-truncate-typo
Chris Rebert [Fri, 7 Feb 2014 17:28:08 +0000 (09:28 -0800)] 
Merge pull request #12637 from ZDroid/text-truncate-typo

Fix .text-truncate() typo

11 years agoDrop -o-user-select 12639/head
Bas Bosman [Fri, 7 Feb 2014 13:14:32 +0000 (14:14 +0100)] 
Drop -o-user-select

11 years agoFix .text-truncate() typo 12637/head
Zlatan Vasović [Fri, 7 Feb 2014 12:40:32 +0000 (13:40 +0100)] 
Fix .text-truncate() typo

11 years agoAvoid setting `jshint node: true` in every Grunt JS file 12636/head
Zlatan Vasović [Fri, 7 Feb 2014 12:34:17 +0000 (13:34 +0100)] 
Avoid setting `jshint node: true` in every Grunt JS file

11 years agoFixes #12486: Restore full width inputs for input groups in inline forms and navbars
Mark Otto [Fri, 7 Feb 2014 10:58:10 +0000 (02:58 -0800)] 
Fixes #12486: Restore full width inputs for input groups in inline forms and navbars

11 years agoFollow up to 1bdd59b18c2d1b2409d0422a60e8c007053202df, to better position the sidebar...
Mark Otto [Fri, 7 Feb 2014 10:44:04 +0000 (02:44 -0800)] 
Follow up to 1bdd59b18c2d1b2409d0422a60e8c007053202df, to better position the sidebar so the potential scrollbar doesn't get hidden by the navbar

11 years agoFixes #12447: Properly reset borders on table cells in panels
Mark Otto [Fri, 7 Feb 2014 10:38:01 +0000 (02:38 -0800)] 
Fixes #12447: Properly reset borders on table cells in panels

11 years agogrunt for days
Mark Otto [Fri, 7 Feb 2014 10:24:37 +0000 (02:24 -0800)] 
grunt for days

11 years agoMerge pull request #12629 from twbs/search_inputs_ios
Mark Otto [Fri, 7 Feb 2014 10:13:39 +0000 (02:13 -0800)] 
Merge pull request #12629 from twbs/search_inputs_ios

Override iOS search input's extra round corners

11 years agoOverride iOS search input's extra round corners 12629/head
Mark Otto [Fri, 7 Feb 2014 10:08:32 +0000 (02:08 -0800)] 
Override iOS search input's extra round corners

11 years agoFixes #12477: Clarify IE support in docs
Mark Otto [Fri, 7 Feb 2014 09:49:12 +0000 (01:49 -0800)] 
Fixes #12477: Clarify IE support in docs

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Fri, 7 Feb 2014 09:41:46 +0000 (01:41 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #12590: Add Korean translation link
Mark Otto [Fri, 7 Feb 2014 09:41:04 +0000 (01:41 -0800)] 
Fixes #12590: Add Korean translation link

11 years agoMerge pull request #12319 from twbs/address-12007
Mark Otto [Fri, 7 Feb 2014 09:39:00 +0000 (01:39 -0800)] 
Merge pull request #12319 from twbs/address-12007

Clarify target of dropdown events

11 years agoclarify comment
Mark Otto [Fri, 7 Feb 2014 09:33:27 +0000 (01:33 -0800)] 
clarify comment

11 years agoconsistency
Mark Otto [Fri, 7 Feb 2014 09:31:42 +0000 (01:31 -0800)] 
consistency

11 years agoFixes #12526: Add scrollbars when necessary to the Dashboard example's sidebar
Mark Otto [Fri, 7 Feb 2014 09:27:07 +0000 (01:27 -0800)] 
Fixes #12526: Add scrollbars when necessary to the Dashboard example's sidebar

11 years agoFixes #12555: Rearrange variables to place grids and containers closer
Mark Otto [Fri, 7 Feb 2014 09:21:58 +0000 (01:21 -0800)] 
Fixes #12555: Rearrange variables to place grids and containers closer

11 years agoFixes #12614: Add progress bar example with visible label
Mark Otto [Fri, 7 Feb 2014 09:16:34 +0000 (01:16 -0800)] 
Fixes #12614: Add progress bar example with visible label

11 years agoFixes #12611: Mention limitation of one plugin's data attributes per element
Mark Otto [Fri, 7 Feb 2014 09:10:21 +0000 (01:10 -0800)] 
Fixes #12611: Mention limitation of one plugin's data attributes per element

11 years agoMerge pull request #12497 from twbs/container-fluid-is-now-a-thing
Mark Otto [Fri, 7 Feb 2014 08:48:25 +0000 (00:48 -0800)] 
Merge pull request #12497 from twbs/container-fluid-is-now-a-thing

rm DIY full-width callout now that there's .container-fluid

11 years agoproperty order because @zdroid <3
Mark Otto [Fri, 7 Feb 2014 03:34:46 +0000 (19:34 -0800)] 
property order because @zdroid <3

11 years agoMerge pull request #12620 from twbs/thumbnail-extend
Mark Otto [Fri, 7 Feb 2014 03:32:31 +0000 (19:32 -0800)] 
Merge pull request #12620 from twbs/thumbnail-extend

use :extend in thumbnail Less

11 years agoMerge pull request #12502 from ZDroid/moz
Mark Otto [Fri, 7 Feb 2014 03:31:29 +0000 (19:31 -0800)] 
Merge pull request #12502 from ZDroid/moz

Remove redundant :-moz-placeholder styles

11 years agoMerge branch 'master' into thumbnail-extend 12620/head
Mark Otto [Fri, 7 Feb 2014 02:52:03 +0000 (18:52 -0800)] 
Merge branch 'master' into thumbnail-extend

Conflicts:
dist/css/bootstrap.css

11 years agoMerge pull request #12621 from twbs/carousel-img-responsive-extend
Mark Otto [Fri, 7 Feb 2014 02:49:21 +0000 (18:49 -0800)] 
Merge pull request #12621 from twbs/carousel-img-responsive-extend

use :extend(.img-responsive) in Carousel's Less

11 years agouse :extend(.img-responsive) in Carousel's Less 12621/head
Chris Rebert [Thu, 6 Feb 2014 23:52:26 +0000 (15:52 -0800)] 
use :extend(.img-responsive) in Carousel's Less

11 years agouse :extend in thumbnail Less
Chris Rebert [Thu, 6 Feb 2014 23:39:15 +0000 (15:39 -0800)] 
use :extend in thumbnail Less

11 years agoMerge pull request #12613 from twbs/sized-btn-group-extend
Chris Rebert [Thu, 6 Feb 2014 23:12:14 +0000 (15:12 -0800)] 
Merge pull request #12613 from twbs/sized-btn-group-extend

use Less' extend feature in btn-group-lg etc.

11 years agoMerge pull request #12616 from twbs/jszip
XhmikosR [Thu, 6 Feb 2014 21:35:15 +0000 (23:35 +0200)] 
Merge pull request #12616 from twbs/jszip

Update jzip to v2.1.0.

11 years agobs-raw-files-generator.js: use the global directive to define the `btoa` variable.
XhmikosR [Thu, 6 Feb 2014 21:34:02 +0000 (23:34 +0200)] 
bs-raw-files-generator.js: use the global directive to define the `btoa` variable.

11 years agoUpdate jzip to v2.1.0. 12616/head
XhmikosR [Thu, 6 Feb 2014 21:10:37 +0000 (23:10 +0200)] 
Update jzip to v2.1.0.

11 years agoMerge pull request #12605 from ZDroid/license-object
XhmikosR [Thu, 6 Feb 2014 19:04:36 +0000 (21:04 +0200)] 
Merge pull request #12605 from ZDroid/license-object

Use license object instead of licenses array

11 years agouse Less' extend feature in btn-group-lg etc. 12613/head
Chris Rebert [Thu, 6 Feb 2014 18:51:49 +0000 (10:51 -0800)] 
use Less' extend feature in btn-group-lg etc.

11 years agoMerge pull request #12612 from ZDroid/grunt-path
Chris Rebert [Thu, 6 Feb 2014 18:42:01 +0000 (10:42 -0800)] 
Merge pull request #12612 from ZDroid/grunt-path

Update grunt paths