]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
8 years agoNormalize examples and update where relevant. 20947/head
Bardi Harborow [Wed, 19 Oct 2016 14:45:00 +0000 (01:45 +1100)] 
Normalize examples and update where relevant.

8 years agogrunt
Mark Otto [Wed, 19 Oct 2016 08:18:28 +0000 (01:18 -0700)] 
grunt

8 years agoMerge pull request #19890 from twbs/v4-navbars
Mark Otto [Wed, 19 Oct 2016 07:59:51 +0000 (00:59 -0700)] 
Merge pull request #19890 from twbs/v4-navbars

v4: Navbar improvements

8 years agoalt attributes 19890/head
Mark Otto [Wed, 19 Oct 2016 07:30:59 +0000 (00:30 -0700)] 
alt attributes

8 years agoMore navbar example content with forms
Mark Otto [Wed, 19 Oct 2016 07:18:47 +0000 (00:18 -0700)] 
More navbar example content with forms

8 years agoMerge pull request #20933 from twbs/alert-padding-vars
Mark Otto [Wed, 19 Oct 2016 06:42:16 +0000 (23:42 -0700)] 
Merge pull request #20933 from twbs/alert-padding-vars

Switch to separate vars for alert vertical/horizontal padding

8 years agoTweak that navbar brand image alignment with new vertical align utils
Mark Otto [Wed, 19 Oct 2016 03:04:55 +0000 (20:04 -0700)] 
Tweak that navbar brand image alignment with new vertical align utils

8 years agoMerge branch 'v4-dev' into v4-navbars
Mark Otto [Wed, 19 Oct 2016 03:03:49 +0000 (20:03 -0700)] 
Merge branch 'v4-dev' into v4-navbars

8 years agogrunt
Mark Otto [Wed, 19 Oct 2016 03:03:42 +0000 (20:03 -0700)] 
grunt

8 years agoMerge pull request #20932 from twbs/align-utils
Mark Otto [Wed, 19 Oct 2016 02:59:44 +0000 (19:59 -0700)] 
Merge pull request #20932 from twbs/align-utils

Add vertical-align utilities

8 years agofix markup validation 20932/head
Mark Otto [Wed, 19 Oct 2016 02:31:47 +0000 (19:31 -0700)] 
fix markup validation

8 years agoSwitch to separate vars for alert vertical/horizontal padding 20933/head
Mark Otto [Wed, 19 Oct 2016 02:18:06 +0000 (19:18 -0700)] 
Switch to separate vars for alert vertical/horizontal padding

8 years agoAdd vertical-align utilities
Mark Otto [Wed, 19 Oct 2016 02:15:58 +0000 (19:15 -0700)] 
Add vertical-align utilities

- Adds six new utils for vertical-align property
- Documents the additional classes in the utils docs

8 years agoadd examples of images in the navbar-brand section
Mark Otto [Wed, 19 Oct 2016 01:47:49 +0000 (18:47 -0700)] 
add examples of images in the navbar-brand section

