diff --git a/package.json b/package.json index 21a42f98d6..31ae0e4883 100644 --- a/package.json +++ b/package.json @@ -120,7 +120,7 @@ "broadcast-channel": "3.4.1", "bull": "3.20.1", "cafy": "15.2.1", - "cbor": "7.0.1", + "cbor": "7.0.3", "chalk": "4.1.0", "chart.js": "2.9.4", "cli-highlight": "2.1.10", @@ -250,7 +250,7 @@ "vue-json-pretty": "1.7.1", "vue-loader": "16.1.2", "vue-prism-editor": "2.0.0-alpha.2", - "vue-router": "4.0.3", + "vue-router": "4.0.4", "vue-style-loader": "4.1.2", "vuedraggable": "4.0.1", "web-push": "3.4.4", diff --git a/src/client/components/autocomplete.vue b/src/client/components/autocomplete.vue index 1fe74adc66..ae742610f7 100644 --- a/src/client/components/autocomplete.vue +++ b/src/client/components/autocomplete.vue @@ -401,8 +401,7 @@ export default defineComponent({ z-index: 65535; max-width: 100%; margin-top: calc(1em + 8px); - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; transition: top 0.1s ease, left 0.1s ease; > ol { @@ -419,8 +418,7 @@ export default defineComponent({ align-items: center; padding: 4px 12px; white-space: nowrap; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; font-size: 0.9em; cursor: default; @@ -429,8 +427,7 @@ export default defineComponent({ } * { - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; text-overflow: ellipsis; } diff --git a/src/client/components/channel-preview.vue b/src/client/components/channel-preview.vue index 3e24774f52..e222ad7ae7 100644 --- a/src/client/components/channel-preview.vue +++ b/src/client/components/channel-preview.vue @@ -66,8 +66,7 @@ export default defineComponent({ diff --git a/src/client/components/ui/button.vue b/src/client/components/ui/button.vue index e98c5efcc0..3901e8ae44 100644 --- a/src/client/components/ui/button.vue +++ b/src/client/components/ui/button.vue @@ -124,8 +124,7 @@ export default defineComponent({ text-decoration: none; background: var(--buttonBg); border-radius: 999px; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; &:not(:disabled):hover { background: var(--buttonHoverBg); @@ -213,8 +212,7 @@ export default defineComponent({ width: 100%; height: 100%; border-radius: 6px; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; ::v-deep(div) { position: absolute; diff --git a/src/client/components/ui/container.vue b/src/client/components/ui/container.vue index b9360e92fa..c3353cca89 100644 --- a/src/client/components/ui/container.vue +++ b/src/client/components/ui/container.vue @@ -116,8 +116,7 @@ export default defineComponent({ .ukygtjoj { position: relative; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; &.naked { background: transparent !important; diff --git a/src/client/components/ui/input.vue b/src/client/components/ui/input.vue index cea1ec1b7f..1c5222f8f2 100644 --- a/src/client/components/ui/input.vue +++ b/src/client/components/ui/input.vue @@ -298,8 +298,7 @@ export default defineComponent({ transform: scale(.75); white-space: nowrap; width: 133%; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; text-overflow: ellipsis; > .warning { @@ -355,8 +354,7 @@ export default defineComponent({ display: inline-block; min-width: 16px; max-width: 150px; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } diff --git a/src/client/components/ui/menu.vue b/src/client/components/ui/menu.vue index c9accf7c31..c2033402e3 100644 --- a/src/client/components/ui/menu.vue +++ b/src/client/components/ui/menu.vue @@ -155,8 +155,7 @@ export default defineComponent({ font-size: 0.9em; line-height: 20px; text-align: center; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; text-overflow: ellipsis; &.danger { diff --git a/src/client/components/ui/modal-window.vue b/src/client/components/ui/modal-window.vue index 3965b537e5..2cdf961379 100644 --- a/src/client/components/ui/modal-window.vue +++ b/src/client/components/ui/modal-window.vue @@ -89,8 +89,7 @@ export default defineComponent({