Skip to content

Commit

Permalink
Merge branch 'nightly'
Browse files Browse the repository at this point in the history
  • Loading branch information
zapSNH committed Aug 31, 2024
2 parents 8c6fde2 + 6fc5fa1 commit 499b680
Show file tree
Hide file tree
Showing 10 changed files with 59 additions and 4 deletions.
39 changes: 37 additions & 2 deletions resources/content.css
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@
.chevron-icon {
background-image: url("./icons/arrow-dropdown-16.svg") !important;
scale: 1 -1;
.card-container:not([open]) & {
:is(.card-container, #shopping-details):not([open]) & {
scale: 1;
}
}
Expand Down Expand Up @@ -1511,7 +1511,6 @@
}

/* debugging */

@-moz-document url-prefix("about:debugging") {
:root {
--in-content-background-color: light-dark(#f9f9fa, #2a2a2e) !important;
Expand All @@ -1527,6 +1526,42 @@
}
}
}
@-moz-document url-prefix("about:shoppingsidebar") {
:root {
--shopping-header-background: var(--in-content-page-background) !important;
}
* {
--shopping-card-border-radius: var(--photon-primary-border-radius) !important;
}
#close-button {
background-image: url(./icons/close.svg) !important;
}
.price {
content: url("./icons/price.svg") !important;
}
.quality {
content: url("./icons/quality.svg") !important;
}
.shipping {
content: url("./icons/shipping.svg") !important;
}
.competitiveness {
content: url("./icons/competitiveness.svg") !important;
}
.packaging\/appearance {
content: url("./icons/packaging.svg") !important;
}
@media (prefers-color-scheme: dark) {
.shopping-card {
background: var(--grey-60) !important;
--shopping-card-border-color: var(--in-content-box-border-color) !important;
}
.show-more footer {
background-color: var(--grey-60) !important;;
box-shadow: 2px -10px 11px var(--grey-60) !important;;
}
}
}
/* Error page illustrations */
/* From Lepton https://github.com/black7375/Firefox-UI-Fix/blob/master/src/contents/_error_page.scss */
@-moz-document url-prefix("about:neterror"), url-prefix("about:restartrequired"), url("chrome://browser/content/aboutRestartRequired.xhtml"), url("about:sessionrestore"), url("chrome://browser/content/aboutSessionRestore.xhtml")
Expand Down
9 changes: 8 additions & 1 deletion resources/icons.css
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
list-style-image: url(./icons/home.svg) !important;
}
/* Reload button animation */
/* from github.com/1280px/rainfox, check out the theme! */
/* from github.com/1280px/rainfox, check out the theme! (maybe not since it's dead now lol) */
/* fixed version by me */
:root:not([customizing]) #stop-reload-button[animate]
> #reload-button
Expand Down Expand Up @@ -370,6 +370,13 @@
#reader-mode-button-icon {
list-style-image: url(./icons/readerMode.svg) !important;
}
/* review checker */
#shopping-sidebar-button > .urlbar-icon {
list-style-image: url(./icons/shopping.svg) !important;
#shopping-sidebar-button[shoppingsidebaropen="true"] & {
list-style-image: url(./icons/shopping-open.svg) !important;
}
}
#downloads-indicator-anchor {
list-style-image: url(./icons/download-icons.svg#arrow-with-bar) !important;
}
Expand Down
1 change: 1 addition & 0 deletions resources/icons/competitiveness.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/icons/packaging.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/icons/price.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/icons/quality.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/icons/shopping-open.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/icons/shopping.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion resources/misc.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
}
}
}

@-moz-document url-prefix("chrome://global/content/commonDialog.xhtml") {
:root {
--in-content-primary-button-background: var(--photon-accent) !important;
Expand Down
8 changes: 8 additions & 0 deletions resources/tabs-and-urlbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,11 @@ credits to phroton for some of this stuff */
#urlbar .search-one-offs *:not(toolbarseparator) {
color: var(--toolbarbutton-icon-fill) !important;
}
/* special case for review checker */

#shopping-sidebar-button[shoppingsidebaropen="true"] {
background-color: var(--urlbar-box-active-bgcolor);
}
/* Multiselected tabs */
.tab-background[multiselected="true"] {
outline: none !important;
Expand Down Expand Up @@ -923,6 +928,9 @@ credits to phroton for some of this stuff */
--space-sidebar: var(--space-xxsmall);
}
}
#appcontent {
box-shadow: none !important;
}
.sidebar-splitter {
&:hover {
background-color: var(--in-content-primary-button-background, var(--photon-accent)) !important;
Expand Down

0 comments on commit 499b680

Please sign in to comment.