Skip to content

Commit

Permalink
Merge pull request #2333 from spadgett/instance-failed-help-icon
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

Consistent cursor style for instance failed tooltip

Use the same styles and markup structure as other overview list rows so that the cursor is the help icon when hovering over any tooltip message.
  • Loading branch information
openshift-merge-robot committed Oct 23, 2017
2 parents b2c1cf1 + d4e43d2 commit c74e141
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 21 deletions.
21 changes: 11 additions & 10 deletions app/styles/_overview.less
Expand Up @@ -29,6 +29,17 @@
margin-top: 5px;
}
}
.instance-status-notification,
.notification-icon-count {
display: inline-block;
margin: 5px 5px 0 0;
@media (min-width: @screen-md-min) {
margin-top: 0;
}
[data-toggle="tooltip"] {
cursor: help;
}
}
.mini-donut-link {
color: @gray-darker;
&:active,
Expand Down Expand Up @@ -63,16 +74,6 @@
}
}
}
.notification-icon-count {
display: inline-block;
margin: 5px 5px 0 0;
@media (min-width: @screen-md-min) {
margin-top: 0;
}
[data-toggle="tooltip"] {
cursor: help;
}
}

.overview {
.app-heading {
Expand Down
7 changes: 3 additions & 4 deletions app/views/overview/_service-instance-row.html
Expand Up @@ -11,14 +11,13 @@ <h3>
</h3>
<div class="status-icons" ng-if="!row.expanded">
<notification-icon alerts="row.notifications"></notification-icon>
<div ng-switch="row.instanceStatus">
<div ng-switch="row.instanceStatus" class="instance-status-notification">
<span ng-switch-when="failed"
dynamic-content="{{row.apiObject | serviceInstanceFailedMessage}}"
data-toggle="tooltip"
data-trigger="hover"
class="notification-icon-count">
data-trigger="hover">
<span class="pficon pficon-error-circle-o" aria-hidden="true"></span>
<span>Error</span>
Error
</span>
<span ng-switch-when="deleted" class="notification-icon-count">
<span class="pficon pficon-warning-triangle-o" aria-hidden="true"></span>
Expand Down
6 changes: 3 additions & 3 deletions dist/scripts/templates.js
Expand Up @@ -12521,10 +12521,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</h3>\n" +
"<div class=\"status-icons\" ng-if=\"!row.expanded\">\n" +
"<notification-icon alerts=\"row.notifications\"></notification-icon>\n" +
"<div ng-switch=\"row.instanceStatus\">\n" +
"<span ng-switch-when=\"failed\" dynamic-content=\"{{row.apiObject | serviceInstanceFailedMessage}}\" data-toggle=\"tooltip\" data-trigger=\"hover\" class=\"notification-icon-count\">\n" +
"<div ng-switch=\"row.instanceStatus\" class=\"instance-status-notification\">\n" +
"<span ng-switch-when=\"failed\" dynamic-content=\"{{row.apiObject | serviceInstanceFailedMessage}}\" data-toggle=\"tooltip\" data-trigger=\"hover\">\n" +
"<span class=\"pficon pficon-error-circle-o\" aria-hidden=\"true\"></span>\n" +
"<span>Error</span>\n" +
"Error\n" +
"</span>\n" +
"<span ng-switch-when=\"deleted\" class=\"notification-icon-count\">\n" +
"<span class=\"pficon pficon-warning-triangle-o\" aria-hidden=\"true\"></span>\n" +
Expand Down
8 changes: 4 additions & 4 deletions dist/styles/main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c74e141

Please sign in to comment.