]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
9 years agoMerge pull request #18257 from twbs/border-width-vars
Mark Otto [Mon, 30 Nov 2015 03:52:22 +0000 (19:52 -0800)] 
Merge pull request #18257 from twbs/border-width-vars

Add more border width variables

9 years agoMerge pull request #18260 from twbs/fix-18259
Mark Otto [Mon, 30 Nov 2015 03:49:20 +0000 (19:49 -0800)] 
Merge pull request #18260 from twbs/fix-18259

Move viewport-dependent padding tweak into main .jumbotron block

9 years agoMerge pull request #18265 from twbs/fix-v4-17007
Mark Otto [Mon, 30 Nov 2015 03:48:54 +0000 (19:48 -0800)] 
Merge pull request #18265 from twbs/fix-v4-17007

Bring focused input group controls to front via z-index:3

9 years agoMerge pull request #18317 from twbs/redundant-text-aligns-18300
Mark Otto [Mon, 30 Nov 2015 03:39:48 +0000 (19:39 -0800)] 
Merge pull request #18317 from twbs/redundant-text-aligns-18300

Remove non-responsive text alignment classes

9 years agogrunt dist
Chris Rebert [Mon, 30 Nov 2015 00:59:01 +0000 (16:59 -0800)] 
grunt dist

[ci skip]

9 years agoUpdate shrinkwrap
Chris Rebert [Mon, 30 Nov 2015 00:58:21 +0000 (16:58 -0800)] 
Update shrinkwrap

9 years agoMerge pull request #18327 from twbs/prefixing
Chris Rebert [Mon, 30 Nov 2015 00:46:38 +0000 (16:46 -0800)] 
Merge pull request #18327 from twbs/prefixing

Gruntfile: Add comments explaining CSS prefixing policy

9 years agoAdd Wall of Browser Bugs entry for #18365
Chris Rebert [Sun, 29 Nov 2015 04:54:15 +0000 (20:54 -0800)] 
Add Wall of Browser Bugs entry for #18365

See http://bugzil.la/1228802

[skip sauce]
[skip validator]

9 years ago_dropdown.scss: Revise comments; fixes #18363
Chris Rebert [Sat, 28 Nov 2015 04:12:37 +0000 (20:12 -0800)] 
_dropdown.scss: Revise comments; fixes #18363

[skip sauce]

9 years agoMerge pull request #18351 from twbs/node_js-stable
XhmikosR [Thu, 26 Nov 2015 06:39:16 +0000 (08:39 +0200)] 
Merge pull request #18351 from twbs/node_js-stable

Travis CI: Use Node.js 5 instead of "stable"

9 years agoTravis CI: Use Node.js 5 instead of "stable" 18351/head
Chris Rebert [Thu, 26 Nov 2015 02:47:46 +0000 (18:47 -0800)] 
Travis CI: Use Node.js 5 instead of "stable"

"stable" is deprecated by nvm
Refs https://github.com/twbs/grunt-bootlint/pull/61
[skip sauce]

9 years agobrowsers-devices.md: rm stray `</p>`
Chris Rebert [Wed, 25 Nov 2015 06:37:38 +0000 (22:37 -0800)] 
browsers-devices.md: rm stray `</p>`

[skip sauce]

9 years agoUpdating "Reporting upstream browser bugs" for IE
Martin Beeby [Fri, 20 Nov 2015 17:18:25 +0000 (17:18 +0000)] 
Updating "Reporting upstream browser bugs" for IE

Adding Microsoft Edge and the rendering engine EdgeHTML.

Closes #18303
[skip sauce]
[skip validator]

9 years agoGruntfile: Add comments explaining CSS prefixing policy 18327/head
Chris Rebert [Tue, 24 Nov 2015 12:29:22 +0000 (04:29 -0800)] 
Gruntfile: Add comments explaining CSS prefixing policy

[skip sauce]

9 years agoAdd responsive embed class for 1:1 aspect ratio
Richard Kraaijenhagen [Tue, 24 Nov 2015 03:50:38 +0000 (19:50 -0800)] 
Add responsive embed class for 1:1 aspect ratio

Closes #18141

9 years agoRun `grunt`.
XhmikosR [Mon, 23 Nov 2015 16:51:32 +0000 (18:51 +0200)] 
Run `grunt`.

