mirror of
https://github.com/zen-browser/desktop.git
synced 2026-07-10 19:09:30 +00:00
no-bug: Fix some conflicts
This commit is contained in:
@@ -144,6 +144,8 @@ document.addEventListener(
|
||||
{ global: "current" }
|
||||
);
|
||||
ZenLibrary.toggle();
|
||||
break;
|
||||
}
|
||||
case "cmd_zenOpenSpaceRoutingSettings": {
|
||||
gZenSpaceRoutingManager.openSpaceRoutingDialog(window);
|
||||
break;
|
||||
|
||||
@@ -1282,7 +1282,6 @@ class ZenLibraryDownloadsSection extends ProgressiveSearchSection {
|
||||
<img
|
||||
class="library-download-progress-cancel"
|
||||
src="chrome://browser/skin/zen-icons/close.svg"
|
||||
alt=""
|
||||
/>
|
||||
</button>
|
||||
`;
|
||||
@@ -1395,7 +1394,9 @@ class ZenLibraryDownloadsSection extends ProgressiveSearchSection {
|
||||
});
|
||||
}
|
||||
|
||||
items.push({ separator: true });
|
||||
if (fileExists || !isActive) {
|
||||
items.push({ separator: true });
|
||||
}
|
||||
|
||||
if (fileExists) {
|
||||
items.push({
|
||||
|
||||
@@ -382,8 +382,8 @@ zen-library[open] {
|
||||
flex-shrink: 0;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
margin-inline-start: calc(var(--toolbarbutton-inner-padding) / 2);
|
||||
margin-inline-end: calc(var(--toolbarbutton-inner-padding) * 1.5);
|
||||
margin-inline-start: calc(var(--toolbarbutton-padding-inner) / 2);
|
||||
margin-inline-end: calc(var(--toolbarbutton-padding-inner) * 1.5);
|
||||
padding: 0;
|
||||
border-radius: 4px;
|
||||
fill: currentColor;
|
||||
@@ -398,8 +398,8 @@ zen-library[open] {
|
||||
justify-content: center;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
margin-inline-start: calc(var(--toolbarbutton-inner-padding) / 2);
|
||||
margin-inline-end: calc(var(--toolbarbutton-inner-padding) * 1.5);
|
||||
margin-inline-start: calc(var(--toolbarbutton-padding-inner) / 2);
|
||||
margin-inline-end: calc(var(--toolbarbutton-padding-inner) * 1.5);
|
||||
padding: 0;
|
||||
appearance: none;
|
||||
background: transparent;
|
||||
@@ -451,13 +451,8 @@ zen-library[open] {
|
||||
|
||||
.library-download-progress-cancel {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.library-download-progress-cancel line {
|
||||
fill: none;
|
||||
stroke: currentColor;
|
||||
stroke-width: 2;
|
||||
stroke-linecap: round;
|
||||
-moz-context-properties: fill;
|
||||
fill: var(--toolbox-textcolor);
|
||||
}
|
||||
|
||||
.library-item-stack:hover .library-download-progress-ring .arc,
|
||||
@@ -550,7 +545,7 @@ zen-library[open] {
|
||||
appearance: none;
|
||||
background: transparent;
|
||||
border: none;
|
||||
border-radius: calc(var(--border-radius-medium) - 6px);
|
||||
border-radius: var(--border-radius-small);
|
||||
color: inherit;
|
||||
fill: currentColor;
|
||||
-moz-context-properties: fill, fill-opacity;
|
||||
|
||||
Reference in New Issue
Block a user