commit: c7f5f3f59512ea7eb389d9c1543dabe6cfdda55e
parent: 58135410063477e708e0dca090a67fe6a3e6b4c4
Author: Shpuld Shpludson <shp@cock.li>
Date: Sun, 12 Nov 2017 22:41:31 +0000
Merge branch 'css-fixes-and-updates' into 'develop'
Css fixes and updates
See merge request pleroma/pleroma-fe!150
Diffstat:
6 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/src/App.scss b/src/App.scss
@@ -127,6 +127,14 @@ main-router {
margin: 0.5em;
border-radius: 10px;
+ box-shadow: 1px 1px 3px rgba(0,0,0,.5);
+}
+
+.panel-body:empty::before {
+ content: "¯\\_(ツ)_/¯"; // Could use words but it'd require translations
+ display: block;
+ margin: 20px;
+ text-align: center;
}
.panel-heading {
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
@@ -39,6 +39,16 @@
margin: 0.5em 0.7em 0.6em 0.0em;
align-self: flex-start;
+ border-style: solid;
+ border-width: 1px;
+ border-radius: 5px;
+ overflow: hidden;
+
+ // fixes small gap below video
+ &.video {
+ line-height: 0;
+ }
+
&.html {
flex-basis: 100%;
display: flex;
@@ -53,7 +63,6 @@
margin: 10px;
padding: 5px;
background: rgba(230,230,230,0.6);
- border-radius: 5px;
font-weight: bold;
z-index: 4;
}
@@ -61,8 +70,6 @@
video {
max-height: 500px;
height: 100%;
- border: 1px solid;
- border-radius: 5px;
width: 100%;
z-index: 0;
}
@@ -75,14 +82,9 @@
width: 100%;
height: 100%;
flex: 1;
- border: 1px solid;
- border-radius: 5px;
}
.oembed {
- border: 1px solid;
- border-radius: 5px;
- border-color: inherit;
width: 100%;
margin-right: 15px;
display: flex;
@@ -117,9 +119,6 @@
flex: 1;
img {
- border-style: solid;
- border-width: 1px;
- border-radius: 5px;
object-fit: contain;
width: 100%;
height: 100%; /* If this isn't here, chrome will stretch the images */
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
@@ -1,5 +1,5 @@
<template>
- <div class="timeline panel panel-default base00-background">
+ <div class="timeline panel panel-default">
<div class="panel-heading base01-background base04 base03-border conversation-heading">
{{ $t('timeline.conversation') }}
<span v-if="collapsable" style="float:right;">
@@ -27,11 +27,6 @@
<script src="./conversation.js"></script>
<style lang="scss">
- .conversation-heading {
- border-bottom-style: solid;
- border-bottom-width: 1px;
- }
-
.status-preview {
position: absolute;
max-width: 35em;
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
@@ -164,6 +164,7 @@
width: 24px;
height: 24px;
border-radius: 2px;
+ object-fit: contain;
}
span {
line-height: 24px;
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
@@ -129,6 +129,8 @@
word-break: break-word;
border-left-width: 0px;
line-height: 18px;
+ border-bottom: 1px solid;
+ border-bottom-color: inherit;
.notify {
.avatar {
@@ -188,6 +190,7 @@
img, video {
max-width: 100%;
max-height: 400px;
+ object-fit: contain;
}
blockquote {
@@ -279,12 +282,19 @@
.status {
padding: 0.4em 0.7em 0.45em 0.7em;
- border-bottom: 1px solid;
- border-bottom-color: inherit;
border-left: 4px rgba(255, 48, 16, 0.65);
border-left-style: inherit;
}
+ .status-conversation:last-child {
+ border-bottom: none;
+ }
+
+ .timeline .panel.timeline {
+ border-radius: 10px;
+ overflow: hidden;
+ }
+
.muted {
padding: 0.1em 0.4em 0.1em 0.8em;
button {
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
@@ -14,7 +14,7 @@
{{$t('timeline.up_to_date')}}
</div>
</div>
- <div class="panel-body">
+ <div class="panel-body base02-background">
<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">
@@ -30,7 +30,7 @@
{{$t('user_card.followers')}}
</div>
</div>
- <div class="panel-body">
+ <div class="panel-body base02-background">
<div class="timeline">
<user-card v-for="follower in followers" :user="follower" :showFollows="false"></user-card>
</div>
@@ -42,7 +42,7 @@
{{$t('user_card.followees')}}
</div>
</div>
- <div class="panel-body">
+ <div class="panel-body base02-background">
<div class="timeline">
<user-card v-for="friend in friends" :user="friend" :showFollows="true"></user-card>
</div>