Skip to content

Commit ee9500a

Browse files
author
erundle
committed
Fixing outdated notifications icons
1 parent b04b064 commit ee9500a

File tree

6 files changed

+11
-23
lines changed

6 files changed

+11
-23
lines changed

dist/angular-patternfly.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ angular.module( 'patternfly.charts' )
543543
'used': '670',
544544
'total': '1000'
545545
};
546-
}]);
546+
}]);
547547
</file>
548548
</example>
549549
*/
@@ -2195,7 +2195,7 @@ angular.module('patternfly.validation', []).directive('pfValidation', function (
21952195

21962196

21972197
$templateCache.put('notification/notification.html',
2198-
"<div class=\"alert alert-{{pfNotificationType}}\"><button ng-show=pfNotificationPersistent type=button class=close ng-click=$parent.notifications.remove($index)><span aria-hidden=true>&times;</span><span class=sr-only>Close</span></button> <span class=\"pficon pficon-ok\" ng-show=\"pfNotificationType == 'success'\"></span> <span class=\"pficon pficon-info\" ng-show=\"pfNotificationType == 'info'\"></span> <span class=pficon-layered ng-show=\"pfNotificationType == 'danger'\"><span class=\"pficon pficon-error-octagon\"></span> <span class=\"pficon pficon-error-exclamation\"></span></span> <span class=pficon-layered ng-show=\"pfNotificationType == 'warning'\"><span class=\"pficon pficon-warning-triangle\"></span> <span class=\"pficon pficon-warning-exclamation\"></span></span> <strong>{{pfNotificationHeader}}</strong> {{pfNotificationMessage}}</div>"
2198+
"<div class=\"alert alert-{{pfNotificationType}}\"><button ng-show=pfNotificationPersistent type=button class=close ng-click=$parent.notifications.remove($index)><span aria-hidden=true>&times;</span><span class=sr-only>Close</span></button> <span class=\"pficon pficon-ok\" ng-show=\"pfNotificationType === 'success'\"></span> <span class=\"pficon pficon-info\" ng-show=\"pfNotificationType === 'info'\"></span> <span class=\"pficon pficon-error-circle-o\" ng-show=\"pfNotificationType === 'danger'\"></span> <span class=\"pficon pficon-warning-triangle-o\" ng-show=\"pfNotificationType === 'warning'\"></span> <strong>{{pfNotificationHeader}}</strong> {{pfNotificationMessage}}</div>"
21992199
);
22002200

22012201
}]);

dist/angular-patternfly.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"grunt-eslint": "^17.1.0",
2222
"grunt-htmlhint": "0.4.1",
2323
"grunt-karma": "0.8.3",
24-
"grunt-ngdocs": "0.2.5",
24+
"grunt-ngdocs": "0.2.9",
2525
"karma": "0.12.23",
2626
"karma-chrome-launcher": "0.1.4",
2727
"karma-firefox-launcher": "0.1.3",

src/charts/donut/donut-pct-chart-directive.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ angular.module( 'patternfly.charts' )
207207
'used': '670',
208208
'total': '1000'
209209
};
210-
}]);
210+
}]);
211211
</file>
212212
</example>
213213
*/

src/notification/notification.html

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,9 @@
44
<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
55
</button>
66

7-
<span class="pficon pficon-ok" ng-show="pfNotificationType == 'success'"></span>
8-
<span class="pficon pficon-info" ng-show="pfNotificationType == 'info'"></span>
9-
<span class="pficon-layered" ng-show="pfNotificationType == 'danger'">
10-
<span class="pficon pficon-error-octagon"></span>
11-
<span class="pficon pficon-error-exclamation"></span>
12-
</span>
13-
<span class="pficon-layered" ng-show="pfNotificationType == 'warning'">
14-
<span class="pficon pficon-warning-triangle"></span>
15-
<span class="pficon pficon-warning-exclamation"></span>
16-
</span>
7+
<span class="pficon pficon-ok" ng-show="pfNotificationType === 'success'"></span>
8+
<span class="pficon pficon-info" ng-show="pfNotificationType === 'info'"></span>
9+
<span class="pficon pficon-error-circle-o" ng-show="pfNotificationType === 'danger'"></span>
10+
<span class="pficon pficon-warning-triangle-o" ng-show="pfNotificationType === 'warning'"></span>
1711
<strong>{{pfNotificationHeader}}</strong> {{pfNotificationMessage}}
1812
</div>

test/notification/notification.spec.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,8 @@ describe('pf-notification', function () {
7979
var alertElement = angular.element(notifyElement.children().get(0));
8080
var iconOk = angular.element(alertElement.find('span.pficon-ok'));
8181
var iconInfo = angular.element(alertElement.find('span.pficon-info'));
82-
var iconError = angular.element(alertElement.find('span.pficon-layered').get(0));
83-
var iconWarning = angular.element(alertElement.find('span.pficon-layered').get(1));
84-
85-
var iE = iconError.find('span.pficon-error-octagon');
86-
var iW = iconWarning.find('span.pficon-warning-triangle');
87-
88-
expect(iE[0]).toBeTruthy();
89-
expect(iW[0]).toBeTruthy();
82+
var iconError = angular.element(alertElement.find('span.pficon-error-circle-o'));
83+
var iconWarning = angular.element(alertElement.find('span.pficon-warning-triangle-o'));
9084

9185
expect(alertElement.text()).toContain('×Close');
9286
expect(alertElement.text()).toContain('head1 defaultMes');

0 commit comments

Comments
 (0)