Skip to content

Commit 894994e

Browse files
Merge branch '_bump-v3.21.0-local' into master-dist
2 parents 13e7044 + 2052fe1 commit 894994e

File tree

6 files changed

+139
-12
lines changed

6 files changed

+139
-12
lines changed

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-patternfly",
3-
"version": "3.20.0",
3+
"version": "3.21.0",
44
"authors": [
55
"Red Hat"
66
],
@@ -43,7 +43,7 @@
4343
"angular-sanitize": "1.3.0 - 1.5.*",
4444
"angular-bootstrap": "0.14.x",
4545
"lodash": "3.x",
46-
"patternfly": "~3.20.0"
46+
"patternfly": "~3.21.0"
4747
},
4848
"devDependencies": {
4949
"angular-mocks": "1.3.0 - 1.5.*",

dist/docs/css/patternfly-additions.css

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3414,6 +3414,50 @@ a.disabled {
34143414
cursor: not-allowed;
34153415
text-decoration: none;
34163416
}
3417+
.list-pf {
3418+
border-bottom: 1px solid #ededed;
3419+
}
3420+
.list-pf-item {
3421+
border-color: #ededed;
3422+
border-left-color: #fff;
3423+
border-right-color: #fff;
3424+
border-style: solid;
3425+
border-width: 1px;
3426+
border-bottom: none;
3427+
}
3428+
.list-pf-item:hover {
3429+
background-color: #fafafa;
3430+
}
3431+
.list-pf-item.active {
3432+
background-color: #ededed;
3433+
border-color: #bbb;
3434+
border-bottom-width: 1px;
3435+
border-bottom-style: solid;
3436+
}
3437+
.list-pf-expansion {
3438+
background-color: #fff;
3439+
}
3440+
.list-pf-container {
3441+
-ms-flex-align: center;
3442+
align-items: center;
3443+
display: -ms-flexbox;
3444+
display: flex;
3445+
padding: 20px;
3446+
}
3447+
.list-pf-expansion .list-pf-container {
3448+
border-top: 1px solid #bbb;
3449+
}
3450+
.list-pf-chevron {
3451+
margin-right: 5px;
3452+
}
3453+
.list-pf-chevron + .list-pf-content {
3454+
border-left: 1px solid #bbb;
3455+
padding-left: 15px;
3456+
}
3457+
.list-pf-chevron .fa {
3458+
font-size: 22px;
3459+
width: 20px;
3460+
}
34173461
.list-view-pf .list-group-item {
34183462
-ms-flex-align: start;
34193463
align-items: flex-start;
@@ -6806,6 +6850,9 @@ table.dataTable th:active {
68066850
left: 0;
68076851
right: 0;
68086852
}
6853+
.wizard-pf-contents textarea {
6854+
resize: vertical;
6855+
}
68096856
/* styles the content of a review page */
68106857
.wizard-pf-review-steps {
68116858
list-style: none;

dist/docs/css/patternfly.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8937,6 +8937,7 @@ button.close {
89378937
padding-left: 47px;
89388938
padding-right: 14px;
89398939
position: relative;
8940+
word-wrap: break-word;
89408941
}
89418942
.alert .alert-link {
89428943
color: #0088ce;

dist/docs/grunt-scripts/patternfly.js

Lines changed: 81 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
'use strict';
33

44
var patternfly = {
5-
version: "3.20.0",
5+
version: "3.21.0",
66
};
77

88
// Util: PatternFly Palette colors
@@ -1663,3 +1663,83 @@
16631663
return $.fn.setupVerticalNavigation.self;
16641664
};
16651665
}(jQuery));
1666+
1667+
// PatternFly pf-list
1668+
(function ($) {
1669+
'use strict';
1670+
1671+
$.fn.pfList = function () {
1672+
function init (list) {
1673+
// Ensure the state of the expansion elements is consistent
1674+
list.find('[data-list=expansion], .list-pf-item, .list-pf-expansion').each(function (index, element) {
1675+
var $expansion = $(element),
1676+
$collapse = $expansion.find('.collapse').first(),
1677+
expanded = $collapse.hasClass('in');
1678+
updateChevron($expansion, expanded);
1679+
if ($expansion.hasClass('list-pf-item')) {
1680+
updateActive($expansion, expanded);
1681+
}
1682+
});
1683+
list.find('.list-pf-container').each(function (index, element) {
1684+
var $element = $(element);
1685+
// The toggle element is the element with the data-list=toggle attribute
1686+
// or the entire .list-pf-container as a fallback
1687+
var $toggles = $element.find('[data-list=toggle]');
1688+
$toggles.length || ($toggles = $element);
1689+
$toggles.on('keydown', function (event) {
1690+
if (event.keyCode === 13 || event.keyCode === 32) {
1691+
toggleCollapse(this);
1692+
event.stopPropagation();
1693+
event.preventDefault();
1694+
}
1695+
});
1696+
$toggles.on('click', function (event) {
1697+
toggleCollapse(this);
1698+
event.stopPropagation();
1699+
event.preventDefault();
1700+
});
1701+
});
1702+
}
1703+
1704+
function toggleCollapse (toggle) {
1705+
var $toggle, $expansion, $collapse, expanded, $listItem;
1706+
$toggle = $(toggle);
1707+
// Find the parent expansion of the toggle
1708+
$expansion = $toggle.parentsUntil('.list-pf', '[data-list=expansion]').first();
1709+
$expansion.length || ($expansion = $toggle.closest('.list-pf-item, .list-pf-expansion'));
1710+
1711+
// toggle the "in" class of its first .collapse child
1712+
$collapse = $expansion.find('.collapse').first();
1713+
$collapse.toggleClass('in');
1714+
1715+
// update the state of the expansion element
1716+
updateChevron($expansion, $collapse.hasClass('in'));
1717+
$listItem = $expansion.closest('.list-pf-item');
1718+
updateActive($listItem, $listItem.find('.collapse').first().hasClass('in'));
1719+
}
1720+
1721+
function updateActive ($listItem, expanded) {
1722+
// Find the closest .list-pf-item of the expansion, and set its "active" class
1723+
if (expanded) {
1724+
$listItem.addClass('active');
1725+
} else {
1726+
$listItem.removeClass('active');
1727+
}
1728+
}
1729+
1730+
function updateChevron ($expansion, expanded) {
1731+
var $chevron = $expansion.find('.list-pf-chevron .fa').first();
1732+
if (expanded) {
1733+
$chevron.removeClass('fa-angle-right');
1734+
$chevron.addClass('fa-angle-down');
1735+
} else {
1736+
$chevron.addClass('fa-angle-right');
1737+
$chevron.removeClass('fa-angle-down');
1738+
}
1739+
}
1740+
1741+
init(this);
1742+
1743+
return this;
1744+
};
1745+
}(jQuery));

npm-shrinkwrap.json

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"author": "Red Hat",
33
"name": "angular-patternfly",
4-
"version": "3.20.0",
4+
"version": "3.21.0",
55
"license": "Apache-2.0",
66
"description": "Angular extension of the PatternFly project.",
77
"keywords": ["angular", "patternfly"],
@@ -14,7 +14,7 @@
1414
"angular-sanitize": "1.3.0 - 1.5.*",
1515
"angular-ui-bootstrap": "0.14.x",
1616
"lodash": "3.x",
17-
"patternfly": "~3.20.0"
17+
"patternfly": "~3.21.0"
1818
},
1919
"devDependencies": {
2020
"express": "3.4.4",
@@ -44,7 +44,7 @@
4444
"karma-phantomjs-launcher": "^1.0.0",
4545
"matchdep": "0.3.0",
4646
"nsp": "^2.6.1",
47-
"patternfly-eng-release": "~3.20.0"
47+
"patternfly-eng-release": "~3.21.0"
4848
},
4949
"scripts": {
5050
"test": "grunt test"

0 commit comments

Comments
 (0)