From 971cec024c393438e714714e0d8e291b3714eaec Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 22 Mar 2022 10:20:45 +0200 Subject: [PATCH 1/6] fix avatars in mobile view --- src/components/status/status.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/status/status.scss b/src/components/status/status.scss index 3f647b25..0335dd54 100644 --- a/src/components/status/status.scss +++ b/src/components/status/status.scss @@ -402,17 +402,17 @@ } @media all and (max-width: 800px) { - .repeater-avatar { + > .repeater-avatar { margin-left: 20px; } - .avatar:not(.repeater-avatar) { + > .avatar:not(.repeater-avatar) { width: 40px; height: 40px; // TODO define those other way somehow? // stylelint-disable rscss/class-format - &.avatar-compact { + &.-compact { width: 32px; height: 32px; } From 304f871332226c064febf7fd9219f56085b44c8e Mon Sep 17 00:00:00 2001 From: Pleroma Renovate Bot Date: Tue, 22 Mar 2022 09:06:00 +0000 Subject: [PATCH 2/6] Update dependency karma-firefox-launcher to v1.3.0 --- package.json | 2 +- yarn.lock | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index bdab17a2..323a52f7 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "json-loader": "0.5.7", "karma": "3.1.4", "karma-coverage": "1.1.2", - "karma-firefox-launcher": "1.1.0", + "karma-firefox-launcher": "1.3.0", "karma-mocha": "1.3.0", "karma-mocha-reporter": "2.2.5", "karma-sinon-chai": "2.0.2", diff --git a/yarn.lock b/yarn.lock index a4e33904..df8d61a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5364,6 +5364,11 @@ is-directory@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" +is-docker@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== + is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -5566,6 +5571,13 @@ is-wsl@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" +is-wsl@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + is2@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/is2/-/is2-2.0.1.tgz#8ac355644840921ce435d94f05d3a94634d3481a" @@ -5746,10 +5758,12 @@ karma-coverage@1.1.2: minimatch "^3.0.0" source-map "^0.5.1" -karma-firefox-launcher@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz#2c47030452f04531eb7d13d4fc7669630bb93339" - integrity sha512-LbZ5/XlIXLeQ3cqnCbYLn+rOVhuMIK9aZwlP6eOLGzWdo1UVp7t6CN3DP4SafiRLjexKwHeKHDm0c38Mtd3VxA== +karma-firefox-launcher@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/karma-firefox-launcher/-/karma-firefox-launcher-1.3.0.tgz#ebcbb1d1ddfada6be900eb8fae25bcf2dcdc8171" + integrity sha512-Fi7xPhwrRgr+94BnHX0F5dCl1miIW4RHnzjIGxF8GaIEp7rNqX7LSi7ok63VXs3PS/5MQaQMhGxw+bvD+pibBQ== + dependencies: + is-wsl "^2.1.0" karma-mocha-reporter@2.2.5: version "2.2.5" From 636a55e72d522b8e12e9c0769871051089ea0e5a Mon Sep 17 00:00:00 2001 From: Pleroma Renovate Bot Date: Tue, 22 Mar 2022 09:06:08 +0000 Subject: [PATCH 3/6] Update dependency mini-css-extract-plugin to v0.12.0 --- package.json | 2 +- yarn.lock | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index bdab17a2..4255e597 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "karma-webpack": "4.0.2", "lodash": "4.17.21", "lolex": "1.6.0", - "mini-css-extract-plugin": "0.5.0", + "mini-css-extract-plugin": "0.12.0", "mocha": "3.5.3", "nightwatch": "0.9.21", "opn": "4.0.2", diff --git a/yarn.lock b/yarn.lock index a4e33904..55e9c0db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6537,12 +6537,13 @@ min-indent@^1.0.0: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -mini-css-extract-plugin@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0" - integrity sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw== +mini-css-extract-plugin@0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.12.0.tgz#ddeb74fd6304ca9f99c1db74acc7d5b507705454" + integrity sha512-z6PQCe9rd1XUwZ8gMaEVwwRyZlrYy8Ba1gRjFP5HcV51HkXX+XlwZ+a1iAYTjSYwgNBXoNR7mhx79mDpOn5fdw== dependencies: loader-utils "^1.1.0" + normalize-url "1.9.1" schema-utils "^1.0.0" webpack-sources "^1.1.0" @@ -6948,7 +6949,7 @@ normalize-selector@^0.2.0: resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03" integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM= -normalize-url@^1.4.0: +normalize-url@1.9.1, normalize-url@^1.4.0: version "1.9.1" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c" dependencies: From 623aa3d20d1832178dd37e457be9520e8e1cd635 Mon Sep 17 00:00:00 2001 From: Pleroma Renovate Bot Date: Tue, 22 Mar 2022 09:06:15 +0000 Subject: [PATCH 4/6] Update dependency ora to v0.4.1 --- package.json | 2 +- yarn.lock | 40 ++++++++++------------------------------ 2 files changed, 11 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index bdab17a2..160893f8 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "mocha": "3.5.3", "nightwatch": "0.9.21", "opn": "4.0.2", - "ora": "0.3.0", + "ora": "0.4.1", "postcss-loader": "3.0.0", "raw-loader": "0.5.1", "sass": "1.20.1", diff --git a/yarn.lock b/yarn.lock index a4e33904..b06b5eb4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2776,21 +2776,16 @@ clean-stack@^2.0.0: resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== -cli-cursor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" - dependencies: - restore-cursor "^1.0.1" - cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" dependencies: restore-cursor "^2.0.0" -cli-spinners@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.2.0.tgz#85078737913b880f6ec9ffe7b65e83ec7776284f" +cli-spinners@^1.0.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.3.1.tgz#002c1990912d0d59580c93bd36c056de99e4259a" + integrity sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg== cli-width@^2.0.0: version "2.2.0" @@ -4088,10 +4083,6 @@ execall@^2.0.0: dependencies: clone-regexp "^2.1.0" -exit-hook@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" - expand-braces@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea" @@ -7080,10 +7071,6 @@ once@1.x, once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -onetime@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" - onetime@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" @@ -7116,14 +7103,14 @@ optionator@^0.8.1, optionator@^0.8.2: type-check "~0.3.2" wordwrap "~1.0.0" -ora@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/ora/-/ora-0.3.0.tgz#367a078ad25cfb096da501115eb5b401e07d7495" - integrity sha1-NnoHitJc+wltpQERXrW0AeB9dJU= +ora@0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/ora/-/ora-0.4.1.tgz#e268187c8890295f7859ac535fd8ca2c0ff64de7" + integrity sha1-4mgYfIiQKV94WaxTX9jKLA/2Tec= dependencies: chalk "^1.1.1" - cli-cursor "^1.0.2" - cli-spinners "^0.2.0" + cli-cursor "^2.1.0" + cli-spinners "^1.0.0" log-symbols "^1.0.2" os-browserify@^0.3.0: @@ -8474,13 +8461,6 @@ resolve@^1.3.2: dependencies: path-parse "^1.0.6" -restore-cursor@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" - dependencies: - exit-hook "^1.0.0" - onetime "^1.0.0" - restore-cursor@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" From c6e0dcf08eda87867a3848ca49cb0f8c2ce9a02c Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 22 Mar 2022 11:43:51 +0200 Subject: [PATCH 5/6] fix even more issues with avatars --- src/components/status/status.scss | 2 +- src/components/status/status.vue | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/status/status.scss b/src/components/status/status.scss index 3f647b25..ae368bb7 100644 --- a/src/components/status/status.scss +++ b/src/components/status/status.scss @@ -406,7 +406,7 @@ margin-left: 20px; } - .avatar:not(.repeater-avatar) { + .post-avatar { width: 40px; height: 40px; diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 3de4c471..2387151e 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -125,6 +125,7 @@ @click.stop.prevent.capture.native="toggleUserExpanded" >
From fa99abf1068e75b89221130c6d5d4c83fcbcefd9 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 22 Mar 2022 11:57:21 +0200 Subject: [PATCH 6/6] quick fix for alignment in avatars, juggling multiple branches is confusing --- src/components/status/status.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/status/status.scss b/src/components/status/status.scss index d57c7335..5ed43e0d 100644 --- a/src/components/status/status.scss +++ b/src/components/status/status.scss @@ -402,7 +402,7 @@ } @media all and (max-width: 800px) { - > .repeater-avatar { + .repeater-avatar { margin-left: 20px; }