fristi/pleroma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Packages Projects Releases Wiki Activity

Make style setter create an often used base03-border class, use that class in notifications, navpanel and statuses.

Browse source
This commit is contained in:
shpuld 2017-03-09 01:09:23 +02:00
parent 5997492795
commit 6c8fc99d5a
6 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/nav_panel/nav_panel.vue
View file

@ -1,7 +1,7 @@
<template> <template>
<div class="nav-panel"> <div class="nav-panel">
<div class="panel panel-default base01-background"> <div class="panel panel-default base01-background">
<ul> <ul class="base03-border">
<li v-if='currentUser'> <li v-if='currentUser'>
<router-link to='/main/friends'> <router-link to='/main/friends'>
Timeline Timeline
@ -39,6 +39,7 @@
.nav-panel li { .nav-panel li {
border-bottom: 1px solid; border-bottom: 1px solid;
border-color: inherit;
padding: 0.8em 0.85em; padding: 0.8em 0.85em;
} }

3
src/components/notifications/notifications.scss
View file

@ -33,7 +33,8 @@
// which does not happen with 10px vs 4px + 6px. // which does not happen with 10px vs 4px + 6px.
padding: 0.4em 0 0 10px; padding: 0.4em 0 0 10px;
display: flex; display: flex;
border-bottom: 1px solid silver; border-bottom: 1px solid;
border-bottom-color: inherit;
.text { .text {

2
src/components/notifications/notifications.vue
View file

@ -6,7 +6,7 @@
Notifications Notifications
<button @click.prevent="markAsSeen" class="base06 base02-background read-button">Read!</button> <button @click.prevent="markAsSeen" class="base06 base02-background read-button">Read!</button>
</div> </div>
<div class="panel-body"> <div class="panel-body base03-border">
<div v-for="notification in visibleNotifications" class="notification" :class='{"unseen": !notification.seen}'> <div v-for="notification in visibleNotifications" class="notification" :class='{"unseen": !notification.seen}'>
<a :href="notification.action.user.statusnet_profile_url"> <a :href="notification.action.user.statusnet_profile_url">
<img class='avatar' :src="notification.action.user.profile_image_url_original"> <img class='avatar' :src="notification.action.user.profile_image_url_original">

7
src/components/status/status.js
View file

@ -32,7 +32,12 @@ const Status = {
return !!this.$store.state.users.currentUser return !!this.$store.state.users.currentUser
}, },
muted () { return !this.unmuted && this.status.user.muted }, muted () { return !this.unmuted && this.status.user.muted },
isReply () { return !!this.status.in_reply_to_status_id } isReply () { return !!this.status.in_reply_to_status_id },
borderColor () {
return {
borderBottomColor: this.$store.state.config.colors['base02'],
}
}
}, },
components: { components: {
Attachment, Attachment,

8
src/components/status/status.vue
View file

@ -1,5 +1,5 @@
<template> <template>
<div class="status-el base00-background" v-if="!status.deleted" v-bind:class="[{ 'expanded-status': !expandable }, { 'base01-background': focused }]"> <div class="status-el base00-background base03-border" v-if="!status.deleted" v-bind:class="[{ 'expanded-status': !expandable }, { 'base01-background': focused }]" >
<template v-if="muted"> <template v-if="muted">
<div class="media status container muted"> <div class="media status container muted">
<small><router-link :to="{ name: 'user-profile', params: { id: status.user.id } }">{{status.user.screen_name}}</router-link></small> <small><router-link :to="{ name: 'user-profile', params: { id: status.user.id } }">{{status.user.screen_name}}</router-link></small>
@ -98,6 +98,7 @@
overflow-wrap: break-word; overflow-wrap: break-word;
word-wrap: break-word; word-wrap: break-word;
word-break: break-word; word-break: break-word;
border-left-width: 0px;
.user-content { .user-content {
min-height: 52px; min-height: 52px;
@ -129,7 +130,7 @@
} }
.expanded-status { .expanded-status {
border-left: 4px solid rgba(255, 48, 16, 0.65); border-left-style: solid;
} }
.status-actions { .status-actions {
@ -151,6 +152,9 @@
.status { .status {
padding: 0.65em 0.7em 0.8em 0.8em; padding: 0.65em 0.7em 0.8em 0.8em;
border-bottom: 1px solid; border-bottom: 1px solid;
border-bottom-color: inherit;
border-left: 4px rgba(255, 48, 16, 0.65);
border-left-style: inherit;
} }
.muted button { .muted button {
margin-left: auto; margin-left: auto;

1
src/services/style_setter/style_setter.js
View file

@ -45,6 +45,7 @@ const setStyle = (href, commit) => {
styleSheet.insertRule(`a { color: ${colors['base08']}`, 'index-max') styleSheet.insertRule(`a { color: ${colors['base08']}`, 'index-max')
styleSheet.insertRule(`body { color: ${colors['base05']}`, 'index-max') styleSheet.insertRule(`body { color: ${colors['base05']}`, 'index-max')
styleSheet.insertRule(`.base05-border { border-color: ${colors['base05']}`, 'index-max') styleSheet.insertRule(`.base05-border { border-color: ${colors['base05']}`, 'index-max')
styleSheet.insertRule(`.base03-border { border-color: ${colors['base03']}`, 'index-max')
body.style.display = 'initial' body.style.display = 'initial'
} }
cssEl.addEventListener('load', setDynamic) cssEl.addEventListener('load', setDynamic)