forked from AkkomaGang/akkoma-fe
Merge branch 'css-fixes-and-updates' into 'develop'
Css fixes and updates See merge request pleroma/pleroma-fe!150
This commit is contained in:
commit
c7f5f3f595
6 changed files with 35 additions and 22 deletions
|
@ -127,6 +127,14 @@ main-router {
|
||||||
margin: 0.5em;
|
margin: 0.5em;
|
||||||
|
|
||||||
border-radius: 10px;
|
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 {
|
.panel-heading {
|
||||||
|
|
|
@ -39,6 +39,16 @@
|
||||||
margin: 0.5em 0.7em 0.6em 0.0em;
|
margin: 0.5em 0.7em 0.6em 0.0em;
|
||||||
align-self: flex-start;
|
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 {
|
&.html {
|
||||||
flex-basis: 100%;
|
flex-basis: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
@ -53,7 +63,6 @@
|
||||||
margin: 10px;
|
margin: 10px;
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
background: rgba(230,230,230,0.6);
|
background: rgba(230,230,230,0.6);
|
||||||
border-radius: 5px;
|
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
z-index: 4;
|
z-index: 4;
|
||||||
}
|
}
|
||||||
|
@ -61,8 +70,6 @@
|
||||||
video {
|
video {
|
||||||
max-height: 500px;
|
max-height: 500px;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
border: 1px solid;
|
|
||||||
border-radius: 5px;
|
|
||||||
width: 100%;
|
width: 100%;
|
||||||
z-index: 0;
|
z-index: 0;
|
||||||
}
|
}
|
||||||
|
@ -75,14 +82,9 @@
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
border: 1px solid;
|
|
||||||
border-radius: 5px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.oembed {
|
.oembed {
|
||||||
border: 1px solid;
|
|
||||||
border-radius: 5px;
|
|
||||||
border-color: inherit;
|
|
||||||
width: 100%;
|
width: 100%;
|
||||||
margin-right: 15px;
|
margin-right: 15px;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
@ -117,9 +119,6 @@
|
||||||
flex: 1;
|
flex: 1;
|
||||||
|
|
||||||
img {
|
img {
|
||||||
border-style: solid;
|
|
||||||
border-width: 1px;
|
|
||||||
border-radius: 5px;
|
|
||||||
object-fit: contain;
|
object-fit: contain;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%; /* If this isn't here, chrome will stretch the images */
|
height: 100%; /* If this isn't here, chrome will stretch the images */
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<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">
|
<div class="panel-heading base01-background base04 base03-border conversation-heading">
|
||||||
{{ $t('timeline.conversation') }}
|
{{ $t('timeline.conversation') }}
|
||||||
<span v-if="collapsable" style="float:right;">
|
<span v-if="collapsable" style="float:right;">
|
||||||
|
@ -27,11 +27,6 @@
|
||||||
<script src="./conversation.js"></script>
|
<script src="./conversation.js"></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
.conversation-heading {
|
|
||||||
border-bottom-style: solid;
|
|
||||||
border-bottom-width: 1px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.status-preview {
|
.status-preview {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
max-width: 35em;
|
max-width: 35em;
|
||||||
|
|
|
@ -164,6 +164,7 @@
|
||||||
width: 24px;
|
width: 24px;
|
||||||
height: 24px;
|
height: 24px;
|
||||||
border-radius: 2px;
|
border-radius: 2px;
|
||||||
|
object-fit: contain;
|
||||||
}
|
}
|
||||||
span {
|
span {
|
||||||
line-height: 24px;
|
line-height: 24px;
|
||||||
|
|
|
@ -129,6 +129,8 @@
|
||||||
word-break: break-word;
|
word-break: break-word;
|
||||||
border-left-width: 0px;
|
border-left-width: 0px;
|
||||||
line-height: 18px;
|
line-height: 18px;
|
||||||
|
border-bottom: 1px solid;
|
||||||
|
border-bottom-color: inherit;
|
||||||
|
|
||||||
.notify {
|
.notify {
|
||||||
.avatar {
|
.avatar {
|
||||||
|
@ -188,6 +190,7 @@
|
||||||
img, video {
|
img, video {
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
max-height: 400px;
|
max-height: 400px;
|
||||||
|
object-fit: contain;
|
||||||
}
|
}
|
||||||
|
|
||||||
blockquote {
|
blockquote {
|
||||||
|
@ -279,12 +282,19 @@
|
||||||
|
|
||||||
.status {
|
.status {
|
||||||
padding: 0.4em 0.7em 0.45em 0.7em;
|
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: 4px rgba(255, 48, 16, 0.65);
|
||||||
border-left-style: inherit;
|
border-left-style: inherit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.status-conversation:last-child {
|
||||||
|
border-bottom: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timeline .panel.timeline {
|
||||||
|
border-radius: 10px;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
.muted {
|
.muted {
|
||||||
padding: 0.1em 0.4em 0.1em 0.8em;
|
padding: 0.1em 0.4em 0.1em 0.8em;
|
||||||
button {
|
button {
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
{{$t('timeline.up_to_date')}}
|
{{$t('timeline.up_to_date')}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body base02-background">
|
||||||
<div class="timeline">
|
<div class="timeline">
|
||||||
<status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status-or-conversation>
|
<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">
|
<a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading">
|
||||||
|
@ -30,7 +30,7 @@
|
||||||
{{$t('user_card.followers')}}
|
{{$t('user_card.followers')}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body base02-background">
|
||||||
<div class="timeline">
|
<div class="timeline">
|
||||||
<user-card v-for="follower in followers" :user="follower" :showFollows="false"></user-card>
|
<user-card v-for="follower in followers" :user="follower" :showFollows="false"></user-card>
|
||||||
</div>
|
</div>
|
||||||
|
@ -42,7 +42,7 @@
|
||||||
{{$t('user_card.followees')}}
|
{{$t('user_card.followees')}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body base02-background">
|
||||||
<div class="timeline">
|
<div class="timeline">
|
||||||
<user-card v-for="friend in friends" :user="friend" :showFollows="true"></user-card>
|
<user-card v-for="friend in friends" :user="friend" :showFollows="true"></user-card>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue