Skip to content

Commit 4d7f9e6

Browse files
sg00dwinf0x11
authored andcommitted
Use existing event class to set padding top and left
Fixes openshift#2258
1 parent 7c4e4bd commit 4d7f9e6

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

dist/scripts/templates.js

+4
Original file line numberDiff line numberDiff line change
@@ -8382,7 +8382,11 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
83828382
"<ellipsis-pulser color=\"dark\" size=\"sm\" msg=\"Loading\" ng-if=\"!events\" class=\"events\"></ellipsis-pulser>\n" +
83838383
"<div ng-if=\"events\" class=\"events\">\n" +
83848384
"<div ng-if=\"!(events | hashSize)\" class=\"event\">\n" +
8385+
<<<<<<< eed768a10672b1ce9565159fa823c44f92a8d3b1
83858386
"<em translate>No events.</em>\n" +
8387+
=======
8388+
"<em>No events.</em>\n" +
8389+
>>>>>>> Use existing event class to set padding top and left
83868390
"</div>\n" +
83878391
"<div ng-repeat=\"event in events track by (event | uid)\" class=\"event animate-repeat\" ng-class=\"{'highlight': highlightedEvents[event.involvedObject.kind + '/' + event.involvedObject.name]}\">\n" +
83888392
"<span class=\"sr-only\">{{event.type}}</span>\n" +

0 commit comments

Comments
 (0)