diff --git a/src/extensionsIntegrated/Phoenix-live-preview/live-preview.css b/src/extensionsIntegrated/Phoenix-live-preview/live-preview.css index 8c72ac0fbc..98451f774e 100644 --- a/src/extensionsIntegrated/Phoenix-live-preview/live-preview.css +++ b/src/extensionsIntegrated/Phoenix-live-preview/live-preview.css @@ -250,24 +250,6 @@ margin-top: 0; } -.lp-fit-to-panel-btn { - color: #a0a0a0; - flex-shrink: 0; - margin: 0 2px; - background: transparent; - border: 1px solid transparent; - box-shadow: none; - font-size: 12px; -} - -.lp-fit-to-panel-btn:hover, -.lp-fit-to-panel-btn:focus, -.lp-fit-to-panel-btn:active { - background: transparent !important; - border: 1px solid rgba(255, 255, 255, 0.1) !important; - box-shadow: none !important; -} - .lp-device-size-btn-group { display: flex; align-items: center; diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 5e797fc578..e906ea580e 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -523,11 +523,12 @@ define({ "LIVE_DEV_IMAGE_FOLDER_DIALOG_HELP": "💡 Type folder path or leave empty to download in 'images' folder.", "LIVE_DEV_IMAGE_FOLDER_DIALOG_REMEMBER": "Don't ask again for this project", "AVAILABLE_IN_PRO_TITLE": "Available in Phoenix Pro", - "DEVICE_SIZE_LIMIT_MESSAGE": "See how your page looks on phones, tablets, desktops, and your CSS breakpoints. Upgrade to Phoenix Pro.", - "DEVICE_SIZE_NOT_ENOUGH_SPACE": "Not enough space for this screen size - try zooming out", + "DEVICE_SIZE_LIMIT_MESSAGE": "To switch between mobile, tablet, and desktop views, upgrade to Phoenix Pro.", + "DEVICE_SIZE_NOT_ENOUGH_SPACE": "This screen doesn’t fit in the current window size — try expanding the window", + "DEVICE_SIZE_CYCLE_NO_FIT": "Screen too small to switch to another device size — increase the window size", "DEVICE_SIZE_CYCLE_TOOLTIP": "Switch between mobile, tablet, and desktop", "DEVICE_SIZE_DROPDOWN_TOOLTIP": "All device sizes", - "DEVICE_SIZE_FIT_TO_PANEL": "Fit to panel", + "DEVICE_SIZE_FIT_TO_SCREEN": "Fit to screen", "MD_EDIT_UPSELL_MESSAGE": "Write Markdown like a document. {APP_NAME} handles the formatting so you can stay focused on writing.", "IMAGE_UPLOADING": "Uploading", "IMAGE_UPLOAD_FAILED": "Failed to upload image", @@ -1561,9 +1562,8 @@ define({ "BOTTOM_PANEL_MINIMIZE": "Minimize Panel", "BOTTOM_PANEL_SHOW": "Show Bottom Panel", "BOTTOM_PANEL_HIDE_TOGGLE": "Hide Bottom Panel", - "BOTTOM_PANEL_DEFAULT_TITLE": "Quick Access - Tools", - "BOTTOM_PANEL_DEFAULT_HEADING": "Open a Panel", - "BOTTOM_PANEL_OPEN_PANEL": "Open a Panel", + "BOTTOM_PANEL_DEFAULT_TITLE": "Tools", + "BOTTOM_PANEL_DEFAULT_HEADING": "Tools", "BOTTOM_PANEL_MAXIMIZE": "Maximize Panel", "BOTTOM_PANEL_RESTORE": "Restore Panel Size", diff --git a/src/styles/CentralControlBar.less b/src/styles/CentralControlBar.less index 2c8d992c44..6f82550f48 100644 --- a/src/styles/CentralControlBar.less +++ b/src/styles/CentralControlBar.less @@ -41,6 +41,14 @@ still staying on-theme in light mode. */ background-color: #222; border-right: 1px solid rgba(0, 0, 0, 0.45); + /* Extend CCB's paint by 2px on each side without affecting layout. Under + non-integer DPR (e.g. 110% browser zoom) subpixel rounding can leave a + 1px gap between CCB and the sidebar on the left, and between CCB and the + editor on the right. A solid box-shadow with zero blur paints CCB-colored + pixels into those gaps without shifting any geometry. */ + box-shadow: + -2px 0 0 0 #222, + 2px 0 0 0 #222; .ccb-group { display: flex; diff --git a/test/spec/md-editor-integ-test.js b/test/spec/md-editor-integ-test.js index 3dc43a1056..47f5e5576e 100644 --- a/test/spec/md-editor-integ-test.js +++ b/test/spec/md-editor-integ-test.js @@ -222,7 +222,7 @@ define(function (require, exports, module) { }, "md preview synced with editor content", 5000); } - describe("livepreview:Markdown Editor", function () { + describe("livepreview:Markdown Editor 1", function () { if (Phoenix.browser.desktop.isFirefox || (Phoenix.isTestWindowPlaywright && !Phoenix.browser.desktop.isChromeBased)) { @@ -527,18 +527,20 @@ define(function (require, exports, module) { await _enterEditMode(); await _focusMdContent(); - const listener = _listenForShortcut("F8"); - _dispatchPlainKeyInMdIframe("F8", { keyCode: 119, code: "F8" }); - await awaitsFor(() => listener.check(), "F8 shortcut to be forwarded in edit mode"); + // Use F9 (unbound) — F8 is bound to the Live Preview edit toggle which shows + // a pro upsell dialog for free users and blocks tests. + const listener = _listenForShortcut("F9"); + _dispatchPlainKeyInMdIframe("F9", { keyCode: 120, code: "F9" }); + await awaitsFor(() => listener.check(), "F9 shortcut to be forwarded in edit mode"); listener.cleanup(); }, 10000); it("should F-key shortcuts work in reader mode", async function () { await _enterReaderMode(); - const listener = _listenForShortcut("F8"); - _dispatchPlainKeyInMdIframe("F8", { keyCode: 119, code: "F8" }); - await awaitsFor(() => listener.check(), "F8 shortcut to be forwarded in reader mode"); + const listener = _listenForShortcut("F9"); + _dispatchPlainKeyInMdIframe("F9", { keyCode: 120, code: "F9" }); + await awaitsFor(() => listener.check(), "F9 shortcut to be forwarded in reader mode"); listener.cleanup(); }, 10000); diff --git a/tracking-repos.json b/tracking-repos.json index 2f81c3ed31..8e084e487d 100644 --- a/tracking-repos.json +++ b/tracking-repos.json @@ -1,5 +1,5 @@ { "phoenixPro": { - "commitID": "0bb0ed293e70501363fa3cd9916319ea1dbf38bb" + "commitID": "cbd55399cc8907d7bf072038b70319b1d4b5ef87" } }