logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: 8db70ffa8598b6ef143f6b6714e30fa9d08aa7d9
parent: 7ccbec217a11dea55a0b4f30ef1908be614b64df
Author: shpuld <shp@cock.li>
Date:   Thu, 12 Apr 2018 19:51:33 +0300

Fix missing border radii and read button text color

Diffstat:

Msrc/App.scss5+++++
Msrc/components/chat_panel/chat_panel.vue2+-
Msrc/components/notifications/notifications.scss11+++++++----
3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/App.scss b/src/App.scss @@ -274,6 +274,11 @@ main-router { background-color: var(--btn, $fallback--btn); } +.panel-heading.stub { + border-radius: $fallback--panelRadius; + border-radius: var(--panelRadius, $fallback--panelRadius); +} + .panel-footer { border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius; border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius); diff --git a/src/components/chat_panel/chat_panel.vue b/src/components/chat_panel/chat_panel.vue @@ -30,7 +30,7 @@ </div> <div v-else class="chat-panel"> <div class="panel panel-default"> - <div class="panel-heading panel-footer timeline-heading chat-heading" @click.stop.prevent="togglePanel"> + <div class="panel-heading stub timeline-heading chat-heading" @click.stop.prevent="togglePanel"> <div class="title"> {{$t('chat.title')}} <i class="icon-plus-squared" style="float: right;"></i> diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss @@ -27,10 +27,6 @@ right: 0.7em; height: 1.8em; line-height: 100%; - background-color: $fallback--btn; - background-color: var(--btn, $fallback--btn); - color: $fallback--faint; - color: var(--faint, $fallback--faint); } } @@ -196,7 +192,14 @@ } } + // ugly as heck &:last-child { border-bottom: none; + border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius; + border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius); + .status-el { + border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius; + border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius); + } } }