diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html index 2c7eb69fc2..cd98145139 100644 --- a/docs/_includes/customizer-variables.html +++ b/docs/_includes/customizer-variables.html @@ -3,47 +3,50 @@

Colors

Gray and brand colors for use across Bootstrap.

-
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
@@ -51,27 +54,28 @@

Scaffolding

Settings for some of the most global styles.

-
+

Background color for <body>.

-
+

Global text color on <body>.

-
+

Global textual link color.

-
+
+

Link hover color set via darken() function.

-
+

Link hover decoration.

@@ -80,83 +84,89 @@

Typography

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

-
+
-
+
-
+

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

-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+

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

-
+

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

-
+
+

By default, this inherits from the <body>.

-
+
-
+
-
+
+
@@ -164,17 +174,17 @@

Iconography

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

-
+

Load fonts from this directory.

-
+

File name for all font files.

-
+

Element ID within SVG icon file.

@@ -183,74 +193,79 @@

Components

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

-
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+

Global 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.

-
+

Carets increase slightly in size for larger components.

@@ -259,36 +274,38 @@

Tables

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

-
+

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

-
+

Padding for cells in .table-condensed.

-
+

Default background color used for all tables.

-
+
+

Background color used for .table-striped.

-
+

Background color used for .table-hover.

-
+
-
+
+

Border color for table and cell borders.

@@ -297,163 +314,174 @@

Buttons

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

-
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+

Forms

-
+

<input> background color

-
+

<input disabled> background color

-
+

Text color for <input>s

-
+
+

<input> border color

-
+

Default .form-control border radius

-
+

Large .form-control border radius

-
+
+

Small .form-control border radius

-
+

Border color for inputs on focus

-
+

Placeholder text color

-
+
+

Default .form-control height

-
+

Large .form-control height

-
+

Small .form-control height

-
+
+
-
+
-
+

Background color for textual input addons

-
+
+

Border color for textual input addons

@@ -462,62 +490,65 @@

Dropdown menu container and contents.

-
+

Background for the dropdown menu.

-
+

Dropdown menu border-color.

-
+

Dropdown menu border-color for IE8.

-
+
+

Divider color for between dropdown items.

-
+

Dropdown link text color.

-
+

Hover color for dropdown links.

-
+
+

Hover background for dropdown links.

-
+

Active dropdown menu item text color.

-
+

Active dropdown menu item background color.

-
+
+

Disabled dropdown menu item background color.

-
+

Text color for headers within dropdown menus.

-
+

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

@@ -526,72 +557,76 @@

Media queries breakpoints

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

-
+

Deprecated @screen-xs as of v3.0.1

-
+

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

-
+

Deprecated @screen-phone as of v3.0.1

-
+
+

Deprecated @screen-sm as of v3.0.1

-
+
-
+

Deprecated @screen-tablet as of v3.0.1

-
+
+

Deprecated @screen-md as of v3.0.1

-
+
-
+

Deprecated @screen-desktop as of v3.0.1

-
+
+

Deprecated @screen-lg as of v3.0.1

-
+
-
+

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

-
+
+
-
+
-
+
@@ -599,22 +634,23 @@

Grid system

Define your custom responsive grid.

-
+

Number of columns in the grid.

-
+

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

-
+

Point at which the navbar becomes uncollapsed.

-
+
+

Point at which the navbar begins collapsing.

@@ -623,29 +659,30 @@

Container sizes

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

-
+
-
+

For @screen-sm-min and up.

-
+
-
+
+

For @screen-md-min and up.

-
+
-
+

For @screen-lg-min and up.

@@ -653,155 +690,167 @@
-
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
@@ -809,170 +858,179 @@

Shared nav styles

-
+
-
+
-
+
-
+
+

Tabs

-
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+

Pills

-
+
-
+
-
+

Pagination

-
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+

Pager

-
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+

Jumbotron

-
+
-
+
-
+
-
+
+
-
+
@@ -980,82 +1038,86 @@

Form states and alerts

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

-
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+

Tooltips

-
+

Tooltip max width

-
+

Tooltip text color

-
+

Tooltip background color

-
+
+
-
+

Tooltip arrow width

-
+

Tooltip arrow color

@@ -1063,52 +1125,55 @@

Popovers

-
+

Popover body background color

-
+

Popover maximum width

-
+

Popover border color

-
+
+

Popover fallback border color

-
+

Popover title background color

-
+

Popover arrow width

-
+
+

Popover arrow color

-
+

Popover outer arrow width

-
+

Popover outer arrow color

-
+
+

Popover outer arrow fallback color

@@ -1116,42 +1181,44 @@

Labels

-
+

Default label background color

-
+

Primary label background color

