Skip to content

Commit 724d76d

Browse files
Merge pull request #2483 from spadgett/notification-body-wrapping
Automatic merge from submit-queue. Prevent hyphen from wrapping first to new line in drawer In the notification drawer title, prevent the `--` from wrapping by itself to the new line. Before: ![openshift web console 2017-11-08 14-11-10](https://user-images.githubusercontent.com/1167259/32569556-6c583686-c48f-11e7-9558-93f04788c961.png) After: ![openshift web console 2017-11-08 14-16-48](https://user-images.githubusercontent.com/1167259/32569578-7b8655de-c48f-11e7-96b3-4f8fa0d91223.png) /kind bug /assign @jwforres
2 parents fa595c0 + ed61498 commit 724d76d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Diff for: app/views/directives/notifications/notification-body.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<div>
5656

5757
<span ng-if="notification.event.reason">
58-
{{notification.event.reason | humanize}} &mdash; <span ng-if="notification.event.involvedObject">{{notification.event.involvedObject.kind | humanizeKind : true}}</span>
58+
{{notification.event.reason | humanize}}&nbsp;&mdash; <span ng-if="notification.event.involvedObject">{{notification.event.involvedObject.kind | humanizeKind : true}}</span>
5959
</span>
6060

6161
<span

Diff for: dist/scripts/templates.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7937,7 +7937,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
79377937
"<div class=\"drawer-pf-notification-message word-break\" ng-attr-title=\"{{notification.event.message}}\">\n" +
79387938
"<div>\n" +
79397939
"<span ng-if=\"notification.event.reason\">\n" +
7940-
"{{notification.event.reason | humanize}} &mdash; <span ng-if=\"notification.event.involvedObject\">{{notification.event.involvedObject.kind | humanizeKind : true}}</span>\n" +
7940+
"{{notification.event.reason | humanize}}&nbsp;&mdash; <span ng-if=\"notification.event.involvedObject\">{{notification.event.involvedObject.kind | humanizeKind : true}}</span>\n" +
79417941
"</span>\n" +
79427942
"<span ng-if=\"notification.event.involvedObject\" ng-init=\"eventObjUrl = (notification.event | navigateEventInvolvedObjectURL)\">\n" +
79437943
"<a ng-if=\"eventObjUrl\" ng-attr-title=\"Navigate to {{notification.event.involvedObject.name}}\" href=\"{{eventObjUrl}}\" ng-click=\"$ctrl.customScope.close()\">\n" +

0 commit comments

Comments
 (0)