mirror of
https://github.com/zen-browser/desktop.git
synced 2025-09-05 19:08:18 +00:00
chore: Update Zen browser components submodule commit reference and fixed compact mode
This commit is contained in:
6
.vscode/settings.json
vendored
6
.vscode/settings.json
vendored
@@ -13,6 +13,10 @@
|
||||
"utility": "cpp",
|
||||
"variant": "cpp",
|
||||
"compare": "cpp",
|
||||
"thread": "cpp"
|
||||
"thread": "cpp",
|
||||
"string": "cpp",
|
||||
"string_view": "cpp",
|
||||
"span": "cpp",
|
||||
"vector": "cpp"
|
||||
}
|
||||
}
|
Submodule src/browser/base/content/zen-components updated: b1d5b8e642...c5f418f25f
@@ -115,8 +115,8 @@ var gZenCKSSettings = {
|
||||
`);
|
||||
document.l10n.setAttributes(fragment.querySelector(".zenCKSOption-label"), l10nId);
|
||||
|
||||
const input = fragment.querySelector(".zenCKSOption-input");
|
||||
const shortcut = gZenKeyboardShortcuts.getShortcut(key);
|
||||
let input = fragment.querySelector(".zenCKSOption-input");
|
||||
let shortcut = gZenKeyboardShortcuts.getShortcut(key);
|
||||
if (shortcut) {
|
||||
input.value = gZenKeyboardShortcuts.shortCutToString(shortcut);
|
||||
} else {
|
||||
@@ -124,7 +124,7 @@ var gZenCKSSettings = {
|
||||
}
|
||||
|
||||
input.setAttribute("data-key", key);
|
||||
input.addEventListener("focusin", (event) => {
|
||||
input.addEventListener("focus", (event) => {
|
||||
const key = event.target.getAttribute("data-key");
|
||||
this._currentAction = key;
|
||||
event.target.classList.add("zenCKSOption-input-editing");
|
||||
@@ -164,6 +164,17 @@ var gZenCKSSettings = {
|
||||
meta: event.metaKey
|
||||
};
|
||||
|
||||
if (event.key === "Tab") {
|
||||
return;
|
||||
} else if (event.key === "Escape") {
|
||||
this._currentAction = null;
|
||||
input.blur();
|
||||
return;
|
||||
} else if (event.key === "Backspace") {
|
||||
this._resetCKS(input, this._currentAction);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!shortcut.ctrl && !shortcut.alt && !shortcut.shift && !shortcut.meta) {
|
||||
this._resetCKS(input, this._currentAction);
|
||||
return; // No modifiers, ignore.
|
||||
@@ -177,15 +188,6 @@ var gZenCKSSettings = {
|
||||
}
|
||||
}
|
||||
|
||||
if (event.key === "Escape" || event.key === "Tab") {
|
||||
this._currentAction = null;
|
||||
input.classList.remove("zenCKSOption-input-editing");
|
||||
return;
|
||||
} else if (event.key === "Backspace") {
|
||||
this._resetCKS(input, this._currentAction);
|
||||
return;
|
||||
}
|
||||
|
||||
event.preventDefault();
|
||||
gZenKeyboardShortcuts.setShortcut(this._currentAction, shortcut);
|
||||
|
||||
|
@@ -81,8 +81,6 @@ zen-cks-group-bookmark-action = Bookmark Actions
|
||||
zen-cks-group-open-page-action = Open Page Actions
|
||||
zen-cks-group-downloads-action = Downloads Actions
|
||||
zen-cks-group-sidebar-action = Sidebar Actions
|
||||
zen-cks-group-custom-action = Custom Actions
|
||||
|
||||
|
||||
open-new-tab = Open New Tab
|
||||
close-tab = Close Tab
|
||||
@@ -143,8 +141,3 @@ show-synced-tabs-sidebar = Show Synced Tabs Sidebar
|
||||
reverse-sidebar = Reverse Sidebar Position
|
||||
hide-sidebar = Hide Sidebar
|
||||
toggle-sidebar = Toggle Sidebar
|
||||
custom-action-1 = Custom Action 1
|
||||
custom-action-2 = Custom Action 2
|
||||
custom-action-3 = Custom Action 3
|
||||
custom-action-4 = Custom Action 4
|
||||
custom-action-5 = Custom Action 5
|
||||
|
@@ -219,6 +219,8 @@ groupbox h2 {
|
||||
|
||||
.zenCKSOption {
|
||||
margin-bottom: 10px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.zenCKSOption > label {
|
||||
|
@@ -662,7 +662,7 @@ panelmultiview {
|
||||
border-bottom: 1px solid var(--zen-colors-border);
|
||||
top: 0;
|
||||
background: var(--zen-colors-tertiary);
|
||||
z-index: 1;
|
||||
z-index: 2;
|
||||
transition: .2s ease-in-out;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user