8 years agoremove .navbar-brand > img selector that sets display block (will be replaced with...
Mark Otto [Wed, 19 Oct 2016 01:47:36 +0000 (18:47 -0700)] 
remove .navbar-brand > img selector that sets display block (will be replaced with utils)

8 years agomore consistent navbar-brand line-height
Mark Otto [Wed, 19 Oct 2016 01:47:08 +0000 (18:47 -0700)] 
more consistent navbar-brand line-height

8 years agomore html linting
Mark Otto [Tue, 18 Oct 2016 06:45:25 +0000 (23:45 -0700)] 
more html linting

8 years agohtml linting
Mark Otto [Tue, 18 Oct 2016 06:37:02 +0000 (23:37 -0700)] 
html linting

8 years agolint
Mark Otto [Tue, 18 Oct 2016 05:17:02 +0000 (22:17 -0700)] 
lint

8 years agodocs copy
Mark Otto [Tue, 18 Oct 2016 05:16:28 +0000 (22:16 -0700)] 
docs copy

8 years agodocument new navbar classes and styles, update responsive variation, fix broken float...
Mark Otto [Tue, 18 Oct 2016 05:09:11 +0000 (22:09 -0700)] 
document new navbar classes and styles, update responsive variation, fix broken float classes

8 years agoadd navbar-brand and navbar-nav styles to the toggleable
Mark Otto [Tue, 18 Oct 2016 05:08:49 +0000 (22:08 -0700)] 
add navbar-brand and navbar-nav styles to the toggleable

8 years agoset the border color on the toggler
Mark Otto [Tue, 18 Oct 2016 04:05:22 +0000 (21:05 -0700)] 
set the border color on the toggler

8 years agoFix sass map navbar-toggleable
Mark Otto [Tue, 18 Oct 2016 04:05:07 +0000 (21:05 -0700)] 
Fix sass map navbar-toggleable

Follow up to 6e8ce0c7dc84c9373f6d760b82bea575cd5358b8. Uses the breakpoint-next mixin to snag the next breakpoint in the media query for proper styling.

8 years agoIterate over breakpoints to generate .navbar-toggleable classes
Mark Otto [Mon, 17 Oct 2016 04:51:26 +0000 (21:51 -0700)] 
Iterate over breakpoints to generate .navbar-toggleable classes

- Moves .navbar-brand margin and float to media queries
- Replaces the static media queries with an each loop to generate all the needed classes

8 years agodrop data-target so the dropdown link works
Mark Otto [Mon, 17 Oct 2016 03:45:12 +0000 (20:45 -0700)] 
drop data-target so the dropdown link works

8 years agoMerge branch 'v4-navbars' of github.com:twbs/bootstrap into v4-navbars
Mark Otto [Mon, 17 Oct 2016 02:46:55 +0000 (19:46 -0700)] 
Merge branch 'v4-navbars' of github.com:twbs/bootstrap into v4-navbars

8 years agoMerge branch 'v4-dev' into v4-navbars
Mark Otto [Mon, 17 Oct 2016 02:46:47 +0000 (19:46 -0700)] 
Merge branch 'v4-dev' into v4-navbars

8 years agogrunt
Mark Otto [Mon, 17 Oct 2016 02:44:11 +0000 (19:44 -0700)] 
grunt

8 years agoMerge pull request #20918 from twbs/revert-20867-dedupe-sm-vars
Mark Otto [Mon, 17 Oct 2016 02:42:02 +0000 (19:42 -0700)] 
Merge pull request #20918 from twbs/revert-20867-dedupe-sm-vars

Revert "Drop the $small-font-size variable for the newer $font-size-sm one"

8 years agoMerge pull request #20915 from bardiharborow/sauce
Mark Otto [Mon, 17 Oct 2016 02:09:37 +0000 (19:09 -0700)] 
Merge pull request #20915 from bardiharborow/sauce

Change SauceLabs iPhone test to use Appium.

8 years agoRevert "Drop the $small-font-size variable for the newer $font-size-sm one" 20918/head
Mark Otto [Mon, 17 Oct 2016 01:49:55 +0000 (18:49 -0700)] 
Revert "Drop the $small-font-size variable for the newer $font-size-sm one"

8 years agoChange SauceLabs iPhone test to use Appium. 20915/head 20919/head
Bardi Harborow [Sun, 16 Oct 2016 15:26:16 +0000 (02:26 +1100)] 
Change SauceLabs iPhone test to use Appium.

8 years agoMerge pull request #20890 from bardiharborow/scrollspy-docs
Mark Otto [Sat, 15 Oct 2016 20:39:41 +0000 (13:39 -0700)] 
Merge pull request #20890 from bardiharborow/scrollspy-docs

Update scrollspy navbar example.

8 years agoMerge pull request #20898 from roooodcastro/issue-20897
Mark Otto [Sat, 15 Oct 2016 20:38:53 +0000 (13:38 -0700)] 
Merge pull request #20898 from roooodcastro/issue-20897

Fixed #20897 by changing btn-default to btn-secondary in docs for V4

8 years agoFixes #20897 - Changed btn-default for btn-secondary on V4's Modal documentation... 20898/head
Rodrigo Castro [Thu, 13 Oct 2016 18:35:20 +0000 (15:35 -0300)] 
Fixes #20897 - Changed btn-default for btn-secondary on V4's Modal documentation page

8 years agoUpdate scrollspy navbar example. 20890/head
Bardi Harborow [Thu, 13 Oct 2016 00:08:15 +0000 (11:08 +1100)] 
Update scrollspy navbar example.

8 years agoMerge pull request #20882 from vsn4ik/v4-dev-fix-utilites-classes
Mark Otto [Wed, 12 Oct 2016 03:56:15 +0000 (20:56 -0700)] 
Merge pull request #20882 from vsn4ik/v4-dev-fix-utilites-classes

v4: Fix outdated utilites classes

8 years agov4: Fix outdated utilites classes 20882/head
vsn4ik [Tue, 11 Oct 2016 22:46:10 +0000 (01:46 +0300)] 
v4: Fix outdated utilites classes

8 years agoMerge pull request #18400 from Johann-S/collapseCard
Mark Otto [Tue, 11 Oct 2016 17:30:14 +0000 (10:30 -0700)] 
Merge pull request #18400 from Johann-S/collapseCard

Convert Collapse accordion from Panels to Cards

8 years agoCollapse using card component 18400/head
Johann-S [Tue, 1 Dec 2015 22:17:35 +0000 (23:17 +0100)] 
Collapse using card component

8 years agoMerge pull request #20878 from twbs/downloads-copy
Mark Otto [Mon, 10 Oct 2016 21:20:54 +0000 (14:20 -0700)] 
Merge pull request #20878 from twbs/downloads-copy

Updated Download docs

8 years agochange custom builds callout to compiled builds callout 20878/head
Mark Otto [Mon, 10 Oct 2016 21:18:42 +0000 (14:18 -0700)] 
change custom builds callout to compiled builds callout

8 years agoremove commented out custom builds
Mark Otto [Mon, 10 Oct 2016 21:18:28 +0000 (14:18 -0700)] 
remove commented out custom builds

8 years agorework download options to mention source, compiled, and cdn
Mark Otto [Mon, 10 Oct 2016 21:18:16 +0000 (14:18 -0700)] 
rework download options to mention source, compiled, and cdn

8 years agoMerge pull request #17614 from Johann-S/patchTooltip
Mark Otto [Mon, 10 Oct 2016 20:03:28 +0000 (13:03 -0700)] 
Merge pull request #17614 from Johann-S/patchTooltip

[Fix #17611][V4] Change destroy to dispose for tooltip in _JQueryInterface

8 years agoMerge pull request #20816 from bardiharborow/docs-clipboard
Mark Otto [Mon, 10 Oct 2016 04:04:41 +0000 (21:04 -0700)] 
Merge pull request #20816 from bardiharborow/docs-clipboard

Strip $ from copied shell commands.

8 years agogrunt
Mark Otto [Mon, 10 Oct 2016 03:39:50 +0000 (20:39 -0700)] 
grunt

8 years agoMerge pull request #17568 from Johann-S/fixCollapseHeight
Mark Otto [Mon, 10 Oct 2016 03:32:40 +0000 (20:32 -0700)] 
Merge pull request #17568 from Johann-S/fixCollapseHeight

[Fix #17555][V4] fix resetting style on closing collapse

8 years agoRender bash and powershell prompts with ::before. 20816/head
Bardi Harborow [Thu, 6 Oct 2016 01:02:52 +0000 (12:02 +1100)] 
Render bash and powershell prompts with ::before.

8 years agogrunt
Mark Otto [Mon, 10 Oct 2016 03:26:49 +0000 (20:26 -0700)] 
grunt

8 years agoone more syntax error
Mark Otto [Mon, 10 Oct 2016 03:26:12 +0000 (20:26 -0700)] 
one more syntax error

8 years agoMerge pull request #20876 from bardiharborow/fix-travis
Mark Otto [Mon, 10 Oct 2016 03:24:15 +0000 (20:24 -0700)] 
Merge pull request #20876 from bardiharborow/fix-travis

Fix Travis errors due to npm/npm#14042.

8 years agofix syntax
Mark Otto [Mon, 10 Oct 2016 03:23:49 +0000 (20:23 -0700)] 
fix syntax

8 years agoFix Travis errors due to npm/npm#14042. 20876/head
Bardi Harborow [Mon, 10 Oct 2016 01:41:09 +0000 (12:41 +1100)] 
Fix Travis errors due to npm/npm#14042.

8 years agoremove arrows from popovers docs
Mark Otto [Mon, 10 Oct 2016 03:03:43 +0000 (20:03 -0700)] 
remove arrows from popovers docs

8 years agoremove arrow from static html demos
Mark Otto [Mon, 10 Oct 2016 03:02:24 +0000 (20:02 -0700)] 
remove arrow from static html demos

8 years agoMerge branch 'tooltip-arrow' of https://github.com/brnrdog/bootstrap into brnrdog...
Mark Otto [Mon, 10 Oct 2016 02:56:30 +0000 (19:56 -0700)] 
Merge branch 'tooltip-arrow' of https://github.com/brnrdog/bootstrap into brnrdog-tooltip-arrow

8 years agogrunt
Mark Otto [Mon, 10 Oct 2016 02:55:58 +0000 (19:55 -0700)] 
grunt

8 years agoMerge pull request #20875 from twbs/custom-select-height
Mark Otto [Mon, 10 Oct 2016 02:50:42 +0000 (19:50 -0700)] 
Merge pull request #20875 from twbs/custom-select-height

Set height on custom select

8 years agoSet height on custom select 20875/head
Mark Otto [Mon, 10 Oct 2016 02:49:52 +0000 (19:49 -0700)] 
Set height on custom select

Matches the changes from #20874 to the regular select element. This is really only necessary for IE and Edge near as I can tell. Fixes #20810.

8 years agoMerge pull request #20874 from twbs/select-height
Mark Otto [Mon, 10 Oct 2016 01:08:29 +0000 (18:08 -0700)] 
Merge pull request #20874 from twbs/select-height

Match the height of select.form-control with input.form-control

8 years agoMatch the height of select.form-control with input.form-control 20874/head
Mark Otto [Mon, 10 Oct 2016 01:04:30 +0000 (18:04 -0700)] 
Match the height of select.form-control with input.form-control

Uses a local variable and some calc love to counteract the border-width (times 2) from the height of the select. Fixes #17194 and nullifies #19967.

8 years agodocument it a bit
Mark Otto [Mon, 10 Oct 2016 00:46:45 +0000 (17:46 -0700)] 
document it a bit

8 years agoMerge branch 'patch-10' of https://github.com/zalog/bootstrap into zalog-patch-10
Mark Otto [Mon, 10 Oct 2016 00:35:44 +0000 (17:35 -0700)] 
Merge branch 'patch-10' of https://github.com/zalog/bootstrap into zalog-patch-10

8 years agogrunt
Mark Otto [Mon, 10 Oct 2016 00:26:51 +0000 (17:26 -0700)] 
grunt

8 years agoMerge pull request #20555 from bardiharborow/updatedeps
Mark Otto [Mon, 10 Oct 2016 00:08:39 +0000 (17:08 -0700)] 
Merge pull request #20555 from bardiharborow/updatedeps

Update dependencies, including Babel to v6 and zeroUnits fix.

8 years agoMerge pull request #20873 from twbs/flush-list-group
Mark Otto [Sun, 9 Oct 2016 23:58:01 +0000 (16:58 -0700)] 
Merge pull request #20873 from twbs/flush-list-group

Reset the left and right border on list items for flush list groups

8 years agoReset the left and right border on list items for flush list groups 20873/head
Mark Otto [Sun, 9 Oct 2016 23:57:32 +0000 (16:57 -0700)] 
Reset the left and right border on list items for flush list groups

Avoid the resetting of the already set values in #20397. Fixes #20395.

8 years agoMerge pull request #20858 from vsn4ik/patch-1
Mark Otto [Sun, 9 Oct 2016 23:52:02 +0000 (16:52 -0700)] 
Merge pull request #20858 from vsn4ik/patch-1

Update devDependencies badge link.

8 years agoMerge pull request #20872 from twbs/validation-fixes
Mark Otto [Sun, 9 Oct 2016 23:50:49 +0000 (16:50 -0700)] 
Merge pull request #20872 from twbs/validation-fixes

Form validation fixes

8 years agolinting 20872/head
Mark Otto [Sun, 9 Oct 2016 23:46:47 +0000 (16:46 -0700)] 
linting

8 years agofix focus shadows, if enabled
Mark Otto [Sun, 9 Oct 2016 23:44:04 +0000 (16:44 -0700)] 
fix focus shadows, if enabled

8 years agoUse correct class for validation coloring on label elements
Mark Otto [Sun, 9 Oct 2016 23:40:56 +0000 (16:40 -0700)] 
Use correct class for validation coloring on label elements

8 years agoThe color is already covered in the first ruleset here
Mark Otto [Sun, 9 Oct 2016 23:39:02 +0000 (16:39 -0700)] 
The color is already covered in the first ruleset here

8 years agoInterpolate the variable so it passes the color properly
Mark Otto [Sun, 9 Oct 2016 23:38:28 +0000 (16:38 -0700)] 
Interpolate the variable so it passes the color properly

8 years agoMerge pull request #20871 from twbs/document-bg-faded
Mark Otto [Sun, 9 Oct 2016 23:35:57 +0000 (16:35 -0700)] 
Merge pull request #20871 from twbs/document-bg-faded

Document the .bg-faded class

8 years agoDocument the .bg-faded class 20871/head
Mark Otto [Sun, 9 Oct 2016 23:35:16 +0000 (16:35 -0700)] 
Document the .bg-faded class

Fixes #20550.

8 years agoMerge pull request #20870 from twbs/collapse-example-fix
Mark Otto [Sun, 9 Oct 2016 23:32:45 +0000 (16:32 -0700)] 
Merge pull request #20870 from twbs/collapse-example-fix

Don't use collapse classes on elements with padding

8 years agoDon't use collapse classes on elements with padding 20870/head
Mark Otto [Sun, 9 Oct 2016 23:32:19 +0000 (16:32 -0700)] 
Don't use collapse classes on elements with padding

Fixes #20600.

8 years agoMerge pull request #20869 from twbs/static-control
Mark Otto [Sun, 9 Oct 2016 23:25:41 +0000 (16:25 -0700)] 
Merge pull request #20869 from twbs/static-control

v4 Static form control sizing

8 years agoremove un-needed comment 20869/head
Mark Otto [Sun, 9 Oct 2016 23:18:05 +0000 (16:18 -0700)] 
remove un-needed comment

8 years agoadd transparent border to match .form-control height
Mark Otto [Sun, 9 Oct 2016 23:17:48 +0000 (16:17 -0700)] 
add transparent border to match .form-control height

8 years agoUpdate static form control
Mark Otto [Sun, 9 Oct 2016 23:16:13 +0000 (16:16 -0700)] 
Update static form control

- Remove margin-bottom override in favor of .mb-0 utility class
- Apply the input line-height styles to match
- Remove the min-height to match the input

8 years agoMerge pull request #20868 from twbs/inline-form-input-group
Mark Otto [Sun, 9 Oct 2016 23:04:23 +0000 (16:04 -0700)] 
Merge pull request #20868 from twbs/inline-form-input-group

Ensure input groups behavior appropriately in inline forms

8 years agoEnsure input groups behavior appropriately in inline forms 20868/head
Mark Otto [Sun, 9 Oct 2016 23:00:30 +0000 (16:00 -0700)] 
Ensure input groups behavior appropriately in inline forms

Overrides the default width: 100% with an auto. Fixes #20752.

8 years agoseparate out the custom html example
Mark Otto [Sun, 9 Oct 2016 22:35:52 +0000 (15:35 -0700)] 
separate out the custom html example

8 years agoMerge branch 'v4-dev' of https://github.com/dumb/bootstrap into dumb-v4-dev
Mark Otto [Sun, 9 Oct 2016 22:29:26 +0000 (15:29 -0700)] 
Merge branch 'v4-dev' of https://github.com/dumb/bootstrap into dumb-v4-dev

8 years agoremove those files from the diff
Mark Otto [Sun, 9 Oct 2016 22:14:25 +0000 (15:14 -0700)] 
remove those files from the diff

8 years agofix bad merge
Mark Otto [Sun, 9 Oct 2016 22:08:34 +0000 (15:08 -0700)] 
fix bad merge

8 years agoMerge branch 'v4-dev' into v4-navbars
Mark Otto [Sun, 9 Oct 2016 22:04:32 +0000 (15:04 -0700)] 
Merge branch 'v4-dev' into v4-navbars

8 years agogrunt
Mark Otto [Sun, 9 Oct 2016 22:02:49 +0000 (15:02 -0700)] 
grunt

8 years agoMerge pull request #20867 from twbs/dedupe-sm-vars
Mark Otto [Sun, 9 Oct 2016 22:00:11 +0000 (15:00 -0700)] 
Merge pull request #20867 from twbs/dedupe-sm-vars

Drop the $small-font-size variable for the newer $font-size-sm one

8 years agoMerge pull request #20864 from twbs/fix-20688
Mark Otto [Sun, 9 Oct 2016 21:57:31 +0000 (14:57 -0700)] 
Merge pull request #20864 from twbs/fix-20688

Update the grid table heading to clarify max width over width

8 years agoMerge pull request #20684 from twbs/v4-utils
Mark Otto [Sun, 9 Oct 2016 21:54:57 +0000 (14:54 -0700)] 
Merge pull request #20684 from twbs/v4-utils

v4: The Utilities Update

8 years agoMerge pull request #20865 from twbs/v4-container-widths
Mark Otto [Sun, 9 Oct 2016 21:52:14 +0000 (14:52 -0700)] 
Merge pull request #20865 from twbs/v4-container-widths

v4: Grid adjustments

8 years agoMerge branch 'v4-dev' into v4-utils 20684/head
Mark Otto [Sun, 9 Oct 2016 21:36:43 +0000 (14:36 -0700)] 
Merge branch 'v4-dev' into v4-utils

8 years agoRemove display from the .img-fluid utility
Mark Otto [Sun, 9 Oct 2016 21:14:39 +0000 (14:14 -0700)] 
Remove display from the .img-fluid utility

Creating max-width images is not dependent on the display, so setting it is redundant. Cleans up the comments and implementation of the mixin as well.

Fixes #20767

8 years agoUpdate grid docs mention of gutter width value (no more rems for awhile now) 20865/head
Mark Otto [Sun, 9 Oct 2016 20:51:59 +0000 (13:51 -0700)] 
Update grid docs mention of gutter width value (no more rems for awhile now)

8 years agoUpdate grid docs to use new values for grid breakpoints and containers
Mark Otto [Sun, 9 Oct 2016 20:51:05 +0000 (13:51 -0700)] 
Update grid docs to use new values for grid breakpoints and containers