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

[stable10] Fix style of notification #11

Merged
merged 3 commits into from
Aug 11, 2016
Merged

[stable10] Fix style of notification #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e4f520
Fix style of notification
MorrisJobke Aug 10, 2016
3679eeb
Notification text color and close button position
MorrisJobke Aug 10, 2016
f48fa4f
Increase line-height a bit
MorrisJobke Aug 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.notification {
display: block;
padding: 7px 15px 50px 15px;
line-height: 1.75em;
}
.notification:not(:last-child) {
border-bottom: 1px solid rgb(238, 238, 238);
Expand Down Expand Up @@ -44,15 +45,11 @@
.notification:hover > .notification-delete{
display: block !important;
position: absolute;
top: 4px;
right: 9px;
top: 7px;
right: 14px;
opacity: 0.3;
}

.notification:hover {
background-color: #f8f8f8;
}

.notification-delete:hover {
opacity: 0.8 !important;
cursor: pointer;
Expand Down Expand Up @@ -95,13 +92,21 @@
padding: 0;
}

.notification .notification-actions .action-button.primary{
color: #fff;
}

.notification .notification-actions:first-child {
margin-left: auto;
}

.notification .notification-subject {
display: inline-block;
margin-right: 10px;
opacity: .57;
}
.notification .notification-subject:hover {
opacity: 1;
}

.notification .notification-message {
Expand Down
2 changes: 1 addition & 1 deletion js/notification.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
_.each(actionsData, function(actionData) {
// FIXME: use handlebars template
actions.append(
'<button class="action-button' + (actionData.primary ? ' primary': '') + '" data-type="' + escapeHTML(actionData.type) + '" ' +
'<button class="action-button' + (actionData.primary ? ' primary pull-right': '') + '" data-type="' + escapeHTML(actionData.type) + '" ' +
'data-href="'+escapeHTML(actionData.link)+'">'+escapeHTML(actionData.label)+'</button>'
);
// TODO create event handler on click for given action type
Expand Down