diff options
| author | Shpuld Shpuldson <shpuld@gmail.com> | 2017-03-06 16:55:48 -0500 |
|---|---|---|
| committer | Shpuld Shpuldson <shpuld@gmail.com> | 2017-03-06 16:55:48 -0500 |
| commit | 34531de8c027472266c050183ef9ae82ff57643f (patch) | |
| tree | 3add80e92d3bf4db289c0e667fda8c5c336c9cdc /src/components/notifications | |
| parent | 990047725a4f6c7bbda1e7519a605b1ae1ece51e (diff) | |
| parent | a4ebf44f242fd877506dcdadf035840168e16364 (diff) | |
Merge branch 'fix/overlapping-styles-user-card' into 'develop'
Fix overlapping styles in timeline and notifications that screwed up user-card.
See merge request !44
Diffstat (limited to 'src/components/notifications')
| -rw-r--r-- | src/components/notifications/notifications.scss | 2 | ||||
| -rw-r--r-- | src/components/notifications/notifications.vue | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss index 1378e730..8e3e0721 100644 --- a/src/components/notifications/notifications.scss +++ b/src/components/notifications/notifications.scss @@ -6,7 +6,7 @@ // force the text to stay centered, while keeping // the button in the right side of the panel heading position: relative; - button { + .read-button { position: absolute; padding: 0.1em 0.3em 0.25em 0.3em; right: 0.7em; diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue index 180b86a1..e0dcb12d 100644 --- a/src/components/notifications/notifications.vue +++ b/src/components/notifications/notifications.vue @@ -3,7 +3,7 @@ <div class="panel panel-default base00-background"> <div class="panel-heading base01-background base04"> Notifications ({{unseenCount}}) - <button @click.prevent="markAsSeen" class="base06 base02-background">Read!</button> + <button @click.prevent="markAsSeen" class="base06 base02-background read-button">Read!</button> </div> <div class="panel-body"> <div v-for="notification in visibleNotifications" class="notification" :class='{"unseen": !notification.seen}'> |