[ci skip]

9 years agoBump grunt-contrib-uglify.
XhmikosR [Mon, 23 Nov 2015 16:40:44 +0000 (18:40 +0200)] 
Bump grunt-contrib-uglify.

[skip sauce]

9 years agoRemove non-responsive text alignment classes 18317/head
Chris Rebert [Mon, 23 Nov 2015 04:53:34 +0000 (20:53 -0800)] 
Remove non-responsive text alignment classes

These can be replaced by their `.text-xs-*` parallels.
This also avoids any complications from interactions between the responsive and non-responsive classes.
(e.g. `<div class="text-left text-md-right">`)

Refs #18300
[skip sauce]

9 years agoAdd missing !important-s to responsive text alignment classes; fixes #18300
Deilv [Sun, 22 Nov 2015 20:29:48 +0000 (22:29 +0200)] 
Add missing !important-s to responsive text alignment classes; fixes #18300

Closes #18314 by merging a tweaked version of it.

9 years agoMerge pull request #18288 from twbs/revert-18286-patch-1
Patrick H. Lauke [Thu, 19 Nov 2015 14:17:08 +0000 (14:17 +0000)] 
Merge pull request #18288 from twbs/revert-18286-patch-1

Revert "Added button subsection to the component section"

9 years agoRevert "Added button subsection to the component section" 18288/head
Patrick H. Lauke [Thu, 19 Nov 2015 14:16:23 +0000 (14:16 +0000)] 
Revert "Added button subsection to the component section"

9 years agoMerge pull request #18286 from vanillajonathan/patch-1
Patrick H. Lauke [Thu, 19 Nov 2015 12:10:13 +0000 (12:10 +0000)] 
Merge pull request #18286 from vanillajonathan/patch-1

Added button subsection to the component section

9 years agoAdded button subsection to the component section 18286/head
Jonathan [Thu, 19 Nov 2015 12:05:50 +0000 (13:05 +0100)] 
Added button subsection to the component section

9 years agoMerge pull request #18285 from twbs/lint-visual-tests
Chris Rebert [Thu, 19 Nov 2015 10:20:49 +0000 (02:20 -0800)] 
Merge pull request #18285 from twbs/lint-visual-tests

Check HTML validity of JS visual tests too

9 years agoRemove stray </p> from js/tests/visual/scrollspy.html
Chris Rebert [Thu, 19 Nov 2015 09:49:46 +0000 (01:49 -0800)] 
Remove stray </p> from js/tests/visual/scrollspy.html

[skip sauce]

9 years agoCheck HTML validity of JS visual tests too 18285/head
Chris Rebert [Thu, 19 Nov 2015 09:49:12 +0000 (01:49 -0800)] 
Check HTML validity of JS visual tests too

[skip sauce]

9 years agoMerge pull request #18284 from twbs/tether-docs-fix
Chris Rebert [Thu, 19 Nov 2015 09:31:56 +0000 (01:31 -0800)] 
Merge pull request #18284 from twbs/tether-docs-fix

Docs: Separate Tether out from docs.min.js

9 years agoDocs: Separate Tether out from docs.min.js 18283/head 18284/head
Chris Rebert [Thu, 19 Nov 2015 09:00:35 +0000 (01:00 -0800)] 
Docs: Separate Tether out from docs.min.js

We can't include it in docs.min.js because docs.min.js includes application.js,
application.js depends on bootstrap.js,
and the tooltip portion of bootstrap.js depends on Tether.

So instead, we need to load Tether separately before bootstrap.js

[skip sauce]

9 years agoRun `grunt`.
XhmikosR [Mon, 16 Nov 2015 07:53:03 +0000 (09:53 +0200)] 
Run `grunt`.

[ci skip]

9 years agoUpdate devDependencies.
XhmikosR [Mon, 16 Nov 2015 07:32:59 +0000 (09:32 +0200)] 
Update devDependencies.

Adapt uglify for the new version.

9 years agoMerge pull request #18267 from twbs/v4-dev-xmr-revert-jquery2-requirement
Chris Rebert [Mon, 16 Nov 2015 08:00:21 +0000 (00:00 -0800)] 
Merge pull request #18267 from twbs/v4-dev-xmr-revert-jquery2-requirement

