Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: zoom editor fonts only and live preview switch issues #1799

Merged
merged 1 commit into from
Aug 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ define(function (require, exports, module) {
// the active editor takes the priority in the workflow. If a css related file is active,
// then we dont need to open the html live doc. For less files, we dont check if its related as
// its not directly linked usually and needs a compile step. so we just do a fuzzy search.
activeEditor.focus();
_focusEditorIfNeeded(activeEditor, nodeName, contentEditable);
_searchAndCursorIfCSS(activeEditor, allSelectors, nodeName);
// in this case, see if we need to do any css reverse highlight magic here
} else if(openLiveDocEditor) {
Expand Down
2 changes: 1 addition & 1 deletion src/document/DocumentCommandHandlers.js
Original file line number Diff line number Diff line change
Expand Up @@ -2131,7 +2131,7 @@ define(function (require, exports, module) {
if(nodeTerminateDueToShutdown){
return; // normal shutdown
}
Metrics.countEvent(Metrics.EVENT_TYPE.NODEJS, 'crash', "dlgShown");
Metrics.countEvent(Metrics.EVENT_TYPE.NODEJS, 'crash', Phoenix.platform);
window.fs.forceUseNodeWSEndpoint(false);
Dialogs
.showErrorDialog(Strings.ERROR_NODE_JS_CRASH_TITLE, Strings.ERROR_NODE_JS_CRASH_MESSAGE)
Expand Down
19 changes: 0 additions & 19 deletions src/view/fontrules/font-based-rules.less
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
@defaultmenuwidth: 300px/@defaultfontsize;

@lineheight: @fontsize + @fontsize * @lineheightoffset;
@menuFontSize: @fontsize + 2;
@titleFontSize: @fontsize + 6;

.CodeMirror {
font-size: @fontsize !important;
Expand All @@ -34,23 +32,6 @@
line-height: @lineheight !important;
}

.modal-bar{
font-size: @menuFontSize !important;
}

.context-menu .dropdown-menu li a , .toolbar .nav .dropdown-menu li a{
font-size: @menuFontSize !important;
line-height: @lineheight !important;
}

.toolbar .title {
font-size: @titleFontSize !important;
}

#titlebar {
font-size: @menuFontSize !important;
}

span.brackets-js-hints-with-type-details {
width: @defaultmenuwidth * @fontsize !important;
}
Expand Down
Loading