From 22baa8153b58e80df248b38ddf2aeae4f3f9cc2b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 29 Oct 2014 09:42:00 -0700 Subject: [PATCH] fixes #14911: bump dependencies to fix customizer text from being cut shor --- docs/_includes/customizer-variables.html | 308 +++++++++++------------ package.json | 2 +- test-infra/npm-shrinkwrap.json | 192 +++++++++++--- 3 files changed, 308 insertions(+), 194 deletions(-) diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html index 04b7ff1e10..e45884d5ab 100644 --- a/docs/_includes/customizer-variables.html +++ b/docs/_includes/customizer-variables.html @@ -1,7 +1,7 @@

Colors

-

Gray and brand colors for use across Bootstrap

+

Gray and brand colors for use across Bootstrap.

@@ -52,37 +52,37 @@

Scaffolding

-

Settings for some of the most global styles

+

Settings for some of the most global styles.

-

Background color for <body>

+

Background color for <body>.

-

Global text color on <body>

+

Global text color on <body>.

-

Global textual link color

+

Global textual link color.

-

Link hover color set via darken() function

+

Link hover color set via darken() function.

-

Link hover decoration

+

Link hover decoration.

Typography

-

Font, line-height, and color for body text, headings, and more

+

Font, line-height, and color for body text, headings, and more.

@@ -95,7 +95,7 @@
-

Default monospace fonts for <code>, <kbd>, and <pre>

+

Default monospace fonts for <code>, <kbd>, and <pre>.

@@ -144,18 +144,18 @@
-

Unit-less line-height for use in components like buttons

+

Unit-less line-height for use in components like buttons.

-

Computed "line-height" (font-size * line-height) for use with margin, padding, etc

+

Computed "line-height" (font-size * line-height) for use with margin, padding, etc.

-

By default, this inherits from the <body>

+

By default, this inherits from the <body>.

@@ -172,26 +172,26 @@

Iconography

-

Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower

+

Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.

-

Load fonts from this directory

+

Load fonts from this directory.

-

File name for all font files

+

File name for all font files.

-

Element ID within SVG icon file

+

Element ID within SVG icon file.

Components

-

Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start)

+

Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).

@@ -252,53 +252,53 @@
-

Global color for active items (e.g., navs or dropdowns)

+

Global color for active items (e.g., navs or dropdowns).

-

Global background color for active items (e.g., navs or dropdowns)

+

Global background color for active items (e.g., navs or dropdowns).

-

Width of the border for generating carets that indicator dropdowns

+

Width of the border for generating carets that indicator dropdowns.

-

Carets increase slightly in size for larger components

+

Carets increase slightly in size for larger components.

Tables

-

Customizes the .table component with basic values, each used across all table variations

+

Customizes the .table component with basic values, each used across all table variations.

-

Padding for <th>s and <td>s

+

Padding for <th>s and <td>s.

-

Padding for cells in .table-condensed

+

Padding for cells in .table-condensed.

-

Default background color used for all tables

+

Default background color used for all tables.

-

Background color used for .table-striped

+

Background color used for .table-striped.

-

Background color used for .table-hover

+

Background color used for .table-hover.

@@ -308,11 +308,11 @@
-

Border color for table and cell borders

+

Border color for table and cell borders.

Buttons

-

For each of Bootstrap's buttons, define text, background and border color

+

For each of Bootstrap's buttons, define text, background and border color.

@@ -406,65 +406,65 @@
-

<input> background colo

+

<input> background color

-

<input disabled> background colo

+

<input disabled> background color

-

Text color for <input>

+

Text color for <input>s

-

<input> border colo

+

<input> border color

-

Default .form-control border radiu

+

Default .form-control border radius

-

Large .form-control border radiu

+

Large .form-control border radius

-

Small .form-control border radiu

+

Small .form-control border radius

-

Border color for inputs on focu

+

Border color for inputs on focus

-

Placeholder text colo

+

Placeholder text color

-

Default .form-control heigh

+

Default .form-control height

-

Large .form-control heigh

+

Large .form-control height

-

Small .form-control heigh

+

Small .form-control height

@@ -478,110 +478,110 @@
-

Background color for textual input addon

+

Background color for textual input addons

-

Border color for textual input addon

+

Border color for textual input addons

-