Revert "Make jQuery 2.0 the minimum supported version."

9 years agoCheck for jQuery >= 3. 18267/head
Chris Rebert [Mon, 16 Nov 2015 07:28:11 +0000 (09:28 +0200)] 
Check for jQuery >= 3.

Reword jQuery version mismatch error message since jQuery v3 isn't supported.

9 years agoRevert "Make jQuery 2.0 the minimum supported version."
XhmikosR [Mon, 16 Nov 2015 07:21:02 +0000 (09:21 +0200)] 
Revert "Make jQuery 2.0 the minimum supported version."

This partially reverts commit 9eded912a05082a89ef30b899bbe659cb9ce254c.

9 years agodocs/content/reboot.md: Just to avoid any ambiguity
Chris Rebert [Mon, 16 Nov 2015 01:24:46 +0000 (17:24 -0800)] 
docs/content/reboot.md: Just to avoid any ambiguity

[ci skip]

9 years agodocs/content/reboot.md: Add MDN link and a comma
Chris Rebert [Mon, 16 Nov 2015 01:18:31 +0000 (17:18 -0800)] 
docs/content/reboot.md: Add MDN link and a comma

9 years agoscss/_reboot.scss: Add link to nice new docs regarding `touch-action:manipulation`
Chris Rebert [Mon, 16 Nov 2015 01:16:50 +0000 (17:16 -0800)] 
scss/_reboot.scss: Add link to nice new docs regarding `touch-action:manipulation`

[ci skip]

9 years agoMerge pull request #18266 from patrickhlauke/reboot-touch-optimization
Patrick H. Lauke [Mon, 16 Nov 2015 01:11:16 +0000 (01:11 +0000)] 
Merge pull request #18266 from patrickhlauke/reboot-touch-optimization

Docs: touch responsiveness optimization

9 years agoTouch responsiveness optimization 18266/head
Patrick H. Lauke [Sun, 15 Nov 2015 23:30:11 +0000 (23:30 +0000)] 
Touch responsiveness optimization

Admittedly wordy info dump on why we use `touch-action:manipulation`

refs https://github.com/twbs/bootstrap/pull/18051#issuecomment-156375970

9 years agoMerge pull request #18051 from twbs/impl-18044
Chris Rebert [Mon, 16 Nov 2015 01:08:01 +0000 (17:08 -0800)] 
Merge pull request #18051 from twbs/impl-18044

Add touch-action:manipulation on interactive elements to avoid 300ms click delay

9 years agoFix #17001 in v4 18265/head
Chris Rebert [Sun, 15 Nov 2015 22:09:12 +0000 (14:09 -0800)] 
Fix #17001 in v4

Refs #18253
[skip sauce]

9 years agoAdd $list-group-border-width; refs #18150 18257/head
Chris Rebert [Sun, 15 Nov 2015 20:46:35 +0000 (12:46 -0800)] 
Add $list-group-border-width; refs #18150

[skip sauce]

9 years ago$list-group-border => $list-group-border-color
Chris Rebert [Sun, 15 Nov 2015 20:43:42 +0000 (12:43 -0800)] 
$list-group-border => $list-group-border-color

[skip sauce]

9 years agoMove viewport-dependent padding tweak into main .jumbotron block 18260/head
Chris Rebert [Sun, 15 Nov 2015 09:25:38 +0000 (01:25 -0800)] 
Move viewport-dependent padding tweak into main .jumbotron block

Refs #18259
[skip sauce]

9 years ago.form-control: Use $input-border-width instead of $border-width
Chris Rebert [Sun, 15 Nov 2015 09:18:36 +0000 (01:18 -0800)] 
.form-control: Use $input-border-width instead of $border-width

[skip sauce]

9 years agoAdd $table-border-width; refs #18150
Chris Rebert [Sun, 15 Nov 2015 07:24:48 +0000 (23:24 -0800)] 
Add $table-border-width; refs #18150

9 years agoAdd $popover-border-width; refs #18150
Chris Rebert [Sun, 15 Nov 2015 07:11:20 +0000 (23:11 -0800)] 
Add $popover-border-width; refs #18150

9 years agoAdd $thumbnail-border-width; refs #18150
Chris Rebert [Sun, 15 Nov 2015 06:56:20 +0000 (22:56 -0800)] 
Add $thumbnail-border-width; refs #18150