-
+

Success label background color

-
+
+

Info label background color

-
+

Warning label background color

-
+

Danger label background color

-
+
+

Default label text color

-
+

Default text color of a linked label

@@ -1159,65 +1226,69 @@

Modals

-
+

Padding applied to the modal body

-
+

Padding applied to the modal title

-
+

Modal title line-height

-
+
+

Background color of modal content area

-
+

Modal content border color

-
+

Modal content border color for IE8

-
+
+

Modal backdrop background color

-
+

Modal backdrop opacity

-
+

Modal header border color

-
+
+

Modal footer border color

-
+
-
+
-
+
+
@@ -1225,105 +1296,111 @@

Alerts

Define alert colors, border radius, and padding.

-
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+

Progress bars

-
+

Background color of the whole progress component

-
+

Progress bar text color

-
+

Variable for setting rounded corners on progress bar.

-
+
+

Default progress bar color

-
+

Success progress bar color

-
+

Warning progress bar color

-
+
+

Danger progress bar color

-
+

Info progress bar color

@@ -1331,206 +1408,219 @@

List group

-
+

Background color on .list-group-item

-
+

.list-group-item border color

-
+

List group border radius

-
+
+

Background color of single list items on hover

-
+

Text color of active list items

-
+

Background color of active list items

-
+
+

Border color of active list elements

-
+

Text color for content within active list items

-
+

Text color of disabled list items

-
+
+

Background color of disabled list items

-
+

Text color for content within disabled list items

-
+
-
+
+
-
+

Panels

-
+
-
+
-
+
-
+
+
-
+
-
+

Border color for elements within panels

-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+

Thumbnails

-
+

Padding around the thumbnail image

-
+

Thumbnail background color

-
+

Thumbnail border color

-
+
+

Thumbnail border radius

-
+

Custom text color for thumbnail captions

-
+

Padding around the thumbnail caption

@@ -1538,79 +1628,82 @@

Wells

-
+
-
+

Badges

-
+
-
+

Linked badge text color on hover

-
+
-
+
+

Badge text color in active nav link

-
+

Badge background color in active nav link

-
+
-
+
+
-
+
-
+
-
+
-
+

Breadcrumb background color

-
+
+

Breadcrumb text color

-
+

Text color of current page in the breadcrumb

-
+

Textual separator for between breadcrumb elements

@@ -1618,137 +1711,144 @@
-
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+

Close

-
+
-
+
-
+

Code

-
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
-
+

Type

-
+

Horizontal offset for forms and lists.

-
+

Text muted color

-
+

Abbreviations and acronyms border color

-
+
+

Headings small color

-
+

Blockquote small color

-
+

Blockquote font size

-
+
+

Blockquote border color

-
+

Page header border color

-
+

Width of horizontal description list titles

-
+
+

Horizontal line color.

