summaryrefslogtreecommitdiff
path: root/src/client/components
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2021-03-02 23:39:26 +0900
committersyuilo <syuilotan@yahoo.co.jp>2021-03-02 23:39:26 +0900
commit878f09460c63d712ae88a6efe9587d7c3dec6733 (patch)
tree393b77bf979c437c048d60a53bc65acd7dda5e4e /src/client/components
parent絵文字ピッカーからタグのセクションを消した (diff)
parentRevert "perf: use overflow: clip instead of hidden" (#7273) (diff)
downloadsharkey-878f09460c63d712ae88a6efe9587d7c3dec6733.tar.gz
sharkey-878f09460c63d712ae88a6efe9587d7c3dec6733.tar.bz2
sharkey-878f09460c63d712ae88a6efe9587d7c3dec6733.zip
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/client/components')
-rw-r--r--src/client/components/autocomplete.vue9
-rw-r--r--src/client/components/channel-preview.vue3
-rw-r--r--src/client/components/drive.file.vue3
-rw-r--r--src/client/components/form/input.vue3
-rw-r--r--src/client/components/form/link.vue3
-rw-r--r--src/client/components/global/avatar.vue3
-rw-r--r--src/client/components/global/misskey-flavored-markdown.vue3
-rw-r--r--src/client/components/instance-stats.vue3
-rw-r--r--src/client/components/instance-ticker.vue3
-rw-r--r--src/client/components/media-banner.vue6
-rw-r--r--src/client/components/media-image.vue3
-rw-r--r--src/client/components/media-list.vue3
-rw-r--r--src/client/components/media-video.vue3
-rw-r--r--src/client/components/note-detailed.vue6
-rw-r--r--src/client/components/note-header.vue6
-rw-r--r--src/client/components/note-preview.vue3
-rw-r--r--src/client/components/note.vue9
-rw-r--r--src/client/components/notification.vue6
-rw-r--r--src/client/components/poll.vue3
-rw-r--r--src/client/components/post-form-attaches.vue3
-rw-r--r--src/client/components/sidebar.vue3
-rw-r--r--src/client/components/toast.vue3
-rw-r--r--src/client/components/ui/button.vue6
-rw-r--r--src/client/components/ui/container.vue3
-rw-r--r--src/client/components/ui/input.vue6
-rw-r--r--src/client/components/ui/menu.vue3
-rw-r--r--src/client/components/ui/modal-window.vue6
-rw-r--r--src/client/components/ui/range.vue3
-rw-r--r--src/client/components/ui/window.vue6
-rw-r--r--src/client/components/url-preview.vue6
-rw-r--r--src/client/components/user-info.vue3
-rw-r--r--src/client/components/user-preview.vue3
-rw-r--r--src/client/components/users-dialog.vue6
-rw-r--r--src/client/components/visibility-picker.vue3
34 files changed, 48 insertions, 96 deletions
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({
<style lang="scss" scoped>
.eftoefju {
display: block;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
width: 100%;
&:hover {
diff --git a/src/client/components/drive.file.vue b/src/client/components/drive.file.vue
index 80283f997b..d2b8b95f73 100644
--- a/src/client/components/drive.file.vue
+++ b/src/client/components/drive.file.vue
@@ -342,8 +342,7 @@ export default defineComponent({
text-align: center;
word-break: break-all;
color: var(--fg);
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
> .ext {
opacity: 0.5;
diff --git a/src/client/components/form/input.vue b/src/client/components/form/input.vue
index f16d8be026..f0aa6b0534 100644
--- a/src/client/components/form/input.vue
+++ b/src/client/components/form/input.vue
@@ -261,8 +261,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/form/link.vue b/src/client/components/form/link.vue
index 6f0ae0e5f7..7093f50397 100644
--- a/src/client/components/form/link.vue
+++ b/src/client/components/form/link.vue
@@ -83,8 +83,7 @@ export default defineComponent({
> .text {
white-space: nowrap;
text-overflow: ellipsis;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
padding-right: 12px;
}
diff --git a/src/client/components/global/avatar.vue b/src/client/components/global/avatar.vue
index 8930bb4a0c..d2f25fa41e 100644
--- a/src/client/components/global/avatar.vue
+++ b/src/client/components/global/avatar.vue
@@ -101,8 +101,7 @@ export default defineComponent({
top: 0;
border-radius: 100%;
z-index: 1;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
object-fit: cover;
width: 100%;
height: 100%;
diff --git a/src/client/components/global/misskey-flavored-markdown.vue b/src/client/components/global/misskey-flavored-markdown.vue
index 0b34ccbfb4..a3f443d5d8 100644
--- a/src/client/components/global/misskey-flavored-markdown.vue
+++ b/src/client/components/global/misskey-flavored-markdown.vue
@@ -126,8 +126,7 @@ export default defineComponent({
&.nowrap {
white-space: pre;
word-wrap: normal; // https://codeday.me/jp/qa/20190424/690106.html
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
text-overflow: ellipsis;
}
diff --git a/src/client/components/instance-stats.vue b/src/client/components/instance-stats.vue
index 80070996fc..e9b496180a 100644
--- a/src/client/components/instance-stats.vue
+++ b/src/client/components/instance-stats.vue
@@ -692,8 +692,7 @@ export default defineComponent({
> dd {
text-overflow: ellipsis;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
white-space: nowrap;
}
diff --git a/src/client/components/instance-ticker.vue b/src/client/components/instance-ticker.vue
index fa46f8edc4..1ce5a1c2c1 100644
--- a/src/client/components/instance-ticker.vue
+++ b/src/client/components/instance-ticker.vue
@@ -44,8 +44,7 @@ export default defineComponent({
height: $height;
border-radius: 4px 0 0 4px;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
color: #fff;
> .icon {
diff --git a/src/client/components/media-banner.vue b/src/client/components/media-banner.vue
index 4fc6701d36..a2e1776d09 100644
--- a/src/client/components/media-banner.vue
+++ b/src/client/components/media-banner.vue
@@ -62,8 +62,7 @@ export default defineComponent({
width: 100%;
border-radius: 4px;
margin-top: 4px;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
> .download,
> .sensitive {
@@ -78,8 +77,7 @@ export default defineComponent({
}
> b {
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
text-overflow: ellipsis;
}
diff --git a/src/client/components/media-image.vue b/src/client/components/media-image.vue
index 5f55d88388..9f3898ec56 100644
--- a/src/client/components/media-image.vue
+++ b/src/client/components/media-image.vue
@@ -143,8 +143,7 @@ export default defineComponent({
> a {
display: block;
cursor: zoom-in;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
width: 100%;
height: 100%;
background-position: center;
diff --git a/src/client/components/media-list.vue b/src/client/components/media-list.vue
index 61482266ab..36fbb4bd06 100644
--- a/src/client/components/media-list.vue
+++ b/src/client/components/media-list.vue
@@ -105,8 +105,7 @@ export default defineComponent({
grid-gap: 4px;
> * {
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
border-radius: 6px;
}
diff --git a/src/client/components/media-video.vue b/src/client/components/media-video.vue
index dbde40f666..3788947206 100644
--- a/src/client/components/media-video.vue
+++ b/src/client/components/media-video.vue
@@ -78,8 +78,7 @@ export default defineComponent({
align-items: center;
font-size: 3.5em;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
background-position: center;
background-size: cover;
width: 100%;
diff --git a/src/client/components/note-detailed.vue b/src/client/components/note-detailed.vue
index 7df87c6b01..b5bc054e5e 100644
--- a/src/client/components/note-detailed.vue
+++ b/src/client/components/note-detailed.vue
@@ -886,8 +886,7 @@ export default defineComponent({
.note {
position: relative;
transition: box-shadow 0.1s ease;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
contain: content;
&:focus-visible {
@@ -947,8 +946,7 @@ export default defineComponent({
}
> span {
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
flex-shrink: 1;
text-overflow: ellipsis;
white-space: nowrap;
diff --git a/src/client/components/note-header.vue b/src/client/components/note-header.vue
index aed4225067..1f7a07bac3 100644
--- a/src/client/components/note-header.vue
+++ b/src/client/components/note-header.vue
@@ -61,8 +61,7 @@ export default defineComponent({
display: block;
margin: 0 .5em 0 0;
padding: 0;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
font-size: 1em;
font-weight: bold;
text-decoration: none;
@@ -91,8 +90,7 @@ export default defineComponent({
> .username {
margin: 0 .5em 0 0;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
text-overflow: ellipsis;
}
diff --git a/src/client/components/note-preview.vue b/src/client/components/note-preview.vue
index 4715c299b5..4ea97d17ee 100644
--- a/src/client/components/note-preview.vue
+++ b/src/client/components/note-preview.vue
@@ -50,8 +50,7 @@ export default defineComponent({
display: flex;
margin: 0;
padding: 0;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
font-size: 0.95em;
> .avatar {
diff --git a/src/client/components/note.vue b/src/client/components/note.vue
index dab7643762..bc2f87fe85 100644
--- a/src/client/components/note.vue
+++ b/src/client/components/note.vue
@@ -861,8 +861,7 @@ export default defineComponent({
.tkcbzcuz {
position: relative;
transition: box-shadow 0.1s ease;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
contain: content;
// これらの指定はパフォーマンス向上には有効だが、ノートの高さは一定でないため、
@@ -949,8 +948,7 @@ export default defineComponent({
}
> span {
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
flex-shrink: 1;
text-overflow: ellipsis;
white-space: nowrap;
@@ -1022,8 +1020,7 @@ export default defineComponent({
&.collapsed {
position: relative;
max-height: 9em;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
> .fade {
display: block;
diff --git a/src/client/components/notification.vue b/src/client/components/notification.vue
index a0cfe4f213..2fe8500891 100644
--- a/src/client/components/notification.vue
+++ b/src/client/components/notification.vue
@@ -257,8 +257,7 @@ export default defineComponent({
text-overflow: ellipsis;
white-space: nowrap;
min-width: 0;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
}
> .time {
@@ -269,8 +268,7 @@ export default defineComponent({
> .text {
white-space: nowrap;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
text-overflow: ellipsis;
> [data-icon] {
diff --git a/src/client/components/poll.vue b/src/client/components/poll.vue
index 01bbefe36d..7f13e135aa 100644
--- a/src/client/components/poll.vue
+++ b/src/client/components/poll.vue
@@ -112,8 +112,7 @@ export default defineComponent({
padding: 4px 8px;
border: solid 1px var(--divider);
border-radius: 4px;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
cursor: pointer;
&:hover {
diff --git a/src/client/components/post-form-attaches.vue b/src/client/components/post-form-attaches.vue
index 3b5cb75c19..230c944de1 100644
--- a/src/client/components/post-form-attaches.vue
+++ b/src/client/components/post-form-attaches.vue
@@ -127,8 +127,7 @@ export default defineComponent({
height: 64px;
margin-right: 4px;
border-radius: 4px;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
cursor: move;
&:hover > .remove {
diff --git a/src/client/components/sidebar.vue b/src/client/components/sidebar.vue
index 6460043244..f7c50a2ba5 100644
--- a/src/client/components/sidebar.vue
+++ b/src/client/components/sidebar.vue
@@ -390,8 +390,7 @@ export default defineComponent({
font-size: $ui-font-size;
line-height: 3rem;
text-overflow: ellipsis;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
white-space: nowrap;
width: 100%;
text-align: left;
diff --git a/src/client/components/toast.vue b/src/client/components/toast.vue
index 49c14789b7..fb0de68092 100644
--- a/src/client/components/toast.vue
+++ b/src/client/components/toast.vue
@@ -67,8 +67,7 @@ export default defineComponent({
height: 100%;
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.3);
border-radius: 8px;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
}
}
</style>
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({
<style lang="scss" scoped>
.ebkgoccj {
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
display: flex;
flex-direction: column;
contain: content;
@@ -124,8 +123,7 @@ export default defineComponent({
padding-left: 32px;
font-weight: bold;
white-space: nowrap;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
text-overflow: ellipsis;
pointer-events: none;
diff --git a/src/client/components/ui/range.vue b/src/client/components/ui/range.vue
index cbdf07d6b6..4cfe66a8fc 100644
--- a/src/client/components/ui/range.vue
+++ b/src/client/components/ui/range.vue
@@ -89,8 +89,7 @@ export default defineComponent({
pointer-events: none;
font-size: 16px;
color: var(--inputLabel);
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
}
> input {
diff --git a/src/client/components/ui/window.vue b/src/client/components/ui/window.vue
index 4d3b048c11..501a3bf8ee 100644
--- a/src/client/components/ui/window.vue
+++ b/src/client/components/ui/window.vue
@@ -402,8 +402,7 @@ export default defineComponent({
}
> .body {
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
display: flex;
flex-direction: column;
contain: content;
@@ -438,8 +437,7 @@ export default defineComponent({
position: relative;
line-height: var(--height);
white-space: nowrap;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
text-overflow: ellipsis;
text-align: center;
cursor: move;
diff --git a/src/client/components/url-preview.vue b/src/client/components/url-preview.vue
index a7068d1619..7a59068710 100644
--- a/src/client/components/url-preview.vue
+++ b/src/client/components/url-preview.vue
@@ -244,8 +244,7 @@ export default defineComponent({
font-size: 14px;
box-shadow: 0 0 0 1px var(--divider);
border-radius: 8px;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
&:hover {
text-decoration: none;
@@ -327,8 +326,7 @@ export default defineComponent({
&.compact {
> article {
> header h1, p, footer {
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
diff --git a/src/client/components/user-info.vue b/src/client/components/user-info.vue
index b744f21929..711e367411 100644
--- a/src/client/components/user-info.vue
+++ b/src/client/components/user-info.vue
@@ -110,8 +110,7 @@ export default defineComponent({
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
}
}
diff --git a/src/client/components/user-preview.vue b/src/client/components/user-preview.vue
index 86e53228ce..c4588e478a 100644
--- a/src/client/components/user-preview.vue
+++ b/src/client/components/user-preview.vue
@@ -111,8 +111,7 @@ export default defineComponent({
position: absolute;
z-index: 11000;
width: 300px;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
transform-origin: center top;
> .info {
diff --git a/src/client/components/users-dialog.vue b/src/client/components/users-dialog.vue
index af47391c5d..014748adc6 100644
--- a/src/client/components/users-dialog.vue
+++ b/src/client/components/users-dialog.vue
@@ -66,8 +66,7 @@ export default defineComponent({
height: 350px;
background: var(--panel);
border-radius: var(--radius);
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
display: flex;
flex-direction: column;
@@ -128,8 +127,7 @@ export default defineComponent({
> .body {
padding: 0 8px;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
> .name {
display: block;
diff --git a/src/client/components/visibility-picker.vue b/src/client/components/visibility-picker.vue
index 66dd9c2aed..e518f48d0d 100644
--- a/src/client/components/visibility-picker.vue
+++ b/src/client/components/visibility-picker.vue
@@ -141,8 +141,7 @@ export default defineComponent({
> *:nth-child(2) {
flex: 1 1 auto;
white-space: nowrap;
- overflow: hidden; // overflow: clip; をSafariが対応したら消す
- overflow: clip;
+ overflow: hidden;
text-overflow: ellipsis;
> span:first-child {