TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-25 11:55:03 +03:00
Code Issues Projects Releases Wiki Activity

🐛 Fixed broken styles in Admin's search modal

Browse Source 
This reverts commit e581263682.

- ember-power-select and ember-basic-dropdown updates changed which elements classes are assigned to in some cases
- revert is the quick-fix option for getting back to the working state
- dependency updates should be pushed again later with app-level changes needed to match new behaviour with old designs
This commit is contained in:
Kevin Ansfield 2022-01-10 14:08:31 +00:00 committed by Daniel Lockyer
parent d8aebb0c24
commit d63e722bcd
2 changed files with 134 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghost/admin/package.json
View File

@ -100,7 +100,7 @@
"ember-one-way-select": "4.0.1",
"ember-power-calendar-moment": "0.1.7",
"ember-power-datepicker": "cibernox/ember-power-datepicker",
"ember-power-select": "5.0.3",
"ember-power-select": "4.1.5",
"ember-promise-modals": "TryGhost/ember-promise-modals#v2.0.0+ghost.3",
"ember-resolver": "8.0.3",
"ember-route-action-helper": "2.0.8",
@ -152,6 +152,6 @@
]
},
"resolutions": {
"ember-basic-dropdown": "4.0.2"
"ember-basic-dropdown": "3.0.16"
}
}

195
ghost/admin/yarn.lock
View File

