From afca31b11844543f09cf1a3956ebdbd360aa5b90 Mon Sep 17 00:00:00 2001 From: Pleroma Renovate Bot Date: Thu, 22 Sep 2022 09:05:38 +0000 Subject: [PATCH 1/8] Update dependency sass to v1.55.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 260df5730..5cba8c516 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "ora": "0.4.1", "postcss": "8.4.16", "postcss-loader": "7.0.1", - "sass": "1.54.8", + "sass": "1.55.0", "sass-loader": "13.0.2", "selenium-server": "2.53.1", "semver": "7.3.7", diff --git a/yarn.lock b/yarn.lock index a22ab65dd..fae632ae6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7392,10 +7392,10 @@ sass-loader@13.0.2: klona "^2.0.4" neo-async "^2.6.2" -sass@1.54.8: - version "1.54.8" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.8.tgz#4adef0dd86ea2b1e4074f551eeda4fc5f812a996" - integrity sha512-ib4JhLRRgbg6QVy6bsv5uJxnJMTS2soVcCp9Y88Extyy13A8vV0G1fAwujOzmNkFQbR3LvedudAMbtuNRPbQww== +sass@1.55.0: + version "1.55.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.55.0.tgz#0c4d3c293cfe8f8a2e8d3b666e1cf1bff8065d1c" + integrity sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" From 6c71686d2613ecad786d165cbdeec8f47abc28a7 Mon Sep 17 00:00:00 2001 From: Pleroma Renovate Bot Date: Sun, 2 Oct 2022 09:06:29 +0000 Subject: [PATCH 2/8] Pin dependencies --- package.json | 4 ++-- yarn.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 5cba8c516..d56de1164 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@fortawesome/free-solid-svg-icons": "6.2.0", "@fortawesome/vue-fontawesome": "3.0.1", "@kazvmoe-infra/pinch-zoom-element": "1.2.0", - "@kazvmoe-infra/unicode-emoji-json": "^0.4.0", + "@kazvmoe-infra/unicode-emoji-json": "0.4.0", "@ruffle-rs/ruffle": "0.1.0-nightly.2022.7.12", "@vuelidate/core": "2.0.0-alpha.44", "@vuelidate/validators": "2.0.0-alpha.31", @@ -35,7 +35,7 @@ "escape-html": "1.0.3", "js-cookie": "3.0.1", "localforage": "1.10.0", - "lozad": "^1.16.0", + "lozad": "1.16.0", "parse-link-header": "2.0.0", "phoenix": "1.6.2", "punycode.js": "2.1.0", diff --git a/yarn.lock b/yarn.lock index fae632ae6..4ed4bb36c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1629,7 +1629,7 @@ dependencies: pointer-tracker "^2.0.3" -"@kazvmoe-infra/unicode-emoji-json@^0.4.0": +"@kazvmoe-infra/unicode-emoji-json@0.4.0": version "0.4.0" resolved "https://registry.yarnpkg.com/@kazvmoe-infra/unicode-emoji-json/-/unicode-emoji-json-0.4.0.tgz#555bab2f8d11db74820ef0a2fbe2805b17c22587" integrity sha512-22OffREdHzD0U6A/W4RaFPV8NR73za6euibtAxNxO/fu5A6TwxRO2lAdbDWKJH9COv/vYs8zqfEiSalXH2nXJA== @@ -5738,7 +5738,7 @@ lower-case@^2.0.2: dependencies: tslib "^2.0.3" -lozad@^1.16.0: +lozad@1.16.0: version "1.16.0" resolved "https://registry.yarnpkg.com/lozad/-/lozad-1.16.0.tgz#86ce732c64c69926ccdebb81c8c90bb3735948b4" integrity sha512-JBr9WjvEFeKoyim3svo/gsQPTkgG/mOHJmDctZ/+U9H3ymUuvEkqpn8bdQMFsvTMcyRJrdJkLv0bXqGm0sP72w== From ec7a8d0766820f655447f5f80435a595609e2f1c Mon Sep 17 00:00:00 2001 From: Sean King Date: Thu, 6 Oct 2022 22:05:50 -0600 Subject: [PATCH 3/8] Remove diff package --- package.json | 1 - yarn.lock | 5 ----- 2 files changed, 6 deletions(-) diff --git a/package.json b/package.json index 5cba8c516..95bd92846 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,6 @@ "chromatism": "3.0.0", "click-outside-vue3": "4.0.1", "cropperjs": "1.5.12", - "diff": "3.5.0", "escape-html": "1.0.3", "js-cookie": "3.0.1", "localforage": "1.10.0", diff --git a/yarn.lock b/yarn.lock index fae632ae6..cfc7aa31f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3406,11 +3406,6 @@ didyoumean@1.2.2: resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" integrity sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw== -diff@3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" - integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA== - diff@5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" From 42e0926752c0ade5aaed306d04a8d3b123199e4d Mon Sep 17 00:00:00 2001 From: Sean King Date: Thu, 6 Oct 2022 22:10:16 -0600 Subject: [PATCH 4/8] Remove lolex package --- package.json | 1 - yarn.lock | 5 ----- 2 files changed, 6 deletions(-) diff --git a/package.json b/package.json index 95bd92846..211328f95 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,6 @@ "karma-spec-reporter": "0.0.34", "karma-webpack": "5.0.0", "lodash": "4.17.21", - "lolex": "1.6.0", "mini-css-extract-plugin": "2.6.1", "mocha": "10.0.0", "nightwatch": "2.3.3", diff --git a/yarn.lock b/yarn.lock index cfc7aa31f..3b37c22ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5709,11 +5709,6 @@ log4js@^6.4.1: rfdc "^1.3.0" streamroller "^3.0.6" -lolex@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6" - integrity sha1-OpoCg0UqR9dDnnJzG54H1zhuSfY= - longest-streak@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4" From f2a3883cec0d7f1f834f8a425748b361c7069b3d Mon Sep 17 00:00:00 2001 From: Pleroma Renovate Bot Date: Sat, 8 Oct 2022 09:06:30 +0000 Subject: [PATCH 5/8] Update dependency @vuelidate/validators to v2.0.0 --- package.json | 2 +- yarn.lock | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index e353e6fab..313654a94 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@kazvmoe-infra/unicode-emoji-json": "0.4.0", "@ruffle-rs/ruffle": "0.1.0-nightly.2022.7.12", "@vuelidate/core": "2.0.0-alpha.44", - "@vuelidate/validators": "2.0.0-alpha.31", + "@vuelidate/validators": "2.0.0", "body-scroll-lock": "3.1.5", "chromatism": "3.0.0", "click-outside-vue3": "4.0.1", diff --git a/yarn.lock b/yarn.lock index 54053be2b..941473b45 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1999,12 +1999,12 @@ dependencies: vue-demi "^0.13.4" -"@vuelidate/validators@2.0.0-alpha.31": - version "2.0.0-alpha.31" - resolved "https://registry.yarnpkg.com/@vuelidate/validators/-/validators-2.0.0-alpha.31.tgz#04d63307bc0a12db9f7ad94243350b83aacee998" - integrity sha512-+MFA9nZ7Y9zCpq383/voPDk/hiAmu6KqiJJhLOYB/FmrUPVoyKnuKnI9Bwiq8ok9GZlVkI8BnIrKPKGj9QpwiQ== +"@vuelidate/validators@2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@vuelidate/validators/-/validators-2.0.0.tgz#1ddd86c6c81b2cfbb5720961e951cc53ec0a80be" + integrity sha512-fQQcmDWfz7pyH5/JPi0Ng2GEgNK1pUHn/Z/j5rG/Q+HwhgIXvJblTPcZwKOj1ABL7V4UVuGKECvZCDHNGOwdrg== dependencies: - vue-demi "^0.13.4" + vue-demi "^0.13.11" "@webassemblyjs/ast@1.11.1": version "1.11.1" @@ -8280,6 +8280,11 @@ void-elements@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" +vue-demi@^0.13.11: + version "0.13.11" + resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.11.tgz#7d90369bdae8974d87b1973564ad390182410d99" + integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A== + vue-demi@^0.13.4: version "0.13.5" resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.5.tgz#d5eddbc9eaefb89ce5995269d1fa6b0486312092" From 0331e42ee8576893dab2c6319ee5c0d62895b8d8 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 9 Oct 2022 18:50:13 +0300 Subject: [PATCH 6/8] move definitions for timeline header buttons to Panel.scss, now called rightside buttons --- src/components/conversation/conversation.vue | 2 ++ .../notifications/notifications.scss | 21 ------------ .../notifications/notifications.vue | 4 +-- src/components/timeline/timeline.scss | 32 ------------------- src/components/timeline/timeline.vue | 10 +++--- src/panel.scss | 32 +++++++++++++++++++ 6 files changed, 41 insertions(+), 60 deletions(-) diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 618325660..3752e3c1c 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -20,10 +20,12 @@
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss index 245e3f47b..f71f9b761 100644 --- a/src/components/notifications/notifications.scss +++ b/src/components/notifications/notifications.scss @@ -29,27 +29,6 @@ } } } - - .timeline-header-button { - align-self: stretch; - text-align: center; - width: var(--__panel-heading-height); - height: var(--__panel-heading-height); - margin: calc(-1 * var(--panel-heading-height-padding)) 0; - margin-right: calc(-1 * var(--__panel-heading-gap)); - - > button { - box-sizing: border-box; - padding: calc(1 * var(--panel-heading-height-padding)) 0; - height: 100%; - width: 100%; - text-align: center; - - svg { - font-size: 1.2em; - } - } - } } .notification { diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue index 22f67e654..3f4b1b421 100644 --- a/src/components/notifications/notifications.vue +++ b/src/components/notifications/notifications.vue @@ -21,7 +21,7 @@ >{{ unseenCount }}
- +
button { - box-sizing: border-box; - padding: calc(1 * var(--panel-heading-height-padding)) 0; - height: 100%; - width: 100%; - text-align: center; - - svg { - font-size: 1.2em; - } - } - } - - .timeline-header-icon { - align-self: stretch; - text-align: center; - width: var(--__panel-heading-height); - margin-right: calc(-1 * var(--__panel-heading-gap)); - - svg { - font-size: 1.2em; - } - } - .loadmore-button { position: relative } diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 15d097e8b..77480345c 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -6,7 +6,7 @@ :timeline-name="timelineName" />
button { + box-sizing: border-box; + padding: calc(1 * var(--panel-heading-height-padding)) 0; + height: 100%; + width: 100%; + text-align: center; + + svg { + font-size: 1.2em; + } + } + } + + .rightside-icon { + align-self: stretch; + text-align: center; + width: var(--__panel-heading-height); + margin-right: calc(-1 * var(--__panel-heading-gap)); + + svg { + font-size: 1.2em; + } + } } .panel-footer { From cf9957c7332f30db12fce8a2b1d21d9ba508537b Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 9 Oct 2022 19:00:25 +0300 Subject: [PATCH 7/8] fix alert dot --- src/components/navigation/navigation_pins.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/navigation/navigation_pins.vue b/src/components/navigation/navigation_pins.vue index 5b3fa6f46..9cb4b5361 100644 --- a/src/components/navigation/navigation_pins.vue +++ b/src/components/navigation/navigation_pins.vue @@ -39,10 +39,8 @@ height: 0.5em; width: 0.5em; position: absolute; - right: calc(50% - 0.25em); - top: calc(50% - 0.25em); - margin-left: 6px; - margin-top: -6px; + right: calc(50% - 0.75em); + top: calc(50% - 0.5em); background-color: $fallback--cRed; background-color: var(--badgeNotification, $fallback--cRed); } From 8b957fb85e6668d9c1cf771c788bb619f5cedf93 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 9 Oct 2022 19:04:45 +0300 Subject: [PATCH 8/8] fix chevrons alignment --- src/components/nav_panel/nav_panel.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue index 7373ca633..d628c3805 100644 --- a/src/components/nav_panel/nav_panel.vue +++ b/src/components/nav_panel/nav_panel.vue @@ -12,7 +12,7 @@ @click="toggleCollapse" > @@ -143,12 +143,17 @@ border: none; } - .timelines-chevron { + .navigation-chevron { margin-left: 0.8em; margin-right: 0.8em; font-size: 1.1em; } + .timelines-chevron { + margin-left: 0.8em; + font-size: 1.1em; + } + .timelines-background { padding: 0 0 0 0.6em; background-color: $fallback--lightBg;