Disabled cursor for form controls and buttons

+

Disabled cursor for form controls and buttons.

-

Dropdown menu container and contents

+

Dropdown menu container and contents.

-

Background for the dropdown menu

+

Background for the dropdown menu.

-

Dropdown menu border-color

+

Dropdown menu border-color.

-

Dropdown menu border-color for IE8

+

Dropdown menu border-color for IE8.

-

Divider color for between dropdown items

+

Divider color for between dropdown items.

-

Dropdown link text color

+

Dropdown link text color.

-

Hover color for dropdown links

+

Hover color for dropdown links.

-

Hover background for dropdown links

+

Hover background for dropdown links.

-

Active dropdown menu item text color

+

Active dropdown menu item text color.

-

Active dropdown menu item background color

+

Active dropdown menu item background color.

-

Disabled dropdown menu item background color

+

Disabled dropdown menu item background color.

-

Text color for headers within dropdown menus

+

Text color for headers within dropdown menus.

-

Deprecated @dropdown-caret-color as of v3.1.

+

Deprecated @dropdown-caret-color as of v3.1.0

Media queries breakpoints

-

Define the breakpoints at which your layout will change, adapting to different screen sizes

+

Define the breakpoints at which your layout will change, adapting to different screen sizes.

-

Deprecated @screen-xs as of v3.0.

+

Deprecated @screen-xs as of v3.0.1

-

Deprecated @screen-xs-min as of v3.2.

+

Deprecated @screen-xs-min as of v3.2.0

-

Deprecated @screen-phone as of v3.0.

+

Deprecated @screen-phone as of v3.0.1

-

Deprecated @screen-sm as of v3.0.

+

Deprecated @screen-sm as of v3.0.1

@@ -590,13 +590,13 @@
-

Deprecated @screen-tablet as of v3.0.

+

Deprecated @screen-tablet as of v3.0.1

-

Deprecated @screen-md as of v3.0.

+

Deprecated @screen-md as of v3.0.1

@@ -605,13 +605,13 @@
-

Deprecated @screen-desktop as of v3.0.

+

Deprecated @screen-desktop as of v3.0.1

-

Deprecated @screen-lg as of v3.0.

+

Deprecated @screen-lg as of v3.0.1

@@ -620,7 +620,7 @@
-

Deprecated @screen-lg-desktop as of v3.0.

+

Deprecated @screen-lg-desktop as of v3.0.1

@@ -637,32 +637,32 @@

Grid system

-

Define your custom responsive grid

+

Define your custom responsive grid.

-

Number of columns in the grid

+

Number of columns in the grid.

-

Padding between columns. Gets divided in half for the left and right

+

Padding between columns. Gets divided in half for the left and right.

-

Point at which the navbar becomes uncollapsed

+

Point at which the navbar becomes uncollapsed.

-

Point at which the navbar begins collapsing

+

Point at which the navbar begins collapsing.

Container sizes

-

Define the maximum width of .container for different screen sizes

+

Define the maximum width of .container for different screen sizes.

@@ -671,7 +671,7 @@
-

For @screen-sm-min and up

+

For @screen-sm-min and up.

@@ -681,7 +681,7 @@
-

For @screen-md-min and up

+

For @screen-md-min and up.

@@ -690,7 +690,7 @@
-

For @screen-lg-min and up

+

For @screen-lg-min and up.

@@ -1041,7 +1041,7 @@

Form states and alerts

-

Define colors for form feedback states and, by default, alerts

+

Define colors for form feedback states and, by default, alerts.

@@ -1100,17 +1100,17 @@
-

Tooltip max widt

+

Tooltip max width

-

Tooltip text colo

+

Tooltip text color

-

Tooltip background colo

+

Tooltip background color

@@ -1120,12 +1120,12 @@
-

Tooltip arrow widt

+

Tooltip arrow width

-

Tooltip arrow colo

+

Tooltip arrow color

Popovers

@@ -1133,55 +1133,55 @@
-

Popover body background colo

+

Popover body background color

-

Popover maximum widt

+

Popover maximum width

-

Popover border colo

+

Popover border color

-

Popover fallback border colo

+

Popover fallback border color

-

Popover title background colo

+

Popover title background color

-

Popover arrow widt

+

Popover arrow width

-

Popover arrow colo

+

