summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2020-10-19 15:05:29 +0900
committersyuilo <syuilotan@yahoo.co.jp>2020-10-19 15:05:29 +0900
commitf0691c8a4f77bc58e84a9e25eda81b63ef33910d (patch)
treef98e3062ea28c93c49025cfdd898edee8437748b /src/client
parentfb07116a4 のコミット忘れ (diff)
downloadsharkey-f0691c8a4f77bc58e84a9e25eda81b63ef33910d.tar.gz
sharkey-f0691c8a4f77bc58e84a9e25eda81b63ef33910d.tar.bz2
sharkey-f0691c8a4f77bc58e84a9e25eda81b63ef33910d.zip
:art:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/pages/note.vue4
-rw-r--r--src/client/pages/user/index.vue6
-rw-r--r--src/client/style.scss1
3 files changed, 6 insertions, 5 deletions
diff --git a/src/client/pages/note.vue b/src/client/pages/note.vue
index 6a9167284f..cd31ccc338 100644
--- a/src/client/pages/note.vue
+++ b/src/client/pages/note.vue
@@ -8,8 +8,8 @@
<div class="_section">
<div class="_content">
- <MkRemoteCaution v-if="note.user.host != null" :href="note.url || note.uri" style="margin-bottom: var(--margin)"/>
- <XNote v-model:note="note" :key="note.id" :detail="true"/>
+ <MkRemoteCaution v-if="note.user.host != null" :href="note.url || note.uri" class="_vMargin"/>
+ <XNote v-model:note="note" :key="note.id" :detail="true" class="_vMargin"/>
</div>
</div>
diff --git a/src/client/pages/user/index.vue b/src/client/pages/user/index.vue
index d9eaf47442..94940f6ef2 100644
--- a/src/client/pages/user/index.vue
+++ b/src/client/pages/user/index.vue
@@ -1,13 +1,13 @@
<template>
<div class="mk-user-page" v-if="user" v-size="{ max: [500] }">
- <MkRemoteCaution v-if="user.host != null" :href="user.url" style="margin-bottom: var(--margin)"/>
-
<!-- TODO -->
<!-- <div class="punished" v-if="user.isSuspended"><Fa :icon="faExclamationTriangle" style="margin-right: 8px;"/> {{ $t('userSuspended') }}</div> -->
<!-- <div class="punished" v-if="user.isSilenced"><Fa :icon="faExclamationTriangle" style="margin-right: 8px;"/> {{ $t('userSilenced') }}</div> -->
<div class="profile _section _fitBottom">
- <div class="_content" :key="user.id">
+ <MkRemoteCaution v-if="user.host != null" :href="user.url" class="_content _vMargin"/>
+
+ <div class="_content _vMargin" :key="user.id">
<div class="banner-container" :style="style">
<div class="banner" ref="banner" :style="style"></div>
<div class="fade"></div>
diff --git a/src/client/style.scss b/src/client/style.scss
index a8e322aeda..654267084d 100644
--- a/src/client/style.scss
+++ b/src/client/style.scss
@@ -324,6 +324,7 @@ hr {
> ._title,
> ._content {
+ box-sizing: border-box;
max-width: var(--baseContentWidth);
margin: 0 auto;
}