9 years ago$thumbnail-border => $thumbnail-border-color
Chris Rebert [Sun, 15 Nov 2015 06:54:53 +0000 (22:54 -0800)] 
$thumbnail-border => $thumbnail-border-color

9 years agoAdd $pagination-border-width; refs #18150
Chris Rebert [Sun, 15 Nov 2015 06:53:18 +0000 (22:53 -0800)] 
Add $pagination-border-width; refs #18150

9 years agoRename $pagination-border => $pagination-border-color for clarity
Chris Rebert [Sun, 15 Nov 2015 06:51:18 +0000 (22:51 -0800)] 
Rename $pagination-border => $pagination-border-color for clarity

9 years agoAdd $pager-border-width; refs #18150
Chris Rebert [Sun, 15 Nov 2015 06:49:14 +0000 (22:49 -0800)] 
Add $pager-border-width; refs #18150

9 years ago$pager-border => $pager-border-color
Chris Rebert [Sun, 15 Nov 2015 06:48:18 +0000 (22:48 -0800)] 
$pager-border => $pager-border-color

9 years agoAdd $nav-tabs-link-border-width; refs #18150
Chris Rebert [Sun, 15 Nov 2015 06:38:42 +0000 (22:38 -0800)] 
Add $nav-tabs-link-border-width; refs #18150

9 years agoAdd $input-border-width; refs #18150
Chris Rebert [Sun, 15 Nov 2015 06:36:19 +0000 (22:36 -0800)] 
Add $input-border-width; refs #18150

9 years ago$input-border => $input-border-color
Chris Rebert [Sun, 15 Nov 2015 06:32:42 +0000 (22:32 -0800)] 
$input-border => $input-border-color

9 years agoAdd $dropdown-border-width; refs #18150
Chris Rebert [Sun, 15 Nov 2015 06:30:16 +0000 (22:30 -0800)] 
Add $dropdown-border-width; refs #18150

9 years ago$dropdown-border => $dropdown-border-color
Chris Rebert [Sun, 15 Nov 2015 06:28:45 +0000 (22:28 -0800)] 
$dropdown-border => $dropdown-border-color

9 years agoMerge pull request #18255 from twbs/v4-block-cards
Mark Otto [Sun, 15 Nov 2015 05:41:20 +0000 (21:41 -0800)] 
Merge pull request #18255 from twbs/v4-block-cards

Block level cards

9 years agofixes #18170, make cards block level by default so anchors can be used as base element 18255/head
Mark Otto [Sun, 15 Nov 2015 05:40:17 +0000 (21:40 -0800)] 
fixes #18170, make cards block level by default so anchors can be used as base element

9 years agofixes #18241: bump up border-radius values on .label-pill for when customization...
Mark Otto [Sun, 15 Nov 2015 05:29:09 +0000 (21:29 -0800)] 
fixes #18241: bump up border-radius values on .label-pill for when customization means the 1rem value doesn't cut it

9 years agouncomment that, fixes #18219
Mark Otto [Sun, 15 Nov 2015 05:21:19 +0000 (21:21 -0800)] 
uncomment that, fixes #18219

9 years agoMerge pull request #18254 from twbs/v4-text-classes
Mark Otto [Sun, 15 Nov 2015 05:13:42 +0000 (21:13 -0800)] 
Merge pull request #18254 from twbs/v4-text-classes

Document links with text emphasis classes

9 years agodocument links with text emphasis classes, fixes #18223 18254/head
Mark Otto [Sun, 15 Nov 2015 05:12:41 +0000 (21:12 -0800)] 
document links with text emphasis classes, fixes #18223

9 years agoadd undefined for now
Jacob Thornton [Sun, 15 Nov 2015 04:43:45 +0000 (20:43 -0800)] 
add undefined for now

9 years agoadd explicit error for lack of tether in tooltips - fixes #17273
Jacob Thornton [Sun, 15 Nov 2015 04:35:10 +0000 (20:35 -0800)] 
add explicit error for lack of tether in tooltips - fixes #17273

9 years agoMerge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev
Jacob Thornton [Sun, 15 Nov 2015 03:52:17 +0000 (19:52 -0800)] 
Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev

9 years agoMerge branch 'lincolndbryant-v4-dev' into v4-dev
Jacob Thornton [Sun, 15 Nov 2015 03:51:50 +0000 (19:51 -0800)] 
Merge branch 'lincolndbryant-v4-dev' into v4-dev

9 years agoMerge pull request #18249 from twbs/v4-ap
Mark Otto [Sun, 15 Nov 2015 03:50:29 +0000 (19:50 -0800)] 
Merge pull request #18249 from twbs/v4-ap

Autoprefixer callout in Build tools docs

9 years agoMerge branch 'v4-dev' of https://github.com/lincolndbryant/bootstrap into lincolndbry...
Jacob Thornton [Sun, 15 Nov 2015 03:49:48 +0000 (19:49 -0800)] 
Merge branch 'v4-dev' of https://github.com/lincolndbryant/bootstrap into lincolndbryant-v4-dev

9 years agogrunt
Mark Otto [Sun, 15 Nov 2015 03:46:15 +0000 (19:46 -0800)] 
grunt

9 years agofix broke markup
Mark Otto [Sun, 15 Nov 2015 03:46:03 +0000 (19:46 -0800)] 
fix broke markup

9 years agofix error to danger
Mark Otto [Sun, 15 Nov 2015 03:45:48 +0000 (19:45 -0800)] 
fix error to danger

9 years agounfuck that class name change
Mark Otto [Sun, 15 Nov 2015 03:45:35 +0000 (19:45 -0800)] 
unfuck that class name change

9 years agoMerge pull request #18250 from twbs/v4-checkbox-markup
Mark Otto [Sun, 15 Nov 2015 03:40:08 +0000 (19:40 -0800)] 
Merge pull request #18250 from twbs/v4-checkbox-markup

Checkbox validation markup (Take 2)

9 years agos/error/danger/
Chris Rebert [Sun, 15 Nov 2015 03:35:45 +0000 (19:35 -0800)] 
s/error/danger/

[skip sauce]

9 years agoOne more Autoprefixer shoutout 18249/head
Chris Rebert [Sun, 15 Nov 2015 03:31:41 +0000 (19:31 -0800)] 
One more Autoprefixer shoutout

[skip sauce]

9 years agocontextual shoutout
Mark Otto [Sun, 15 Nov 2015 03:28:45 +0000 (19:28 -0800)] 
contextual shoutout

9 years agoconsolidate links at the bottom of the file
Mark Otto [Sun, 15 Nov 2015 03:28:14 +0000 (19:28 -0800)] 
consolidate links at the bottom of the file

9 years agoSimplifies markup for checkbox validation states 18250/head
Zac Echola [Thu, 20 Aug 2015 15:55:15 +0000 (10:55 -0500)] 
Simplifies markup for checkbox validation states

9 years agoAdd note to build tools docs section about autoprefixer
Mark Otto [Sun, 15 Nov 2015 03:21:25 +0000 (19:21 -0800)] 
Add note to build tools docs section about autoprefixer

9 years agoMerge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Mark Otto [Sun, 15 Nov 2015 01:23:22 +0000 (17:23 -0800)] 
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

9 years agonuke unhelpful comments
Mark Otto [Sun, 15 Nov 2015 01:23:16 +0000 (17:23 -0800)] 
nuke unhelpful comments

9 years agoRefactor figure image styles to use CSS class instead of child selector
Bass Jobsen [Mon, 2 Nov 2015 19:56:24 +0000 (20:56 +0100)] 
Refactor figure image styles to use CSS class instead of child selector

Refactoring according the comments on https://github.com/twbs/bootstrap/pull/18104.
Closes #18131

9 years agoMerge pull request #18244 from patrickhlauke/v4-ios-viewport-tweak3
Patrick H. Lauke [Fri, 13 Nov 2015 16:17:57 +0000 (16:17 +0000)] 
Merge pull request #18244 from patrickhlauke/v4-ios-viewport-tweak3

Add shrink-to-fit to responsive meta section

9 years agoAdd shrink-to-fit to responsive meta section 18244/head
Patrick H. Lauke [Fri, 13 Nov 2015 16:16:17 +0000 (16:16 +0000)] 
Add shrink-to-fit to responsive meta section

