moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes from review

This commit is contained in:
shpuld 2018-04-10 22:12:59 +03:00
parent da1a222cab
commit 896fea7dbd
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.scss
View File

@ -393,7 +393,7 @@ nav {
.faint { .faint {
color: $fallback--faint; color: $fallback--faint;
color: var($fallback--faint, --faint); color: var(--faint, $fallback--faint);
} }
@media all and (max-width: 959px) { @media all and (max-width: 959px) {

9
src/components/attachment/attachment.vue
View File

@ -2,7 +2,7 @@
<div v-if="size==='hide'"> <div v-if="size==='hide'">
<a class="placeholder" v-if="type !== 'html'" target="_blank" :href="attachment.url">[{{nsfw ? "NSFW/" : ""}}{{type.toUpperCase()}}]</a> <a class="placeholder" v-if="type !== 'html'" target="_blank" :href="attachment.url">[{{nsfw ? "NSFW/" : ""}}{{type.toUpperCase()}}]</a>
</div> </div>
<div v-else class="attachment base03-border" :class="{[type]: true, loading, 'small-attachment': isSmall}" v-show="!isEmpty"> <div v-else class="attachment" :class="{[type]: true, loading, 'small-attachment': isSmall}" v-show="!isEmpty">
<a class="image-attachment" v-if="hidden" @click.prevent="toggleHidden()"> <a class="image-attachment" v-if="hidden" @click.prevent="toggleHidden()">
<img :key="nsfwImage" :src="nsfwImage"/> <img :key="nsfwImage" :src="nsfwImage"/>
</a> </a>
@ -11,10 +11,10 @@
</div> </div>
<a v-if="type === 'image' && !hidden" class="image-attachment" :href="attachment.url" target="_blank"> <a v-if="type === 'image' && !hidden" class="image-attachment" :href="attachment.url" target="_blank">
<StillImage :class="{'small': isSmall}" class="base03-border" referrerpolicy="no-referrer" :mimetype="attachment.mimetype" :src="attachment.large_thumb_url || attachment.url"/> <StillImage :class="{'small': isSmall}" referrerpolicy="no-referrer" :mimetype="attachment.mimetype" :src="attachment.large_thumb_url || attachment.url"/>
</a> </a>
<video :class="{'small': isSmall}" class="base03" v-if="type === 'video' && !hidden" :src="attachment.url" controls loop></video> <video :class="{'small': isSmall}" v-if="type === 'video' && !hidden" :src="attachment.url" controls loop></video>
<audio v-if="type === 'audio'" :src="attachment.url" controls></audio> <audio v-if="type === 'audio'" :src="attachment.url" controls></audio>
@ -61,6 +61,7 @@
flex: 1 0 30%; flex: 1 0 30%;
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;
line-height: 0;
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
@ -109,7 +110,7 @@
} }
img.media-upload { img.media-upload {
margin-bottom: -2px; line-height: 0;
max-height: 300px; max-height: 300px;
max-width: 100%; max-width: 100%;
} }

2
src/components/notifications/notifications.scss
View File

@ -136,7 +136,7 @@
position: relative; position: relative;
overflow: hidden; overflow: hidden;
width: 100%; width: 100%;
flex: 1; flex: 1 1 0;
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;

5
src/components/status/status.vue
View File

@ -27,7 +27,7 @@
<div class="usercard media-body" v-if="userExpanded"> <div class="usercard media-body" v-if="userExpanded">
<user-card-content :user="status.user" :switcher="false"></user-card-content> <user-card-content :user="status.user" :switcher="false"></user-card-content>
</div> </div>
<div v-if="!noHeading" class="media-body container"> <div v-if="!noHeading" class="media-body container media-heading">
<div class="media-heading-left"> <div class="media-heading-left">
<div class="name-and-links"> <div class="name-and-links">
<h4 class="user-name">{{status.user.name}}</h4> <h4 class="user-name">{{status.user.name}}</h4>
@ -181,6 +181,9 @@
flex: 1; flex: 1;
padding: 0; padding: 0;
margin: 0 0 0.25em 0.8em; margin: 0 0 0.25em 0.8em;
}
.media-heading {
flex-wrap: nowrap; flex-wrap: nowrap;
} }