diff --git a/docs/API-Reference/command/Commands.md b/docs/API-Reference/command/Commands.md index 0e2fef4988..e5b864be48 100644 --- a/docs/API-Reference/command/Commands.md +++ b/docs/API-Reference/command/Commands.md @@ -734,6 +734,12 @@ Opens support resources ## HELP\_GET\_PRO Opens Phoenix Pro page +**Kind**: global variable + + +## HELP\_CANCEL\_TRIAL +Cancels Phoenix Pro trial + **Kind**: global variable diff --git a/src/command/Commands.js b/src/command/Commands.js index 216561b404..dbd94cb219 100644 --- a/src/command/Commands.js +++ b/src/command/Commands.js @@ -405,6 +405,9 @@ define(function (require, exports, module) { /** Opens Phoenix Pro page */ exports.HELP_GET_PRO = "help.getPro"; // HelpCommandHandlers.js _handleLinkMenuItem() + /** Cancels Phoenix Pro trial */ + exports.HELP_CANCEL_TRIAL = "help.cancelTrial"; + /** Opens Phoenix License page */ exports.HELP_VIEW_LICENSE = "help.viewLicense"; // HelpCommandHandlers.js _handleLinkMenuItem() diff --git a/src/extensionsIntegrated/Phoenix-live-preview/live-preview.css b/src/extensionsIntegrated/Phoenix-live-preview/live-preview.css index 6045037088..6e3536afd7 100644 --- a/src/extensionsIntegrated/Phoenix-live-preview/live-preview.css +++ b/src/extensionsIntegrated/Phoenix-live-preview/live-preview.css @@ -142,6 +142,14 @@ opacity: 0.35; } +.device-size-item-breakpoint-icon { + margin-right: 6px; + width: 12px; + text-align: center; + font-size: inherit; + color: rgba(100, 180, 255, 0.8); +} + #livePreviewModeBtn { min-width: fit-content; display: flex; diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index bade4354d6..0d1870e0ea 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -232,6 +232,8 @@ define({ "LIVE_DEV_IMAGE_FOLDER_DIALOG_PLACEHOLDER": "Type folder path (e.g., assets/images/)", "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", + "DEVICE_SIZE_LIMIT_TITLE": "Responsive Preview Limit Reached", + "DEVICE_SIZE_LIMIT_MESSAGE": "Free accounts get a few responsive previews per day. Upgrade to Phoenix Pro for unlimited responsive previews across all device sizes.", "IMAGE_SEARCH_LIMIT_TITLE": "Image search limit reached", "IMAGE_SEARCH_LIMIT_MESSAGE": "You’ve used all {0} image searches for this month.
Start a paid Phoenix Pro plan to remove trial limits and continue searching.", "IMAGE_SEARCH_LIMIT_MESSAGE_THROTTLE": "Image search is temporarily unavailable due to high demand.
Start a paid Phoenix Pro plan to remove trial limits and continue searching.", @@ -695,6 +697,10 @@ define({ "CMD_HOW_TO_USE_BRACKETS": "How to Use {APP_NAME}", "CMD_SUPPORT": "{APP_NAME} Support", "CMD_GET_PRO": "Get Phoenix Pro", + "CMD_CANCEL_TRIAL": "Cancel Phoenix Pro Trial", + "CANCEL_TRIAL_TITLE": "Cancel {0} Trial?", + "CANCEL_TRIAL_MESSAGE": "You have {0} days remaining in your Phoenix Pro trial. Cancelling cannot be undone. Are you sure you want to stop your trial?", + "CANCEL_TRIAL_STOP_BTN": "Stop Trial", "CMD_VIEW_LICENSE": "View License", "CMD_MANAGE_LICENSES": "Manage Licenses", "CMD_USER_PROFILE": "{APP_NAME} Account", diff --git a/test/spec/LiveDevelopment-MultiBrowser-test-files/mediaQuery.html b/test/spec/LiveDevelopment-MultiBrowser-test-files/mediaQuery.html new file mode 100644 index 0000000000..951e7650e8 --- /dev/null +++ b/test/spec/LiveDevelopment-MultiBrowser-test-files/mediaQuery.html @@ -0,0 +1,20 @@ + + + + +Media Query Test + + + +
Media query test page
+ + diff --git a/tracking-repos.json b/tracking-repos.json index 71f529a2ec..15e87406bb 100644 --- a/tracking-repos.json +++ b/tracking-repos.json @@ -1,5 +1,5 @@ { "phoenixPro": { - "commitID": "1687d43c4e8f87cb01e9e7de614c2ce1e85e7a30" + "commitID": "968dd7418a998b9fbde87fd393e338d84d9ce4c3" } }