Skip to content

Design fixes #89

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

Merged
jancborchardt merged 11 commits into from
Dec 19, 2017
Merged

Design fixes #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9f0fe0d
Remove line-height overwrite to make messages more readable
jancborchardt Aug 13, 2017
cc530e0
Remove border, fix scrollbar position
jancborchardt Aug 13, 2017
f059b32
Show notification message and action elements only when there, fix la…
jancborchardt Aug 13, 2017
8b04340
Use flex for individual notifications
Dec 14, 2017
1f53b80
Fix cursor on close icon
Dec 14, 2017
a3c4222
Fix margin for notifications that have no long-message text
Dec 15, 2017
2c6485c
Fix notifications order
Dec 15, 2017
a73e25f
Revert CSS fix for notification sorting
Dec 18, 2017
546ad03
Fix bottom border
Dec 18, 2017
c8174f1
Add padding-bottom to notifications
Dec 19, 2017
b541bf4
Fix indentation
Dec 19, 2017
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
91 changes: 27 additions & 64 deletions css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
.notification {
display: block;
padding: 16px 12px;
line-height: 1em;
}
.notification:not(:last-child) {
border-bottom: 1px solid rgb(238, 238, 238);
}

.notification-container {
background-color: #fff;
display: none;
Expand All @@ -18,7 +9,8 @@
min-height: 100px;
max-height: 260px;
border-radius: 0 0 3px 3px;
border: 1px solid rgb(238, 238, 238);
overflow: hidden;
overflow-y: auto;

@MorrisJobke MorrisJobke Dec 20, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving this here from the .notification-wrapper hides the drop shadow as well as the little caret in Safari. Let me fix that.

@MorrisJobke MorrisJobke Dec 20, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix is in #106

}

.notification-container .emptycontent h2 {
Expand All @@ -27,35 +19,22 @@
}

.notification {
color: black;
position: relative;
clear: both;
padding-bottom: 12px;
}

img.notification-icon {
width: 32px;
height: 32px;
display: block;
.notification:not(:last-child) {
border-bottom: 1px solid rgb(238, 238, 238);
}

/**
* Vertical alignment from http://stackoverflow.com/a/39923209
*/
.notification-heading,
.notification-subject {
padding-top: 12px;
position: relative;
}

.notification-subject a {
display: inline-block;
display: flex;
}

.notification-subject > span.image,
.notification-subject > span.text,
.notification-subject > a > span.image,
.notification-subject > a > span.text {
display:table-cell;
vertical-align:middle;
img.notification-icon {
width: 32px;
height: 32px;
display: flex;
}

.notification-subject > span.text,
Expand All @@ -67,30 +46,22 @@ img.notification-icon {
color: #999;
}

.notification:hover > .notification-delete {
display: block !important;
position: absolute;
top: 7px;
right: 12px;
opacity: 0.3;
}

.notification-delete:hover {
opacity: 0.8 !important;
cursor: pointer;
.notification-delete {
display: flex;
opacity: 0.5;
padding: 14px;
}

.notification-delete div, .notifications-button img {
.notification-delete:hover,
.notification-delete .icon-close,
.notifications-button img {
opacity: 1;
cursor: pointer;
}

.notification-time {
text-align: right;
opacity: 0.5;
padding-right: 32px;
margin-top: -7px;
position: absolute;
right: 0;
margin: 13px 0 13px auto;
}

.notifications-button {
Expand Down Expand Up @@ -118,11 +89,11 @@ img.notification-icon {
margin: 0;
}

.notification-subject,
.notification .notification-message,
.notification .notification-full-message,
.notification .notification-actions {
padding: 0;
display: inline-block;
width: 100%;
margin: -6px 0;
margin: 0 12px 12px;
}

.notification .notification-actions .action-button.primary {
Expand All @@ -133,14 +104,9 @@ img.notification-icon {
margin-left: auto;
}

.notification .notification-subject {
margin-right: 20px;
}

.notification .notification-message,
.notification .notification-full-message {
line-height: 20px;
padding-bottom: 16px;
opacity: .57;
}

Expand All @@ -158,8 +124,7 @@ img.notification-icon {
margin: 0 5px 2px 3px;
}

.notification strong,
.notification .notification-subject a:not(.full-subject-link) {
.notification strong {
font-weight: bold;
opacity: 1;
}
Expand All @@ -170,10 +135,8 @@ img.notification-icon {
}

.notification-wrapper {
max-height: 260px;
overflow: hidden;
overflow-y: auto;
margin-right: 3px;
display: flex;
flex-direction: column;
}

.notifications .emptycontent {
Expand Down
26 changes: 13 additions & 13 deletions js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,31 +52,31 @@
/** @type {string} */
_notificationTemplate: '' +
'<div class="notification" data-id="{{notification_id}}" data-timestamp="{{timestamp}}">' +
' <span class="notification-time has-tooltip live-relative-timestamp" data-timestamp="{{timestamp}}" title="{{absoluteDate}}">{{relativeDate}}</span>' +
' {{#if link}}' +
' <div class="notification-subject">' +
' <a href="{{link}}" class="full-subject-link">' +
' {{#if icon}}<span class="image"><img src="{{icon}}" class="notification-icon"></span>{{/if}}' +
' <span class="text">{{{subject}}}</span>' +
' </a>' +
' <div class="notification-heading">' +
' <span class="notification-time has-tooltip live-relative-timestamp" data-timestamp="{{timestamp}}" title="{{absoluteDate}}">{{relativeDate}}</span>' +
' <div class="notification-delete">' +
' <span class="icon icon-close svg" title="' + t('notifications', 'Dismiss') + '"></span>' +
' </div>' +
' </div>' +
' {{#if link}}' +
' <a href="{{link}}" class="notification-subject full-subject-link">' +
' {{#if icon}}<span class="image"><img src="{{icon}}" class="notification-icon"></span>{{/if}}' +
' <span class="text">{{{subject}}}</span>' +
' </a>' +
' {{else}}' +
' <div class="notification-subject">' +
' {{#if icon}}<span class="image"><img src="{{icon}}" class="notification-icon"></span>{{/if}}' +
' <span class="text">{{{subject}}}</span>' +
' </div>' +
' {{/if}}' +
' <div class="notification-message">{{{message}}}</div>' +
' {{#if message}}<div class="notification-message">{{{message}}}</div>{{/if}}' +
' <div class="notification-full-message hidden">{{{full_message}}}</div>' +
' <div class="notification-actions">' +
' {{#if actions}}<div class="notification-actions">' +
' {{#each actions}}' +
' <button class="action-button pull-right{{#if this.primary}} primary{{/if}}" data-type="{{this.type}}" ' +
'data-href="{{this.link}}">{{this.label}}</button>' +
' {{/each}}' +
' </div>' +
' <div style="display: none;" class="notification-delete">' +
' <div class="icon icon-close svg" title="' + t('notifications', 'Dismiss') + '"></div>' +
' </div>' +
' </div>{{/if}}' +
'</div>',

/**
Expand Down