Skip to content

Commit 31924e3

Browse files
jeff-phillips-18cdcabrera
authored andcommitted
Bump patternfly version to 3.31.1 (#689)
This patternfly version includes SASS support. Fixes for wizard and accordion to work with this version of patternfly
1 parent ea8a779 commit 31924e3

File tree

6 files changed

+19
-12
lines changed

6 files changed

+19
-12
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"angular-bootstrap": "0.14.x",
4545
"lodash": "3.x",
4646
"jquery": "2.x",
47-
"patternfly": "~3.25.0"
47+
"patternfly": "~3.31.1"
4848
},
4949
"devDependencies": {
5050
"angular-mocks": "1.3.0 - 1.5.*",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"angular-ui-bootstrap": "0.14.x",
1919
"jquery": "^2.2.4",
2020
"lodash": "3.x",
21-
"patternfly": "~3.25.0"
21+
"patternfly": "~3.31.1"
2222
},
2323
"devDependencies": {
2424
"express": "3.4.4",

src/wizard/wizard-directive.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@
6464
</div>
6565
<div pf-wizard-substep step-title="Details - Extra" next-enabled="true" step-id="details-extra" step-priority="1" show-review="true" show-review-details="true" review-template="review-second-template.html">
6666
<form class="form-horizontal">
67-
<div pf-form-group pf-label="Lorem" required>
67+
<div pf-form-group pf-label="Lorem" pf-label-class="col-sm-3 col-md-2" pf-input-class="col-sm-9 col-md-10" required>
6868
<input id="new-lorem" name="lorem" ng-model="data.lorem" type="text" required/>
6969
</div>
70-
<div pf-form-group pf-label="Ipsum">
70+
<div pf-form-group pf-label="Ipsum" pf-label-class="col-sm-3 col-md-2" pf-input-class="col-sm-9 col-md-10">
7171
<input id="new-ipsum" name="ipsum" ng-model="data.ipsum" type="text" />
7272
</div>
7373
</form>
@@ -76,10 +76,10 @@
7676
<div pf-wizard-step step-title="Second Step" substeps="false" step-id="configuration" step-priority="1" show-review="true" review-template="review-second-template.html" >
7777
<form class="form-horizontal">
7878
<h3>Wizards should make use of substeps consistently throughout (either using them or not using them). This is an example only.</h3>
79-
<div pf-form-group pf-label="Lorem">
79+
<div pf-form-group pf-label="Lorem" pf-label-class="col-sm-3 col-md-2" pf-input-class="col-sm-9 col-md-10">
8080
<input id="new-lorem" name="lorem" ng-model="data.lorem" type="text"/>
8181
</div>
82-
<div pf-form-group pf-label="Ipsum">
82+
<div pf-form-group pf-label="Ipsum" pf-label-class="col-sm-3 col-md-2" pf-input-class="col-sm-9 col-md-10">
8383
<input id="new-ipsum" name="ipsum" ng-model="data.ipsum" type="text" />
8484
</div>
8585
</form>
@@ -94,10 +94,10 @@
9494
<div ng-controller="DetailsGeneralController">
9595
<div pf-wizard-substep step-title="General" next-enabled="detailsGeneralComplete" step-id="details-general" step-priority="0" on-show="onShow" review-template="{{reviewTemplate}}" show-review-details="true">
9696
<form class="form-horizontal">
97-
<div pf-form-group pf-label="Name" required>
97+
<div pf-form-group pf-label="Name" pf-label-class="col-sm-3 col-md-2" pf-input-class="col-sm-9 col-md-10" required>
9898
<input id="new-name" name="name" ng-model="data.name" type="text" ng-change="updateName()" required/>
9999
</div>
100-
<div pf-form-group pf-label="Description">
100+
<div pf-form-group pf-label="Description" pf-label-class="col-sm-3 col-md-2" pf-input-class="col-sm-9 col-md-10">
101101
<input id="new-description" name="description" ng-model="data.description" type="text" />
102102
</div>
103103
</form>

src/wizard/wizard-step.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<section ng-show="selected" ng-class="{current: selected, done: completed}">
1+
<section ng-show="selected" class="wizard-pf-row" ng-class="{current: selected, done: completed}" style="height: inherit;">
22
<div ng-if="!wizard.hideSidebar" class="wizard-pf-sidebar" ng-style="contentStyle" ng-class="wizard.sidebarClass" ng-if="substeps === true">
33
<ul class="list-group">
44
<li class="list-group-item" ng-class="{active: step.selected}" ng-repeat="step in getEnabledSteps()">

src/wizard/wizard.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<div>
22
<div class="modal-header" ng-if="!hideHeader">
3-
<button type="button" class="close wizard-pf-dismiss" aria-label="Close" ng-click="onCancel()" ng-if="!embedInPage">
4-
<span aria-hidden="true">&times;</span>
3+
<button type="button" class="close wizard-pf-dismiss" aria-hidden="true" aria-label="Close" ng-click="onCancel()" ng-if="!embedInPage">
4+
<span class="pficon pficon-close"></span>
55
</button>
6-
<dt class="modal-title">{{title}}</dt>
6+
<h4 class="modal-title">{{title}}</h4>
77
</div>
88
<div class="modal-body wizard-pf-body clearfix">
99
<!-- step area -->
@@ -13,6 +13,7 @@
1313
<a ng-click="stepClick(step)" ng-class="{'disabled': !allowStepIndicatorClick(step)}">
1414
<span class="wizard-pf-step-number">{{$index + 1}}</span>
1515
<span class="wizard-pf-step-title">{{step.title}}</span>
16+
<span class="wizard-pf-step-title-substep" ng-repeat="substep in step.steps track by $index" ng-class="{'active': substep.selected}">{{substep.title}}</span>
1617
</a>
1718
</li>
1819
</ul>

styles/angular-patternfly.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,12 @@ accordion > .panel-group .panel-default .panel-title > a:before {
426426
accordion > .panel-group .panel-open .panel-title > a:before {
427427
content: "\f107";
428428
}
429+
uib-accordion > .panel-group .panel-default .panel-title > a:before {
430+
content: "\f105";
431+
}
432+
uib-accordion > .panel-group .panel-open .panel-title > a:before {
433+
content: "\f107";
434+
}
429435

430436
.navbar-brand-txt {
431437
line-height: 34px;

0 commit comments

Comments
 (0)