diff --git a/docs/_jade/customizer-variables.jade b/docs/_jade/customizer-variables.jade index 3c74573be0..bd0df1d139 100644 --- a/docs/_jade/customizer-variables.jade +++ b/docs/_jade/customizer-variables.jade @@ -8,8 +8,10 @@ each section in sections if subsection.heading h3(id=subsection.id)= subsection.heading div.row - each variable in subsection.variables - div.bs-customizer-input + each variable, index in subsection.variables + if index > 0 && index % 3 === 0 + div.clearfix + div.col-xs-4 label(for="input-" + variable.name)= variable.name input.form-control( id="input-" + variable.name diff --git a/docs/assets/css/src/docs.css b/docs/assets/css/src/docs.css index 428a543210..431ee905fd 100644 --- a/docs/assets/css/src/docs.css +++ b/docs/assets/css/src/docs.css @@ -1342,13 +1342,6 @@ h1[id] { font-weight: normal; } -.bs-customizer-input { - float: left; - width: 33.333333%; - padding-right: 15px; - padding-left: 15px; -} - /* Downloads */ .bs-customize-download .btn-outline { padding: 20px; diff --git a/grunt/sauce_browsers.yml b/grunt/sauce_browsers.yml index 8014bfcb80..c895bab299 100644 --- a/grunt/sauce_browsers.yml +++ b/grunt/sauce_browsers.yml @@ -57,7 +57,7 @@ { browserName: "iphone", platform: "OS X 10.9", - version: "7.1" + version: "8.0" }, # iOS Chrome not currently supported by Sauce Labs diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index 351dd61cb5..4fbd91dc37 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -803,16 +803,16 @@ $(function () { var $tooltip = $('') .appendTo('#qunit-fixture') - .bootstrapTooltip({ delay: 15 }) + .bootstrapTooltip({ delay: 150 }) setTimeout(function () { - ok(!$('.tooltip').is('.fade.in'), '10ms: tooltip is not faded in') - }, 10) + ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip is not faded in') + }, 100) setTimeout(function () { - ok($('.tooltip').is('.fade.in'), '20ms: tooltip is faded in') + ok($('.tooltip').is('.fade.in'), '200ms: tooltip is faded in') start() - }, 20) + }, 200) $tooltip.trigger('mouseenter') }) @@ -822,17 +822,17 @@ $(function () { var $tooltip = $('') .appendTo('#qunit-fixture') - .bootstrapTooltip({ delay: 15 }) + .bootstrapTooltip({ delay: 150 }) setTimeout(function () { - ok(!$('.tooltip').is('.fade.in'), '10ms: tooltip not faded in') + ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip not faded in') $tooltip.trigger('mouseout') - }, 10) + }, 100) setTimeout(function () { - ok(!$('.tooltip').is('.fade.in'), '20ms: tooltip not faded in') + ok(!$('.tooltip').is('.fade.in'), '200ms: tooltip not faded in') start() - }, 20) + }, 200) $tooltip.trigger('mouseenter') }) @@ -842,21 +842,21 @@ $(function () { var $tooltip = $('') .appendTo('#qunit-fixture') - .bootstrapTooltip({ delay: { show: 0, hide: 15 }}) + .bootstrapTooltip({ delay: { show: 0, hide: 150 }}) setTimeout(function () { ok($('.tooltip').is('.fade.in'), '1ms: tooltip faded in') $tooltip.trigger('mouseout') setTimeout(function () { - ok($('.tooltip').is('.fade.in'), '10ms: tooltip still faded in') + ok($('.tooltip').is('.fade.in'), '100ms: tooltip still faded in') $tooltip.trigger('mouseenter') - }, 10) + }, 100) setTimeout(function () { - ok($('.tooltip').is('.fade.in'), '20ms: tooltip still faded in') + ok($('.tooltip').is('.fade.in'), '200ms: tooltip still faded in') start() - }, 20) + }, 200) }, 0) $tooltip.trigger('mouseenter') @@ -867,17 +867,17 @@ $(function () { var $tooltip = $('') .appendTo('#qunit-fixture') - .bootstrapTooltip({ delay: 15 }) + .bootstrapTooltip({ delay: 150 }) setTimeout(function () { - ok(!$('.tooltip').is('.fade.in'), '10ms: tooltip not faded in') + ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip not faded in') $tooltip.trigger('mouseout') - }, 10) + }, 100) setTimeout(function () { - ok(!$('.tooltip').is('.fade.in'), '20ms: tooltip not faded in') + ok(!$('.tooltip').is('.fade.in'), '200ms: tooltip not faded in') start() - }, 20) + }, 200) $tooltip.trigger('mouseenter') }) @@ -887,27 +887,27 @@ $(function () { var $tooltip = $('') .appendTo('#qunit-fixture') - .bootstrapTooltip({ delay: { show: 15, hide: 0 }}) + .bootstrapTooltip({ delay: { show: 150, hide: 0 }}) setTimeout(function () { - ok(!$('.tooltip').is('.fade.in'), '10ms: tooltip not faded in') + ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip not faded in') $tooltip.trigger('mouseout') - }, 10) + }, 100) setTimeout(function () { - ok(!$('.tooltip').is('.fade.in'), '25ms: tooltip not faded in') + ok(!$('.tooltip').is('.fade.in'), '250ms: tooltip not faded in') start() - }, 25) + }, 250) $tooltip.trigger('mouseenter') }) - test('should wait 20ms before hiding the tooltip', function () { + test('should wait 200ms before hiding the tooltip', function () { stop() var $tooltip = $('') .appendTo('#qunit-fixture') - .bootstrapTooltip({ delay: { show: 0, hide: 15 }}) + .bootstrapTooltip({ delay: { show: 0, hide: 150 }}) setTimeout(function () { ok($tooltip.data('bs.tooltip').$tip.is('.fade.in'), '1ms: tooltip faded in') @@ -915,13 +915,13 @@ $(function () { $tooltip.trigger('mouseout') setTimeout(function () { - ok($tooltip.data('bs.tooltip').$tip.is('.fade.in'), '10ms: tooltip still faded in') - }, 10) + ok($tooltip.data('bs.tooltip').$tip.is('.fade.in'), '100ms: tooltip still faded in') + }, 100) setTimeout(function () { - ok(!$tooltip.data('bs.tooltip').$tip.is('.in'), '20ms: tooltip removed') + ok(!$tooltip.data('bs.tooltip').$tip.is('.in'), '200ms: tooltip removed') start() - }, 20) + }, 200) }, 0)