@ -1189,7 +1189,7 @@
ember-cli-babel "^6.16.0"
ember-compatibility-helpers "^1.1.1"
"@ember/render-modifiers@2.0.2", "@ember/render-modifiers@^1.0.2 || ^2.0.0", "@ember/render-modifiers@^2.0.2":
"@ember/render-modifiers@2.0.2", "@ember/render-modifiers@^1.0.2 || ^2.0.0":
version "2.0.2"
resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-2.0.2.tgz#a5a84c7d1481ac4936ba03695ba98776f1274afd"
integrity sha512-TURKkO+ihsgVAw1gql/76DILs2VbJZGWeB4pUsGFxFEeC8SFRD9N58Wlh+uJS3Q8vg6oZZa16dw1rFiTv0q43Q==
@ -1198,6 +1198,14 @@
ember-cli-babel "^7.26.6"
ember-modifier-manager-polyfill "^1.2.0"
"@ember/render-modifiers@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-1.0.2.tgz#2e87c48db49d922ce4850d707215caaac60d8444"
integrity sha512-6tEnHl5+62NTSAG2mwhGMFPhUrJQjoVqV+slsn+rlTknm2Zik+iwxBQEbwaiQOU1FUYxkS8RWcieovRNMR8inQ==
dependencies:
ember-cli-babel "^7.10.0"
ember-modifier-manager-polyfill "^1.1.0"
"@ember/test-helpers@^1.7.1":
version "1.7.3"
resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-1.7.3.tgz#d06b36cb579b172186b11b236b90f0a1aba15ab0"
@ -1294,6 +1302,45 @@
walk-sync "^1.1.3"
wrap-legacy-hbs-plugin-if-needed "^1.0.1"
"@embroider/core@0.36.0":
version "0.36.0"
resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.36.0.tgz#fbbd60d29c3fcbe02b4e3e63e6043a43de2b9ce3"
integrity sha512-J6esENP+aNt+/r070cF1RCJyCi/Rn1I6uFp37vxyLWwvGDuT0E7wGcaPU29VBkBFqxi4Z1n4F796BaGHv+kX6w==
dependencies:
"@babel/core" "^7.12.3"
"@babel/parser" "^7.12.3"
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
"@babel/plugin-transform-runtime" "^7.12.1"
"@babel/runtime" "^7.12.5"
"@babel/traverse" "^7.12.1"
"@babel/types" "^7.12.1"
"@embroider/macros" "0.36.0"
assert-never "^1.1.0"
babel-plugin-syntax-dynamic-import "^6.18.0"
broccoli-node-api "^1.7.0"
broccoli-persistent-filter "^3.1.2"
broccoli-plugin "^4.0.1"
broccoli-source "^3.0.0"
debug "^3.1.0"
escape-string-regexp "^4.0.0"
fast-sourcemap-concat "^1.4.0"
filesize "^4.1.2"
fs-extra "^7.0.1"
fs-tree-diff "^2.0.0"
handlebars "^4.4.2"
js-string-escape "^1.0.1"
jsdom "^16.4.0"
json-stable-stringify "^1.0.1"
lodash "^4.17.10"
pkg-up "^3.1.0"
resolve "^1.8.1"
resolve-package-path "^1.2.2"
semver "^7.3.2"
strip-bom "^3.0.0"
typescript-memoize "^1.0.0-alpha.3"
walk-sync "^1.1.3"
wrap-legacy-hbs-plugin-if-needed "^1.0.1"
"@embroider/macros@0.29.0", "@embroider/macros@^0.29.0":
version "0.29.0"
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.29.0.tgz#33048069b0abdda17efc7ff438b18b0c2c237bff"
@ -1324,6 +1371,21 @@
resolve "^1.8.1"
semver "^7.3.2"
"@embroider/macros@0.36.0", "@embroider/macros@^0.36.0":
version "0.36.0"
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.36.0.tgz#5330f1e6f12112f0f68e34b3e4855dc7dd3c69a5"
integrity sha512-w37G4uXG+Wi3K3EHSFBSr/n6kGFXYG8nzZ9ptzDOC7LP3Oh5/MskBnVZW3+JkHXUPEqKsDGlxPxCVpPl1kQyjQ==
dependencies:
"@babel/core" "^7.12.3"
"@babel/traverse" "^7.12.1"
"@babel/types" "^7.12.1"
"@embroider/core" "0.36.0"
assert-never "^1.1.0"
ember-cli-babel "^7.23.0"
lodash "^4.17.10"
resolve "^1.8.1"
semver "^7.3.2"
"@embroider/macros@0.41.0":
version "0.41.0"
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.41.0.tgz#3e78b6f388d7229906abf4c75edfff8bb0208aca"
@ -1336,19 +1398,6 @@
resolve "^1.8.1"
semver "^7.3.2"
"@embroider/macros@0.47.2", "@embroider/macros@^0.47.0", "@embroider/macros@^0.47.2", "@embroider/macros@~0.47.2":
version "0.47.2"
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.47.2.tgz#23cbe92cac3c24747f054e1eea2a22538bf7ebd0"
integrity sha512-ViNWluJCeM5OPlM3rs8kdOz3RV5rpfXX5D2rDnc/q86xRS0xf4NFEjYRV7W6fBcD0b3v5jSHDTwrjq9Kee4rHg==
dependencies:
"@embroider/shared-internals" "0.47.2"
assert-never "^1.2.1"
ember-cli-babel "^7.26.6"
find-up "^5.0.0"
lodash "^4.17.21"
resolve "^1.20.0"
semver "^7.3.2"
"@embroider/macros@>= 0.48.1 < 2.0.0-alpha.1":
version "0.49.0"
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.49.0.tgz#65b4ed734d1266013a452aed2a3adb8694832112"
@ -1374,6 +1423,19 @@
resolve "^1.8.1"
semver "^7.3.2"
"@embroider/macros@^0.47.0", "@embroider/macros@~0.47.2":
version "0.47.2"
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.47.2.tgz#23cbe92cac3c24747f054e1eea2a22538bf7ebd0"
integrity sha512-ViNWluJCeM5OPlM3rs8kdOz3RV5rpfXX5D2rDnc/q86xRS0xf4NFEjYRV7W6fBcD0b3v5jSHDTwrjq9Kee4rHg==
dependencies:
"@embroider/shared-internals" "0.47.2"
assert-never "^1.2.1"
ember-cli-babel "^7.26.6"
find-up "^5.0.0"
lodash "^4.17.21"
resolve "^1.20.0"
semver "^7.3.2"
"@embroider/shared-internals@0.40.0":
version "0.40.0"
resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.40.0.tgz#2f768c60f4f35ba5f9228f046f70324851e8bfe2"
@ -1426,6 +1488,14 @@
semver "^7.3.5"
typescript-memoize "^1.0.1"
"@embroider/util@^0.36.0":
version "0.36.0"
resolved "https://registry.yarnpkg.com/@embroider/util/-/util-0.36.0.tgz#b2ffb2b06ac491f157a771392191ce91ef2216a6"
integrity sha512-gMIGL9UQ6Pl5WvpcIqIiE+QkK5GW49VLp+IEl+v4w9ZBkH7Z9boiwWariW4y/FtNU1iU8ELFbol1+IJ8I8VN4Q==
dependencies:
"@embroider/macros" "0.36.0"
ember-cli-babel "^7.22.1"
"@embroider/util@^0.39.1 || ^0.40.0 || ^0.41.0":
version "0.41.0"
resolved "https://registry.yarnpkg.com/@embroider/util/-/util-0.41.0.tgz#5324cb4742aa4ed8d613c4f88a466f73e4e6acc1"
@ -1435,15 +1505,6 @@
broccoli-funnel "^3.0.5"
ember-cli-babel "^7.23.1"
"@embroider/util@^0.47.2":
version "0.47.2"
resolved "https://registry.yarnpkg.com/@embroider/util/-/util-0.47.2.tgz#d06497b4b84c07ed9c7b628293bb019c533f4556"
integrity sha512-g9OqnFJPktGu9NS0Ug3Pxz1JE3jeDceeVE4IrlxDrVmBXMA/GrBvpwjolWgl6jh97cMJyExdz62jIvPHV4256Q==
dependencies:
"@embroider/macros" "0.47.2"
broccoli-funnel "^3.0.5"
ember-cli-babel "^7.23.1"
"@eslint/eslintrc@^0.4.3":
version "0.4.3"
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
@ -1485,7 +1546,7 @@
dependencies:
"@fortawesome/fontawesome-common-types" "^0.2.36"
"@glimmer/component@1.0.4", "@glimmer/component@^1.0.4":
"@glimmer/component@1.0.4", "@glimmer/component@^1.0.2", "@glimmer/component@^1.0.4":
version "1.0.4"
resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-1.0.4.tgz#1c85a5181615a6647f6acfaaed68e28ad7e9626e"
integrity sha512-sS4N8wtcKfYdUJ6O3m8nbTut6NjErdz94Ap8VB1ekcg4WSD+7sI7Nmv6kt2rdPoe363nUdjUbRBzHNWhLzraBw==
@ -1572,7 +1633,7 @@
handlebars "^4.0.13"
simple-html-tokenizer "^0.5.8"
"@glimmer/tracking@^1.0.0", "@glimmer/tracking@^1.0.4":
"@glimmer/tracking@^1.0.0", "@glimmer/tracking@^1.0.2", "@glimmer/tracking@^1.0.4":
version "1.0.4"
resolved "https://registry.yarnpkg.com/@glimmer/tracking/-/tracking-1.0.4.tgz#f1bc1412fe5e2236d0f8d502994a8f88af1bbb21"
integrity sha512-F+oT8I55ba2puSGIzInmVrv/8QA2PcK1VD+GWgFMhF6WC97D+uZX7BFg+a3s/2N4FVBq5KHE+QxZzgazM151Yw==
@ -5849,7 +5910,7 @@ ember-ajax@5.1.1:
ember-cli-babel "^7.5.0"
najax "^1.0.7"
ember-assign-helper@0.4.0, ember-assign-helper@^0.4.0:
ember-assign-helper@0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/ember-assign-helper/-/ember-assign-helper-0.4.0.tgz#f0a313033656c0d2cbbcb29d55b9cd13f04bc7c1"
integrity sha512-GKHhT4HD2fhtDnuBk6eCdCA8XGew9hY7TVs8zjrykegiI7weC0CGtpJscmIG3O0gEEb0d07UTkF2pjfNGLx4Nw==
@ -5908,22 +5969,22 @@ ember-auto-import@1.12.0, ember-auto-import@^1.11.2, ember-auto-import@^1.11.3,
walk-sync "^0.3.3"
webpack "^4.43.0"
ember-basic-dropdown@4.0.2, ember-basic-dropdown@^3.0.11, "ember-basic-dropdown@^3.1.0 || ^4.0.2":
version "4.0.2"
resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-4.0.2.tgz#7d633cecc0118e4814a98d727adf7dfaafe847e7"
integrity sha512-iBFmD2xoQUYSAN1BYKFY2fkCu2RhXO66kZsduUcA+UBcq/8sys4VvOTMJrJNuMDpFfLAE+3FO98xFSC3M4UV2Q==
ember-basic-dropdown@3.0.16, ember-basic-dropdown@^3.0.11, ember-basic-dropdown@^3.0.17:
version "3.0.16"
resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-3.0.16.tgz#287fcde57b5a37405d89cc65e0a4ad9a2e8e1b0b"
integrity sha512-ctVQL63nWoZ6+Lvb6aCo70SUA8ieMz5fQa0BuQKeV2LQx8njXDiZZ96gaK0PBn60glNghbIr1ZKU+wmnIT++5w==
dependencies:
"@ember/render-modifiers" "^2.0.2"
"@embroider/macros" "^0.47.2"
"@embroider/util" "^0.47.2"
"@ember/render-modifiers" "^1.0.2"
"@embroider/macros" "^0.36.0"
"@embroider/util" "^0.36.0"
"@glimmer/component" "^1.0.4"
"@glimmer/tracking" "^1.0.4"
ember-cli-babel "^7.26.6"
ember-cli-htmlbars "^6.0.0"
ember-cli-typescript "^4.2.1"
ember-element-helper "^0.5.5"
ember-maybe-in-element "^2.0.3"
ember-style-modifier "^0.7.0"
ember-cli-babel "^7.23.1"
ember-cli-htmlbars "^5.3.2"
ember-cli-typescript "^4.1.0"
ember-element-helper "^0.3.2"
ember-maybe-in-element "^2.0.1"
ember-style-modifier "^0.6.0"
ember-truth-helpers "^2.1.0 || ^3.0.0"
ember-classic-decorator@2.0.1:
@ -6148,7 +6209,7 @@ ember-cli-htmlbars@^4.2.0, ember-cli-htmlbars@^4.2.3, ember-cli-htmlbars@^4.3.1:
strip-bom "^4.0.0"
walk-sync "^2.0.2"
ember-cli-htmlbars@^5.1.0, ember-cli-htmlbars@^5.1.2, ember-cli-htmlbars@^5.2.0, ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.7.1:
ember-cli-htmlbars@^5.1.0, ember-cli-htmlbars@^5.1.2, ember-cli-htmlbars@^5.2.0, ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.3.2, ember-cli-htmlbars@^5.7.1:
version "5.7.2"
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.7.2.tgz#e0cd2fb3c20d85fe4c3e228e6f0590ee1c645ba8"
integrity sha512-Uj6R+3TtBV5RZoJY14oZn/sNPnc+UgmC8nb5rI4P3fR/gYoyTFIZSXiIM7zl++IpMoIrocxOrgt+mhonKphgGg==
@ -6381,7 +6442,7 @@ ember-cli-typescript@^3.1.3, ember-cli-typescript@^3.1.4, ember-cli-typescript@~
stagehand "^1.0.0"
walk-sync "^2.0.0"
ember-cli-typescript@^4.1.0, ember-cli-typescript@^4.2.0, ember-cli-typescript@^4.2.1:
ember-cli-typescript@^4.1.0, ember-cli-typescript@^4.2.1:
version "4.2.1"
resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-4.2.1.tgz#54d08fc90318cc986f3ea562f93ce58a6cc4c24d"
integrity sha512-0iKTZ+/wH6UB/VTWKvGuXlmwiE8HSIGcxHamwNhEC5x1mN3z8RfvsFZdQWYUzIWFN2Tek0gmepGRPTwWdBYl/A==
@ -6645,7 +6706,16 @@ ember-drag-drop@0.4.8:
dependencies:
ember-cli-babel "^6.6.0"
ember-element-helper@^0.5.0, ember-element-helper@^0.5.5:
ember-element-helper@^0.3.2:
version "0.3.2"
resolved "https://registry.yarnpkg.com/ember-element-helper/-/ember-element-helper-0.3.2.tgz#a0e384c266c6fb0e39803708d6f5e83ce6dba659"
integrity sha512-t4lrekoRb/jVQeg/N1V0kzehV6cw0YAH1hG1H2+Ykl35YxpYdX7/8hKtaGzVPxceemUVFO7fUorEQ6Y//wpWdA==
dependencies:
ember-cli-babel "^7.17.2"
ember-cli-htmlbars "^5.1.0"
ember-compatibility-helpers "^1.2.1"
ember-element-helper@^0.5.0:
version "0.5.5"
resolved "https://registry.yarnpkg.com/ember-element-helper/-/ember-element-helper-0.5.5.tgz#4a9ecb4dce57ee7f5ceb868a53c7b498c729f056"
integrity sha512-Tu3hsI+/mjHBUvw62Qi+YDZtKkn59V66CjwbgfNTZZ7aHf4gFm1ow4zJ4WLnpnie8p9FvOmIUxwl5HvgPJIcFA==
@ -6830,7 +6900,7 @@ ember-maybe-import-regenerator@^0.1.6:
ember-cli-babel "^6.0.0-beta.4"
regenerator-runtime "^0.9.5"
ember-maybe-in-element@^2.0.3:
ember-maybe-in-element@^2.0.1:
version "2.0.3"
resolved "https://registry.yarnpkg.com/ember-maybe-in-element/-/ember-maybe-in-element-2.0.3.tgz#640ea56b492bdacd1c41c128c2163d933c18c3ec"
integrity sha512-XKuBYPYELwsEmDnJXI7aNSZtt/SKGgRZNMFhASODLz7j0OHSNrcJtjo5Wam/alxIjUIYVjEnMnOzqBLMfJnQkQ==
@ -6853,7 +6923,7 @@ ember-mocha@0.16.2:
ember-cli-test-loader "^2.2.0"
mocha "^2.5.3"
ember-modifier-manager-polyfill@^1.2.0:
ember-modifier-manager-polyfill@^1.1.0, ember-modifier-manager-polyfill@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/ember-modifier-manager-polyfill/-/ember-modifier-manager-polyfill-1.2.0.tgz#cf4444e11a42ac84f5c8badd85e635df57565dda"
integrity sha512-bnaKF1LLKMkBNeDoetvIJ4vhwRPKIIumWr6dbVuW6W6p4QV8ZiO+GdF8J7mxDNlog9CeL9Z/7wam4YS86G8BYA==
@ -6875,7 +6945,7 @@ ember-modifier@2.1.2, ember-modifier@^2.1.0:
ember-destroyable-polyfill "^2.0.2"
ember-modifier-manager-polyfill "^1.2.0"
"ember-modifier@^2.1.2 || ^3.0.0", ember-modifier@^3.0.0:
"ember-modifier@^2.1.2 || ^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-3.0.0.tgz#74466d32e4ef9b80004915676cc3bfd6e3fd7a3d"
integrity sha512-ccXfMnjWhjEUCB5taeIPQmf0h1zPUIMbmsCV7W+JZ2BioPUZTLhE1WuHspmV0iEOiX3Fwx8jMOx6b74sFcKJ0g==
@ -6937,19 +7007,18 @@ ember-power-datepicker@cibernox/ember-power-datepicker:
ember-decorators "^6.1.1"
ember-power-calendar "^0.16.3"
ember-power-select@5.0.3:
version "5.0.3"
resolved "https://registry.yarnpkg.com/ember-power-select/-/ember-power-select-5.0.3.tgz#615da0742a222a8c090590dd2cbb2db3a6147ac5"
integrity sha512-V72DxohhuPdsF6Rcxu1cVL2faHSk83RdTCkxeDT71NeQQNpHKbslhc0c+MMU52wm0mzch+oWmti/2McpL/vIvQ==
ember-power-select@4.1.5:
version "4.1.5"
resolved "https://registry.yarnpkg.com/ember-power-select/-/ember-power-select-4.1.5.tgz#8bf4b77a5577972ac7793d7ac81580f79154d122"
integrity sha512-J/WJau0fXBl6VGocctUKElK2vJYMzUfk2AqD61ezGVLF65aobo8G4BJuQoIZJr6dl2++fuNWHjO5iz8dHEAVPQ==
dependencies:
"@embroider/util" "^0.47.2"
"@glimmer/component" "^1.0.4"
"@glimmer/tracking" "^1.0.4"
ember-assign-helper "^0.4.0"
ember-basic-dropdown "^3.1.0 || ^4.0.2"
ember-cli-babel "^7.26.0"
ember-cli-htmlbars "^6.0.0"
ember-cli-typescript "^4.2.0"
"@glimmer/component" "^1.0.2"
"@glimmer/tracking" "^1.0.2"
ember-assign-helper "^0.3.0"
ember-basic-dropdown "^3.0.17"
ember-cli-babel "^7.23.0"
ember-cli-htmlbars "^5.3.1"
ember-cli-typescript "^4.1.0"
ember-concurrency ">=1.0.0 <3"
ember-concurrency-decorators "^2.0.0"
ember-text-measurer "^0.6.0"
@ -7072,13 +7141,13 @@ ember-source@3.21.3:
semver "^6.1.1"
silent-error "^1.1.1"
ember-style-modifier@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/ember-style-modifier/-/ember-style-modifier-0.7.0.tgz#85b3dfd7e4bc2bd546df595f2dab4fb141cf7d87"
integrity sha512-iDzffiwJcb9j6gu3g8CxzZOTvRZ0BmLMEFl+uyqjiaj72VVND9+HbLyQRw1/ewPAtinhSktxxTTdwU/JO+stLw==
ember-style-modifier@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/ember-style-modifier/-/ember-style-modifier-0.6.0.tgz#cc5e58db7f6d6662028a7b4e3cf63cf25ba59a8f"
integrity sha512-KqW4vyR80l/GMJsuFV+WLqTmGjXKLpoQ/HAmno+oMDrMt13p/5ImrvarQ6lFgXttFnLCxl6YpMY4YX27p1G54g==
dependencies:
ember-cli-babel "^7.26.6"
ember-modifier "^3.0.0"
ember-cli-babel "^7.21.0"
ember-modifier "^2.1.0"
ember-svg-jar@2.3.3:
version "2.3.3"