9 years agoTravis CI: Use npm@3
Chris Rebert [Thu, 12 Nov 2015 01:25:35 +0000 (17:25 -0800)] 
Travis CI: Use npm@3

9 years agoUpdate shrinkwrap
Chris Rebert [Thu, 12 Nov 2015 00:55:14 +0000 (16:55 -0800)] 
Update shrinkwrap

9 years agoReplace grunt-autoprefixer with grunt-postcss + autoprefixer
Bass Jobsen [Mon, 26 Oct 2015 22:15:00 +0000 (23:15 +0100)] 
Replace grunt-autoprefixer with grunt-postcss + autoprefixer

Closes #18068

9 years agoAdd touch-action:manipulation on interactive elements to avoid 300ms click delay 18051/head
Chris Rebert [Sun, 25 Oct 2015 03:26:06 +0000 (20:26 -0700)] 
Add touch-action:manipulation on interactive elements to avoid 300ms click delay

Fixes #18044

[skip sauce]
[skip validator]

9 years ago.dropdown-menu: Swap color and font-size property order to make SCSS Lint happy
Chris Rebert [Fri, 13 Nov 2015 08:21:43 +0000 (00:21 -0800)] 
.dropdown-menu: Swap color and font-size property order to make SCSS Lint happy

9 years agoscss/_nav.scss: Remove trailing whitespace
Chris Rebert [Fri, 13 Nov 2015 08:20:03 +0000 (00:20 -0800)] 
scss/_nav.scss: Remove trailing whitespace

[ci skip]

9 years agoSwap margin-right and margin-left ordering in .dropdown-toggle::after to make SCSS...
Chris Rebert [Fri, 13 Nov 2015 08:19:19 +0000 (00:19 -0800)] 
Swap margin-right and margin-left ordering in .dropdown-toggle::after to make SCSS Lint happy

[ci skip]

9 years agoscss/_card.scss: Remove trailing whitespace
Chris Rebert [Fri, 13 Nov 2015 08:17:25 +0000 (00:17 -0800)] 
scss/_card.scss: Remove trailing whitespace

[ci skip]

9 years agoMerge pull request #18089 from almirsarajcic/v4-dev
Mark Otto [Fri, 13 Nov 2015 07:57:22 +0000 (23:57 -0800)] 
Merge pull request #18089 from almirsarajcic/v4-dev

Rename .help-block to .text-help

9 years agoMerge pull request #18093 from AndersMad/patch-1
Mark Otto [Fri, 13 Nov 2015 07:56:45 +0000 (23:56 -0800)] 
Merge pull request #18093 from AndersMad/patch-1

Card fix static -> variable border radius

9 years agoMerge pull request #17939 from chrisbell08/#17895_alert_border_width
Mark Otto [Fri, 13 Nov 2015 07:50:51 +0000 (23:50 -0800)] 
Merge pull request #17939 from chrisbell08/#17895_alert_border_width

#17895 Added $alert-border-width that defaults to $border-width

9 years agoPorts c256aca13cf6ff1c3c1d5933b28423bc144f1fc1 to v4
Chris Rebert [Fri, 13 Nov 2015 07:46:29 +0000 (23:46 -0800)] 
Ports c256aca13cf6ff1c3c1d5933b28423bc144f1fc1 to v4

Refs #15947, #17542

[ci skip]

9 years agoRevert "Drop cursor pointer for button role"
Chris Rebert [Fri, 13 Nov 2015 07:43:13 +0000 (23:43 -0800)] 
Revert "Drop cursor pointer for button role"

This reverts commit 61067304cd8ad4394af69003971b4e9c3aa94c55.

The normalize.css pull request (https://github.com/necolas/normalize.css/pull/379 )
was REJECTED, *NOT* merged!

9 years agoMerge pull request #17954 from risan/patch-1
Mark Otto [Fri, 13 Nov 2015 07:43:32 +0000 (23:43 -0800)] 
Merge pull request #17954 from risan/patch-1

[V4] Fixes #17953: Add migration docs of .btn-default removal

9 years agoMerge pull request #18061 from mathisonian/patch-1
Mark Otto [Fri, 13 Nov 2015 07:37:02 +0000 (23:37 -0800)] 
Merge pull request #18061 from mathisonian/patch-1

remove bro from comment