Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Vertically align close and kebab icons in notification drawer #2229

Merged
merged 1 commit into from Oct 10, 2017
Merged

Vertically align close and kebab icons in notification drawer #2229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 10 additions & 4 deletions app/styles/_notifications.less
View file
Open in desktop
Expand Up @@ -59,10 +59,16 @@ notification-drawer-wrapper {
}
.drawer-pf-notification-inner {
padding: 15px;
.pficon-close {
color: @color-pf-black-400;
&:hover,&:focus,&:active {
color: @color-pf-black-700;
.drawer-pf-notification-close {
margin-right: (@grid-gutter-width/(-4)); // vertically align with dropdown-kebab-pf
.pficon-close {
color: @gray-darker; // match dropdown-kebab-pf color
&:active,
&:focus,
&:hover
{
text-decoration: none;
}
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions app/views/directives/notifications/notification-body.html
View file
Open in desktop
Expand Up @@ -2,14 +2,14 @@
class="drawer-pf-notification-inner"
tabindex="0"
ng-click="$ctrl.customScope.markRead(notification)">
<a
class="pull-right"
href=""
<button
class="btn btn-link pull-right drawer-pf-notification-close"
type="button"
ng-if="!notification.actions.length"
ng-click="$ctrl.customScope.clear(notification, $index, notificationGroup)">
<span class="sr-only">Clear notification</span>
<span aria-hidden="true" class="pull-left pficon pficon-close"></span>
</a>
<span aria-hidden="true" class="pficon pficon-close"></span>
</button>
<div
uib-dropdown
class="dropdown pull-right dropdown-kebab-pf"
Expand Down
6 changes: 3 additions & 3 deletions dist/scripts/templates.js
View file
Open in desktop
Expand Up @@ -7719,10 +7719,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(

$templateCache.put('views/directives/notifications/notification-body.html',
"<div class=\"drawer-pf-notification-inner\" tabindex=\"0\" ng-click=\"$ctrl.customScope.markRead(notification)\">\n" +
"<a class=\"pull-right\" href=\"\" ng-if=\"!notification.actions.length\" ng-click=\"$ctrl.customScope.clear(notification, $index, notificationGroup)\">\n" +
"<button class=\"btn btn-link pull-right drawer-pf-notification-close\" type=\"button\" ng-if=\"!notification.actions.length\" ng-click=\"$ctrl.customScope.clear(notification, $index, notificationGroup)\">\n" +
"<span class=\"sr-only\">Clear notification</span>\n" +
"<span aria-hidden=\"true\" class=\"pull-left pficon pficon-close\"></span>\n" +
"</a>\n" +
"<span aria-hidden=\"true\" class=\"pficon pficon-close\"></span>\n" +
"</button>\n" +
"<div uib-dropdown class=\"dropdown pull-right dropdown-kebab-pf\" ng-if=\"notification.actions.length\">\n" +
"<button uib-dropdown-toggle class=\"btn btn-link dropdown-toggle\" type=\"button\" id=\"dropdownKebabRight-{{$id}}\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"true\">\n" +
"<span class=\"fa fa-ellipsis-v\"></span>\n" +
Expand Down
5 changes: 3 additions & 2 deletions dist/styles/main.css
View file
Open in desktop

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