Popover arrow color

-

Popover outer arrow widt

+

Popover outer arrow width

-

Popover outer arrow colo

+

Popover outer arrow color

-

Popover outer arrow fallback colo

+

Popover outer arrow fallback color

Labels

@@ -1189,44 +1189,44 @@
-

Default label background colo

+

Default label background color

-

Primary label background colo

+

Primary label background color

-

Success label background colo

+

Success label background color

-

Info label background colo

+

Info label background color

-

Warning label background colo

+

Warning label background color

-

Danger label background colo

+

Danger label background color

-

Default label text colo

+

Default label text color

-

Default text color of a linked labe

+

Default text color of a linked label

Modals

@@ -1234,55 +1234,55 @@
-

Padding applied to the modal bod

+

Padding applied to the modal body

-

Padding applied to the modal titl

+

Padding applied to the modal title

-

Modal title line-heigh

+

Modal title line-height

-

Background color of modal content are

+

Background color of modal content area

-

Modal content border colo

+

Modal content border color

-

Modal content border color *for IE8

+

Modal content border color for IE8

-

Modal backdrop background colo

+

Modal backdrop background color

-

Modal backdrop opacit

+

Modal backdrop opacity

-

Modal header border colo

+

Modal header border color

-

Modal footer border colo

+

Modal footer border color

@@ -1299,7 +1299,7 @@

Alerts

-

Define alert colors, border radius, and padding

+

Define alert colors, border radius, and padding.

@@ -1371,44 +1371,44 @@
-

Background color of the whole progress componen

+

Background color of the whole progress component

-

Progress bar text colo

+

Progress bar text color

-

Variable for setting rounded corners on progress bar

+

Variable for setting rounded corners on progress bar.

-

Default progress bar colo

+

Default progress bar color

-

Success progress bar colo

+

Success progress bar color

-

Warning progress bar colo

+

Warning progress bar color

-

Danger progress bar colo

+

Danger progress bar color

-

Info progress bar colo

+

Info progress bar color

List group

@@ -1416,60 +1416,60 @@
-

