diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2021-03-03 01:04:45 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2021-03-03 01:04:45 +0900 |
| commit | 9a4a534c92f6c9c112438f2a494de9d0d707d46d (patch) | |
| tree | 791dc0180be776a0513bd14fd48bad1de6e9659a /src/client/pages | |
| parent | Merge branch 'develop' (diff) | |
| parent | 12.73.0 (diff) | |
| download | misskey-9a4a534c92f6c9c112438f2a494de9d0d707d46d.tar.gz misskey-9a4a534c92f6c9c112438f2a494de9d0d707d46d.tar.bz2 misskey-9a4a534c92f6c9c112438f2a494de9d0d707d46d.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/client/pages')
| -rw-r--r-- | src/client/pages/about-misskey.vue | 2 | ||||
| -rw-r--r-- | src/client/pages/follow-requests.vue | 6 | ||||
| -rw-r--r-- | src/client/pages/instance/emojis.vue | 18 | ||||
| -rw-r--r-- | src/client/pages/messaging/index.vue | 9 | ||||
| -rw-r--r-- | src/client/pages/messaging/messaging-room.message.vue | 9 | ||||
| -rw-r--r-- | src/client/pages/page-editor/page-editor.container.vue | 3 | ||||
| -rw-r--r-- | src/client/pages/reversi/game.board.vue | 3 | ||||
| -rw-r--r-- | src/client/pages/reversi/game.setting.vue | 3 | ||||
| -rw-r--r-- | src/client/pages/settings/drive.vue | 3 | ||||
| -rw-r--r-- | src/client/pages/settings/other.vue | 7 | ||||
| -rw-r--r-- | src/client/pages/settings/security.vue | 3 | ||||
| -rw-r--r-- | src/client/pages/settings/theme.vue | 3 | ||||
| -rw-r--r-- | src/client/pages/user/index.vue | 24 | ||||
| -rw-r--r-- | src/client/pages/welcome.entrance.a.vue | 3 | ||||
| -rw-r--r-- | src/client/pages/welcome.entrance.b.vue | 3 | ||||
| -rw-r--r-- | src/client/pages/welcome.setup.vue | 3 |
16 files changed, 37 insertions, 65 deletions
diff --git a/src/client/pages/about-misskey.vue b/src/client/pages/about-misskey.vue index fa47a80492..7022a924b0 100644 --- a/src/client/pages/about-misskey.vue +++ b/src/client/pages/about-misskey.vue @@ -1,5 +1,5 @@ <template> -<div style="overflow: hidden; overflow: clip;"> +<div style="overflow: hidden;"> <FormBase class="znqjceqz"> <div id="debug"></div> <section class="_formItem about"> diff --git a/src/client/pages/follow-requests.vue b/src/client/pages/follow-requests.vue index 18f39642e4..04d739088f 100644 --- a/src/client/pages/follow-requests.vue +++ b/src/client/pages/follow-requests.vue @@ -104,8 +104,7 @@ export default defineComponent({ display: block; white-space: nowrap; text-overflow: ellipsis; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; margin: 0; } @@ -125,8 +124,7 @@ export default defineComponent({ width: 55%; line-height: 42px; white-space: nowrap; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; text-overflow: ellipsis; opacity: 0.7; font-size: 14px; diff --git a/src/client/pages/instance/emojis.vue b/src/client/pages/instance/emojis.vue index 71b6c11b2d..6a51813bb2 100644 --- a/src/client/pages/instance/emojis.vue +++ b/src/client/pages/instance/emojis.vue @@ -178,20 +178,17 @@ export default defineComponent({ > .body { padding: 0 0 0 8px; white-space: nowrap; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; > .name { text-overflow: ellipsis; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; } > .info { opacity: 0.5; text-overflow: ellipsis; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; } } } @@ -222,20 +219,17 @@ export default defineComponent({ > .body { padding: 0 0 0 8px; white-space: nowrap; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; > .name { text-overflow: ellipsis; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; } > .info { opacity: 0.5; text-overflow: ellipsis; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; } } } diff --git a/src/client/pages/messaging/index.vue b/src/client/pages/messaging/index.vue index 8e7fe5134a..aefc31f3bc 100644 --- a/src/client/pages/messaging/index.vue +++ b/src/client/pages/messaging/index.vue @@ -226,14 +226,12 @@ export default defineComponent({ align-items: center; margin-bottom: 2px; white-space: nowrap; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; > .name { margin: 0; padding: 0; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; text-overflow: ellipsis; font-size: 1em; font-weight: bold; @@ -264,8 +262,7 @@ export default defineComponent({ display: block; margin: 0 0 0 0; padding: 0; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; overflow-wrap: break-word; font-size: 1.1em; color: var(--faceText); diff --git a/src/client/pages/messaging/messaging-room.message.vue b/src/client/pages/messaging/messaging-room.message.vue index 3d994c2666..d379c0c3c0 100644 --- a/src/client/pages/messaging/messaging-room.message.vue +++ b/src/client/pages/messaging/messaging-room.message.vue @@ -154,8 +154,7 @@ export default defineComponent({ display: block; margin: 0; padding: 0; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; overflow-wrap: break-word; font-size: 1em; color: rgba(#000, 0.5); @@ -165,8 +164,7 @@ export default defineComponent({ display: block; margin: 0; padding: 12px 18px; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; overflow-wrap: break-word; word-break: break-word; font-size: 1em; @@ -184,8 +182,7 @@ export default defineComponent({ display: block; max-width: 100%; border-radius: 16px; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; text-decoration: none; &:hover { diff --git a/src/client/pages/page-editor/page-editor.container.vue b/src/client/pages/page-editor/page-editor.container.vue index 5e89b8c2bf..46e2dca157 100644 --- a/src/client/pages/page-editor/page-editor.container.vue +++ b/src/client/pages/page-editor/page-editor.container.vue @@ -74,8 +74,7 @@ export default defineComponent({ <style lang="scss" scoped> .cpjygsrt { position: relative; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; background: var(--panel); border: solid 2px var(--X12); border-radius: 6px; diff --git a/src/client/pages/reversi/game.board.vue b/src/client/pages/reversi/game.board.vue index a3c7900d20..8ce232af07 100644 --- a/src/client/pages/reversi/game.board.vue +++ b/src/client/pages/reversi/game.board.vue @@ -434,8 +434,7 @@ export default defineComponent({ > div { background: transparent; border-radius: 6px; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; * { pointer-events: none; diff --git a/src/client/pages/reversi/game.setting.vue b/src/client/pages/reversi/game.setting.vue index 3ed4d2c67b..404e560a06 100644 --- a/src/client/pages/reversi/game.setting.vue +++ b/src/client/pages/reversi/game.setting.vue @@ -333,8 +333,7 @@ export default defineComponent({ background: transparent; border: solid 2px var(--divider); border-radius: 6px; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; cursor: pointer; * { diff --git a/src/client/pages/settings/drive.vue b/src/client/pages/settings/drive.vue index 869af77f37..8ca8bc9eec 100644 --- a/src/client/pages/settings/drive.vue +++ b/src/client/pages/settings/drive.vue @@ -230,8 +230,7 @@ export default defineComponent({ $size: 12px; background: rgba(0, 0, 0, 0.1); border-radius: ($size / 2); - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; > div { height: $size; diff --git a/src/client/pages/settings/other.vue b/src/client/pages/settings/other.vue index c0b9625098..a14e101328 100644 --- a/src/client/pages/settings/other.vue +++ b/src/client/pages/settings/other.vue @@ -23,13 +23,16 @@ <FormLink to="/settings/registry"><template #icon><Fa :icon="faCogs"/></template>{{ $ts.registry }}</FormLink> + <FormLink to="/bios" behavior="browser"><template #icon><Fa :icon="faDoorOpen"/></template>BIOS</FormLink> + <FormLink to="/cli" behavior="browser"><template #icon><Fa :icon="faDoorOpen"/></template>CLI</FormLink> + <FormButton @click="closeAccount" danger>{{ $ts.closeAccount }}</FormButton> </FormBase> </template> <script lang="ts"> import { defineAsyncComponent, defineComponent } from 'vue'; -import { faEllipsisH, faCogs } from '@fortawesome/free-solid-svg-icons'; +import { faEllipsisH, faCogs, faDoorOpen } from '@fortawesome/free-solid-svg-icons'; import FormSwitch from '@/components/form/switch.vue'; import FormSelect from '@/components/form/select.vue'; import FormLink from '@/components/form/link.vue'; @@ -61,7 +64,7 @@ export default defineComponent({ icon: faEllipsisH }, debug, - faCogs + faCogs, faDoorOpen, } }, diff --git a/src/client/pages/settings/security.vue b/src/client/pages/settings/security.vue index 913e0e64bf..cdb5705c0b 100644 --- a/src/client/pages/settings/security.vue +++ b/src/client/pages/settings/security.vue @@ -144,8 +144,7 @@ export default defineComponent({ flex: 1; min-width: 0; white-space: nowrap; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; text-overflow: ellipsis; margin-right: 12px; } diff --git a/src/client/pages/settings/theme.vue b/src/client/pages/settings/theme.vue index e230a2276b..ac57c51df4 100644 --- a/src/client/pages/settings/theme.vue +++ b/src/client/pages/settings/theme.vue @@ -184,8 +184,7 @@ export default defineComponent({ position: absolute; top: 50%; left: 50%; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; padding: 0 100px; transform: translate3d(-50%, -50%, 0); diff --git a/src/client/pages/user/index.vue b/src/client/pages/user/index.vue index 959170f526..5229db9ee3 100644 --- a/src/client/pages/user/index.vue +++ b/src/client/pages/user/index.vue @@ -369,8 +369,7 @@ export default defineComponent({ position: relative; height: 450px; border-radius: 16px; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; background-size: cover; background-position: center; @@ -473,8 +472,7 @@ export default defineComponent({ > .name { width: 30%; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; white-space: nowrap; text-overflow: ellipsis; font-weight: bold; @@ -482,8 +480,7 @@ export default defineComponent({ > .value { width: 70%; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; white-space: nowrap; text-overflow: ellipsis; margin: 0; @@ -545,8 +542,7 @@ export default defineComponent({ .ftskorzw.narrow { max-width: 100vw; box-sizing: border-box; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; > .punished { font-size: 0.8em; @@ -557,14 +553,12 @@ export default defineComponent({ > .main { position: relative; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; > .banner-container { position: relative; height: 250px; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; background-size: cover; background-position: center; @@ -709,8 +703,7 @@ export default defineComponent({ > .name { width: 30%; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; white-space: nowrap; text-overflow: ellipsis; font-weight: bold; @@ -719,8 +712,7 @@ export default defineComponent({ > .value { width: 70%; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; white-space: nowrap; text-overflow: ellipsis; margin: 0; diff --git a/src/client/pages/welcome.entrance.a.vue b/src/client/pages/welcome.entrance.a.vue index 46a52f4189..4d356774eb 100644 --- a/src/client/pages/welcome.entrance.a.vue +++ b/src/client/pages/welcome.entrance.a.vue @@ -167,8 +167,7 @@ export default defineComponent({ margin: auto; width: 500px; height: calc(100% - 128px); - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; -webkit-mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 128px, rgba(0,0,0,1) calc(100% - 128px), rgba(0,0,0,0) 100%); mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 128px, rgba(0,0,0,1) calc(100% - 128px), rgba(0,0,0,0) 100%); diff --git a/src/client/pages/welcome.entrance.b.vue b/src/client/pages/welcome.entrance.b.vue index 0dc91359d0..8a6f60e726 100644 --- a/src/client/pages/welcome.entrance.b.vue +++ b/src/client/pages/welcome.entrance.b.vue @@ -151,8 +151,7 @@ export default defineComponent({ margin: auto; width: 500px; height: calc(100% - 128px); - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; -webkit-mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 128px, rgba(0,0,0,1) calc(100% - 128px), rgba(0,0,0,0) 100%); mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 128px, rgba(0,0,0,1) calc(100% - 128px), rgba(0,0,0,0) 100%); } diff --git a/src/client/pages/welcome.setup.vue b/src/client/pages/welcome.setup.vue index 9c1315cc40..bc994099ac 100644 --- a/src/client/pages/welcome.setup.vue +++ b/src/client/pages/welcome.setup.vue @@ -71,8 +71,7 @@ export default defineComponent({ .mk-setup { border-radius: var(--radius); box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1); - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; > h1 { margin: 0; |