mirror of
https://github.com/zen-browser/desktop.git
synced 2026-06-29 06:00:26 +00:00
Merge branch 'dev' of https://github.com/zen-browser/desktop into dev
This commit is contained in:
mr. m
@@ -7,7 +7,7 @@ index 13b1659ed5a3b9bb0342b601998d0fd5c9760e22..4f13c401f23f51962986fe8caf197aa5
|
||||
#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button,
|
||||
#urlbar-label-box {
|
||||
- background-color: var(--urlbar-box-bgcolor);
|
||||
+ background-color: light-dark(#cecece, rgb(66, 65, 77));
|
||||
+ background-color: transparent;
|
||||
color: var(--urlbar-box-text-color);
|
||||
padding-inline: 8px;
|
||||
border-radius: var(--urlbar-icon-border-radius);
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
#filter dumbComments emptyLines substitution
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill="context-fill" fill-opacity="context-fill-opacity" d="M6.412 7.584C5.36 9.044 5 10.827 5 12s.36 2.956 1.412 4.416C7.426 17.825 9.126 19 12 19c1.98 0 3.385-.558 4.388-1.334a1 1 0 1 1 1.224 1.581C16.229 20.317 14.385 21 12 21c-3.526 0-5.826-1.491-7.212-3.416C3.44 15.711 3 13.494 3 12s.44-3.711 1.788-5.584C6.174 4.492 8.474 3 12 3s5.826 1.492 7.212 3.416C20.56 8.289 21 10.506 21 12a3.8 3.8 0 0 1-.689 2.147c-.56.778-1.485 1.353-2.811 1.353s-2.251-.575-2.812-1.353A3.8 3.8 0 0 1 14 12a1 1 0 1 1 2 0c0 .257.085.664.311.978.19.264.515.522 1.189.522s.999-.258 1.189-.522c.226-.314.311-.721.311-.978 0-1.173-.36-2.956-1.412-4.416C16.575 6.175 14.874 5 12 5S7.426 6.175 6.412 7.584"/>
|
||||
<path fill="context-fill" fill-opacity="context-fill-opacity" d="M12 10a2 2 0 1 0 0 4 2 2 0 0 0 0-4m-4 2a4 4 0 1 1 8 0 4 4 0 0 1-8 0"/>
|
||||
</svg>
|
||||
@@ -3,5 +3,5 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill="context-fill" fill-opacity="context-fill-opacity" d="m8.144 7.795.088.077L16.1 15.74a.927.927 0 0 1-.228 1.479l-.108.046-9.63 3.549c-1.81.667-3.572-1.034-3.022-2.842l.046-.135 3.548-9.63a.927.927 0 0 1 1.341-.478zm8.374 4.028c.845.044 2.003.222 3.01.827a.927.927 0 0 1-.858 1.641l-.096-.05c-.633-.38-1.441-.53-2.153-.566a7 7 0 0 0-.881.003l-.293.03a.927.927 0 0 1-.26-1.837 8 8 0 0 1 1.53-.049m1.879-2.583a.927.927 0 0 1 .107 1.848l-.107.006h-.657a.927.927 0 0 1-.107-1.848l.107-.006zm-2.95-.712a.93.93 0 0 1 .076 1.224l-.077.088-.984.983a.927.927 0 0 1-1.388-1.224l.077-.087.983-.983a.927.927 0 0 1 1.312 0m-2.399-4.883c.416 1.249.193 2.615-.066 3.57a9.3 9.3 0 0 1-.64 1.728.927.927 0 0 1-1.66-.828 7.4 7.4 0 0 0 .51-1.387c.21-.772.316-1.61.154-2.295l-.057-.2a.927.927 0 1 1 1.76-.588m5.02 2.261a.927.927 0 0 1 0 1.311l-.655.656A.927.927 0 1 1 16.1 6.562l.655-.656a.927.927 0 0 1 1.311 0"/>
|
||||
<path fill="context-fill" fill-opacity="context-fill-opacity" d="m9.874 9.343.056.048 4.988 4.989a.588.588 0 0 1-.145.937l-.068.03-6.106 2.25c-1.147.422-2.264-.656-1.916-1.802l.03-.086 2.25-6.105a.588.588 0 0 1 .85-.303Zm5.309 2.553c.536.028 1.27.141 1.908.525a.588.588 0 0 1-.544 1.04l-.06-.032c-.402-.24-.914-.336-1.366-.359a4 4 0 0 0-.558.002l-.186.02a.588.588 0 0 1-.165-1.165 5 5 0 0 1 .97-.031m1.192-1.638a.588.588 0 0 1 .067 1.172l-.067.003h-.417a.588.588 0 0 1-.068-1.171l.068-.004zm-1.87-.451a.59.59 0 0 1 .047.776l-.048.055-.624.624a.588.588 0 0 1-.88-.776l.049-.056.623-.623a.59.59 0 0 1 .832 0m-1.521-3.096c.263.792.122 1.658-.042 2.264a6 6 0 0 1-.406 1.095.588.588 0 0 1-1.052-.525 4.7 4.7 0 0 0 .323-.879c.133-.49.2-1.02.098-1.455l-.037-.127a.588.588 0 1 1 1.116-.373m3.183 1.434a.59.59 0 0 1 0 .831l-.415.416a.588.588 0 1 1-.832-.831l.415-.416a.59.59 0 0 1 .831 0"/>
|
||||
</svg>
|
||||
|
||||
@@ -427,7 +427,6 @@
|
||||
#endif
|
||||
* skin/classic/browser/zen-icons/urlbar-arrow.svg (../shared/zen-icons/common/urlbar-arrow.svg)
|
||||
* skin/classic/browser/zen-icons/selectable/airplane.svg (../shared/zen-icons/common/selectable/airplane.svg)
|
||||
* skin/classic/browser/zen-icons/selectable/at.svg (../shared/zen-icons/common/selectable/at.svg)
|
||||
* skin/classic/browser/zen-icons/selectable/baseball.svg (../shared/zen-icons/common/selectable/baseball.svg)
|
||||
* skin/classic/browser/zen-icons/selectable/basket.svg (../shared/zen-icons/common/selectable/basket.svg)
|
||||
* skin/classic/browser/zen-icons/selectable/bed.svg (../shared/zen-icons/common/selectable/bed.svg)
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
{
|
||||
// prettier-ignore
|
||||
const SVG_ICONS = [
|
||||
"airplane.svg", "at.svg", "baseball.svg", "basket.svg", "bed.svg",
|
||||
"airplane.svg", "baseball.svg", "basket.svg", "bed.svg",
|
||||
"bell.svg", "book.svg", "bookmark.svg", "chat.svg", "checkbox.svg",
|
||||
"circle.svg", "cloud.svg", "code.svg", "coins.svg",
|
||||
"cutlery.svg", "egg.svg", "flag.svg", "folder.svg", "globe.svg",
|
||||
|
||||
@@ -201,7 +201,7 @@
|
||||
display: none;
|
||||
}
|
||||
|
||||
#identity-box:not([pageproxystate='invalid']) #identity-icon-box:not([open]) {
|
||||
#identity-box:not([pageproxystate='invalid']):not(.notSecure) #identity-icon-box:not([open]) {
|
||||
margin-inline-start: calc(-8px - 2 * var(--urlbar-icon-padding));
|
||||
transform: translateX(100%);
|
||||
opacity: 0;
|
||||
@@ -376,7 +376,7 @@ button.popup-notification-dropmarker {
|
||||
#identity-box:is(:not(.chromeUI), [pageproxystate='invalid'])
|
||||
#identity-icon-box {
|
||||
border-radius: var(--urlbar-icon-border-radius) !important;
|
||||
min-width: 30px;
|
||||
min-width: 28px;
|
||||
}
|
||||
|
||||
/* Notification Stack */
|
||||
|
||||
@@ -906,6 +906,7 @@
|
||||
}
|
||||
|
||||
handleTabUnpin(tab) {
|
||||
tab.style.removeProperty('--zen-folder-indent');
|
||||
const group = tab.group;
|
||||
if (!group) {
|
||||
return false;
|
||||
|
||||
@@ -318,13 +318,13 @@ zen-workspace {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&[active] .zen-workspace-empty-space {
|
||||
-moz-window-dragging: drag;
|
||||
}
|
||||
}
|
||||
|
||||
.zen-workspace-empty-space {
|
||||
-moz-window-dragging: drag;
|
||||
}
|
||||
|
||||
/** Customiable UI, this is an auto generated ID */
|
||||
/** Customizable UI, this is an auto generated ID */
|
||||
#wrapper-zen-workspaces-button {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user