vivlim
/
pleroma-fe
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge branch 'snoot' of ssh://vvn.space:2222/vivlim/pleroma-fe into snoot

This commit is contained in:
Vivian Lim 2019-04-24 00:39:33 -07:00
parent b3be1ef6ff ff1dd00e4a
commit 442f0e76a5
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,14 +7,9 @@
[{{nsfw ? "NSFW/" : ""}}{{type.toUpperCase()}}]
</a>
</div>
<div
v-else class="attachment"
:class="{[type]: true, loading, 'fullwidth': fullwidth, 'nsfw-placeholder': hidden}"
v-show="!isEmpty"
>
<a class="image-attachment" v-if="hidden" :href="attachment.url" @click.prevent="toggleHidden">
<div v-else class="attachment" :class="{[type]: true, loading, 'small-attachment': isSmall, 'fullwidth': fullwidth, 'nsfw-placeholder': hidden}" v-show="!isEmpty">
<a class="image-attachment-placeholder" v-if="hidden" @click.prevent="toggleHidden()">
<img class="nsfw" :key="nsfwImage" :src="nsfwImage" :class="{'small': isSmall}"/>
<i v-if="type === 'video'" class="play-icon icon-play-circled"></i>
</a>
<div class="hider" v-if="nsfw && hideNsfwLocal && !hidden">
<a href="#" @click.prevent="toggleHidden">Hide</a>
@ -236,5 +231,9 @@
image-orientation: from-image;
}
}
.image-attachment-placeholder {
// currently, no style is applied to image placeholders.
}
}
</style>

2
static/styles.json
View File

@ -6,7 +6,7 @@
"ir-black": [ "Ir Black", "#000000", "#242422", "#b5b3aa", "#ff6c60", "#FF6C60", "#A8FF60", "#96CBFE", "#FFFFB6" ],
"monokai": [ "Monokai", "#272822", "#383830", "#f8f8f2", "#f92672", "#F92672", "#a6e22e", "#66d9ef", "#f4bf75" ],
"mammal": [ "Mammal", "#272c37", "#444b5d", "#f8f8f8", "#9bacc8", "#7f3142", "#2bd850", "#2b90d9", "#ca8f04" ],
"fairyfloss": [ "fairyfloss", "#5A5475", "#8077A8", "#F8F8F2", "#C5A3FF", "#FF857F", "#FFB8D1", "#C2FFDF", "#E6C000" ],
"redmond-xx": "/static/themes/redmond-xx.json",
"redmond-xx-se": "/static/themes/redmond-xx-se.json",
"redmond-xxi": "/static/themes/redmond-xxi.json",