commit: 0ce747d2c3fb20affb03a0ce102caeb15b84032a parent: 64d71b75cfed41d82a99e3e478fc75d5f81f84bd Author: lambadalambda <gitgud@rogerbraun.net> Date: Thu, 9 Mar 2017 07:43:59 -0500 Merge branch 'feature/borders-pleasing-to-the-eye' into 'develop' Feature/borders pleasing to the eye See merge request !56Diffstat:
7 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue @@ -1,7 +1,7 @@ <template> <div class="nav-panel"> <div class="panel panel-default base02-background"> - <ul> + <ul class="base03-border"> <li v-if='currentUser'> <router-link class="base01-background" to='/main/friends'> Timeline @@ -38,6 +38,7 @@ .nav-panel li { border-bottom: 1px solid; + border-color: inherit; padding: 0; &:first-child a { border-top-right-radius: 10px; diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss @@ -33,7 +33,8 @@ // which does not happen with 10px vs 4px + 6px. padding: 0.4em 0 0 10px; display: flex; - border-bottom: 1px solid silver; + border-bottom: 1px solid; + border-bottom-color: inherit; .text { diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue @@ -6,7 +6,7 @@ Notifications <button @click.prevent="markAsSeen" class="base06 base02-background read-button">Read!</button> </div> - <div class="panel-body"> + <div class="panel-body base03-border"> <div v-for="notification in visibleNotifications" class="notification" :class='{"unseen": !notification.seen}'> <a :href="notification.action.user.statusnet_profile_url"> <img class='avatar' :src="notification.action.user.profile_image_url_original"> diff --git a/src/components/status/status.js b/src/components/status/status.js @@ -32,7 +32,12 @@ const Status = { return !!this.$store.state.users.currentUser }, 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: { Attachment, diff --git a/src/components/status/status.vue b/src/components/status/status.vue @@ -1,5 +1,5 @@ <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"> <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> @@ -98,6 +98,7 @@ overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; + border-left-width: 0px; .user-content { min-height: 52px; @@ -129,7 +130,7 @@ } .expanded-status { - border-left: 4px solid rgba(255, 48, 16, 0.65); + border-left-style: solid; } .status-actions { @@ -151,6 +152,9 @@ .status { padding: 0.65em 0.7em 0.8em 0.8em; border-bottom: 1px solid; + border-bottom-color: inherit; + border-left: 4px rgba(255, 48, 16, 0.65); + border-left-style: inherit; } .muted button { margin-left: auto; diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue @@ -18,9 +18,9 @@ <div class="timeline"> <status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status-or-conversation> <a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading"> - <div class="base01-background base05-border new-status-notification text-center">Load older statuses.</div> + <div class="base01-background base03-border new-status-notification text-center">Load older statuses.</div> </a> - <div class="base01-background base05-border new-status-notification text-center" v-else>...</div> + <div class="base01-background base03-border new-status-notification text-center" v-else>...</div> </div> </div> </div> diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js @@ -45,6 +45,7 @@ const setStyle = (href, commit) => { styleSheet.insertRule(`a { color: ${colors['base08']}`, 'index-max') styleSheet.insertRule(`body { 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' } cssEl.addEventListener('load', setDynamic)