Background color on `.list-group-item

+

Background color on .list-group-item

-

.list-group-item border colo

+

.list-group-item border color

-

List group border radiu

+

List group border radius

-

Background color of single list items on hove

+

Background color of single list items on hover

-

Text color of active list item

+

Text color of active list items

-

Background color of active list item

+

Background color of active list items

-

Border color of active list element

+

Border color of active list elements

-

Text color for content within active list item

+

Text color for content within active list items

-

Text color of disabled list item

+

Text color of disabled list items

-

Background color of disabled list item

+

Background color of disabled list items

-

Text color for content within disabled list item

+

Text color for content within disabled list items

@@ -1511,7 +1511,7 @@
-

Border color for elements within panel

+

Border color for elements within panels

@@ -1602,33 +1602,33 @@
-

Padding around the thumbnail imag

+

Padding around the thumbnail image

-

Thumbnail background colo

+

Thumbnail background color

-

Thumbnail border colo

+

Thumbnail border color

-

Thumbnail border radiu

+

Thumbnail border radius

-

Custom text color for thumbnail caption

+

Custom text color for thumbnail captions

-

Padding around the thumbnail captio

+

Padding around the thumbnail caption

Wells

@@ -1651,7 +1651,7 @@
-

Linked badge text color on hove

+

Linked badge text color on hover

@@ -1661,12 +1661,12 @@
-

Badge text color in active nav lin

+

Badge text color in active nav link

-

Badge background color in active nav lin

+

Badge background color in active nav link

@@ -1695,23 +1695,23 @@
-

Breadcrumb background colo

+

Breadcrumb background color

-

Breadcrumb text colo

+

Breadcrumb text color

-

Text color of current page in the breadcrum

+

Text color of current page in the breadcrumb

-

Textual separator for between breadcrumb element

+

Textual separator for between breadcrumb elements

@@ -1808,55 +1808,55 @@
-

Horizontal offset for forms and lists

+

Horizontal offset for forms and lists.

-

Text muted colo

+

Text muted color

-

Abbreviations and acronyms border colo

+

Abbreviations and acronyms border color

-

Headings small colo

+

Headings small color

-

Blockquote small colo

+

Blockquote small color

-

Blockquote font siz

+

Blockquote font size

-

Blockquote border colo

+

Blockquote border color

-

Page header border colo

+

Page header border color

-

Width of horizontal description list title

+

Width of horizontal description list titles

-

Horizontal line color

+

Horizontal line color.

\ No newline at end of file diff --git a/package.json b/package.json index f52ca15f80..5627ba6d22 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "grunt-sed": "~0.1.1", "load-grunt-tasks": "~1.0.0", "npm-shrinkwrap": "~4.0.0", - "remarkable": "^1.2.0", + "remarkable": "^1.2.2", "time-grunt": "~1.0.0" }, "engines": { diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json index 01f67b25aa..dfdd4fa0ea 100644 --- a/test-infra/npm-shrinkwrap.json +++ b/test-infra/npm-shrinkwrap.json @@ -129,10 +129,6 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz", "dependencies": { - "colors": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz" - }, "lodash": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz" @@ -145,21 +141,7 @@ }, "grunt-legacy-util": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz", - "dependencies": { - "async": { - "version": "0.1.22", - "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz" - }, - "lodash": { - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz" - }, - "underscore.string": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz" - } - } + "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz" }, "hooker": { "version": "0.2.3", @@ -244,8 +226,8 @@ "resolved": "https://registry.npmjs.org/autoprefixer-core/-/autoprefixer-core-3.1.2.tgz", "dependencies": { "caniuse-db": { - "version": "1.0.30000011", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000011.tgz" + "version": "1.0.30000014", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000014.tgz" }, "postcss": { "version": "2.2.5", @@ -1172,8 +1154,8 @@ "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz" }, "jshint": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.5.6.tgz", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.5.7.tgz", "dependencies": { "cli": { "version": "0.6.5", @@ -1604,8 +1586,8 @@ "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz" }, "phantomjs": { - "version": "1.9.11", - "resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.11.tgz", + "version": "1.9.12", + "resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.12.tgz", "dependencies": { "adm-zip": { "version": "0.4.4", @@ -1626,8 +1608,8 @@ } }, "ncp": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz" }, "npmconf": { "version": "2.0.9", @@ -1702,8 +1684,8 @@ "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.3.tgz", "dependencies": { "readable-stream": { - "version": "1.0.32", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.32.tgz", + "version": "1.0.33", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", @@ -2151,10 +2133,6 @@ } } }, - "vow": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/vow/-/vow-0.4.4.tgz" - }, "vow-fs": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.2.tgz", @@ -2173,10 +2151,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz" }, - "vow": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/vow/-/vow-0.4.4.tgz" - }, "vow-queue": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.3.1.tgz" @@ -3846,8 +3820,8 @@ } }, "remarkable": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/remarkable/-/remarkable-1.2.1.tgz", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/remarkable/-/remarkable-1.3.0.tgz", "dependencies": { "argparse": { "version": "0.1.15", @@ -3866,6 +3840,146 @@ "autolinker": { "version": "0.12.3", "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-0.12.3.tgz" + }, + "coveralls": { + "version": "2.11.2", + "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-2.11.2.tgz", + "dependencies": { + "js-yaml": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz", + "dependencies": { + "esprima": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz" + } + } + }, + "lcov-parse": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz" + }, + "log-driver": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz" + }, + "request": { + "version": "2.40.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz", + "dependencies": { + "aws-sign2": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz" + }, + "forever-agent": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz" + }, + "form-data": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz", + "dependencies": { + "async": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz" + }, + "combined-stream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz", + "dependencies": { + "delayed-stream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz" + } + } + }, + "mime": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" + } + } + }, + "hawk": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz", + "dependencies": { + "boom": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz" + }, + "cryptiles": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz" + }, + "hoek": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz" + }, + "sntp": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz" + } + } + }, + "http-signature": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz", + "dependencies": { + "asn1": { + "version": "0.1.11", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz" + }, + "assert-plus": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz" + }, + "ctype": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz" + } + } + }, + "json-stringify-safe": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz" + }, + "mime-types": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz" + }, + "node-uuid": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz" + }, + "oauth-sign": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz" + }, + "qs": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz" + }, + "stringstream": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz" + }, + "tough-cookie": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz", + "dependencies": { + "punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz" + } + } + }, + "tunnel-agent": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz" + } + } + } + } } } },