diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 5bbcf2b..e60ca0c 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -2721,7 +2721,6 @@ #downloadsListBox .download-state[exists] .downloadDetails { color: var(--button-primary-bgcolor); } - #downloadsListBox .download-state[exists] .downloadDetails.downloadDetailsHover { color: var(--button-primary-hover-bgcolor); } @@ -2731,7 +2730,6 @@ text-decoration: line-through; text-decoration-color: color-mix(in srgb, currentColor 65%, transparent); } - #downloadsListBox .download-state:not([exists], [state="0"]) .downloadTypeIcon { filter: grayscale(100%) !important; } @@ -2768,7 +2766,6 @@ */ transition: background-color 0.5s var(--animation-easing-function) !important; } - .subviewbutton:hover { transition: background-color 0.1s var(--animation-easing-function) !important; } @@ -2779,21 +2776,17 @@ transition: -moz-box-flex 0.2s var(--animation-easing-function), margin-inline-start 0.2s var(--animation-easing-function), min-width 0.1s ease-out, max-width 0.1s ease-out !important; } - #tabbrowser-tabs:not([movingtab]) .tabbrowser-tab[pinned] { transition: -moz-box-flex 0.2s var(--animation-easing-function), margin-inline-start 0.2s var(--animation-easing-function) !important; } - #tabbrowser-tabs:not([movingtab]) .tab-content::before, #tabbrowser-tabs:not([movingtab]) .tab-content::after { transition: width 0.2s var(--animation-easing-function), transform 0.2s var(--animation-easing-function) !important; } - #tabbrowser-tabs:not([movingtab]) .tab-content .tab-label-container { transition: width 0.3s var(--animation-easing-function) !important; } - #tabbrowser-tabs:not([movingtab]) .tab-content .tab-icon-image { transition: all 0.3s var(--animation-easing-function) !important; } @@ -2804,7 +2797,6 @@ transition: border-color 1s var(--animation-easing-function), background-color 1.5s var(--animation-easing-function) !important; } - #urlbar-background:hover, #searchbar:hover { transition: border-color 0.5s var(--animation-easing-function), @@ -2819,7 +2811,6 @@ #page-action-buttons > .urlbar-page-action { transition: background-color 2.5s var(--animation-easing-function) !important; } - #tracking-protection-icon-container:hover, #identity-icon-box:hover, #identity-permission-box:hover, @@ -2829,14 +2820,13 @@ } /*- Border - Other Fields --------------------------------------------------*/ - #search-box:hover, - xul|search-textbox.tabsFilter:hover, - #editBMPanel_namePicker:hover, - #editBMPanel_tagsField:hover, - .findbar-container .findbar-textbox:hover { + #search-box, + xul|search-textbox.tabsFilter, + #editBMPanel_namePicker, + #editBMPanel_tagsField, + .findbar-container .findbar-textbox { transition: border-color 1s var(--animation-easing-function) !important; } - #search-box:hover, xul|search-textbox.tabsFilter:hover, #editBMPanel_namePicker:hover, @@ -2856,7 +2846,6 @@ transition: margin-inline-start 0.25s var(--animation-easing-function), opacity 0.25s ease-in-out, visibility 0s linear !important; } - #sidebar-box[hidden="true"] { display: -moz-box !important; margin-inline-start: -18em; @@ -2871,7 +2860,6 @@ transition: margin-top 1s ease; transform-origin: top; } - #navigator-toolbox[inFullscreen="true"] { /* Full screen enter */ animation-duration: 1s; @@ -2880,7 +2868,6 @@ /* Full screen navbar not hover */ transition: margin-top 1.3s var(--animation-easing-function) 50ms; } - #navigator-toolbox[inFullscreen="true"]:hover { margin-top: 0 !important; } @@ -2918,15 +2905,12 @@ #template-container .item.client .item-twisty-container { transition: transform 0.1s var(--animation-easing-function) !important; } - #template-container .item.client.closed .item-twisty-container { transform: rotate(-90deg); background-image: url("chrome://global/skin/icons/arrow-down-12.svg") !important; } - #template-container .item.client.closed .item-twisty-container:dir(rtl) { transform: rotate(90deg); - background-image: url("chrome://global/skin/icons/arrow-down-12.svg") !important; } } /*- Arrow - Edit Bookmark Popup --------------------------------------------*/ @@ -2938,7 +2922,6 @@ #editBookmarkPanelRows .expander-up { list-style-image: url("chrome://global/skin/icons/arrow-down.svg") !important; } - #editBookmarkPanelRows .expander-up .button-icon { transform: rotate(180deg); } diff --git a/src/decoration/_animate.scss b/src/decoration/_animate.scss index 10cbc2c..8c7035a 100644 --- a/src/decoration/_animate.scss +++ b/src/decoration/_animate.scss @@ -1,20 +1,16 @@ /*- Background Color -------------------------------------------------------*/ -button, -toolbarbutton, -stack, -vbox, -.toolbarbutton-icon, -#tabs-newtab-button > .toolbarbutton-icon { - transition: background-color 1s var(--animation-easing-function) !important; -} -button:hover, -toolbarbutton:hover, -stack:hover, -vbox:hover, -.toolbarbutton-icon:hover, -#tabs-newtab-button:hover > .toolbarbutton-icon { - transition: background-color 0.25s var(--animation-easing-function) !important; +@mixin _animate_bgColor($duration, $presudo: "") { + button#{$presudo}, + toolbarbutton#{$presudo}, + stack#{$presudo}, + vbox#{$presudo}, + .toolbarbutton-icon#{$presudo}, + #tabs-newtab-button#{$presudo} > .toolbarbutton-icon { + transition: background-color $duration var(--animation-easing-function) !important; + } } +@include _animate_bgColor(1s); +@include _animate_bgColor(0.25s, ":hover"); @include OS($linux) { .tabbrowser-tab:is([visuallyselected], [multiselected], [selected]) .tab-background:not(:-moz-lwtheme) { transition: background-image 0.25s var(--animation-easing-function) !important; @@ -26,41 +22,47 @@ vbox:hover, menu, menuitem is not apply. */ transition: background-color 0.5s var(--animation-easing-function) !important; -} -.subviewbutton:hover { - transition: background-color 0.1s var(--animation-easing-function) !important; + &:hover { + transition: background-color 0.1s var(--animation-easing-function) !important; + } } /*- Pinned Tab -------------------------------------------------------------*/ -#tabbrowser-tabs:not([movingtab]) .tabbrowser-tab:not([collapsed]) { - /* -moz-box-flex may be caused #tabbrowser-tabs[closebuttons] */ - transition: -moz-box-flex 0.2s var(--animation-easing-function), - margin-inline-start 0.2s var(--animation-easing-function), min-width 0.1s ease-out, max-width 0.1s ease-out !important; -} -#tabbrowser-tabs:not([movingtab]) .tabbrowser-tab[pinned] { - transition: -moz-box-flex 0.2s var(--animation-easing-function), - margin-inline-start 0.2s var(--animation-easing-function) !important; -} +#tabbrowser-tabs:not([movingtab]) { + .tabbrowser-tab { + &:not([collapsed]) { + /* -moz-box-flex may be caused #tabbrowser-tabs[closebuttons] */ + transition: -moz-box-flex 0.2s var(--animation-easing-function), + margin-inline-start 0.2s var(--animation-easing-function), min-width 0.1s ease-out, max-width 0.1s ease-out !important; + } + &[pinned] { + transition: -moz-box-flex 0.2s var(--animation-easing-function), + margin-inline-start 0.2s var(--animation-easing-function) !important; -#tabbrowser-tabs:not([movingtab]) .tab-content::before, -#tabbrowser-tabs:not([movingtab]) .tab-content::after { - transition: width 0.2s var(--animation-easing-function), transform 0.2s var(--animation-easing-function) !important; -} -#tabbrowser-tabs:not([movingtab]) .tab-content .tab-label-container { - transition: width 0.3s var(--animation-easing-function) !important; -} -#tabbrowser-tabs:not([movingtab]) .tab-content .tab-icon-image { - transition: all 0.3s var(--animation-easing-function) !important; + } + } + + .tab-content { + &::before, + &::after { + transition: width 0.2s var(--animation-easing-function), transform 0.2s var(--animation-easing-function) !important; + } + .tab-label-container { + transition: width 0.3s var(--animation-easing-function) !important; + } + .tab-icon-image { + transition: all 0.3s var(--animation-easing-function) !important; + } + } } /*- URL / Search Bar -------------------------------------------------------*/ #urlbar-background, #searchbar { transition: border-color 1s var(--animation-easing-function), background-color 1.5s var(--animation-easing-function) !important; -} -#urlbar-background:hover, -#searchbar:hover { - transition: border-color 0.5s var(--animation-easing-function), background-color 1s var(--animation-easing-function) !important; + &:hover { + transition: border-color 0.5s var(--animation-easing-function), background-color 1s var(--animation-easing-function) !important; + } } /* Buttons in URL bar */ @@ -70,29 +72,21 @@ vbox:hover, #notification-popup-box, #page-action-buttons > .urlbar-page-action { transition: background-color 2.5s var(--animation-easing-function) !important; -} -#tracking-protection-icon-container:hover, -#identity-icon-box:hover, -#identity-permission-box:hover, -#notification-popup-box:hover, -#page-action-buttons > .urlbar-page-action:hover { - transition: background-color 1.25s var(--animation-easing-function) !important; + &:hover { + transition: background-color 1.25s var(--animation-easing-function) !important; + } } /*- Border - Other Fields --------------------------------------------------*/ -#search-box:hover, -xul|search-textbox.tabsFilter:hover, -#editBMPanel_namePicker:hover, -#editBMPanel_tagsField:hover, -.findbar-container .findbar-textbox:hover { +#search-box, +xul|search-textbox.tabsFilter, +#editBMPanel_namePicker, +#editBMPanel_tagsField, +.findbar-container .findbar-textbox { transition: border-color 1s var(--animation-easing-function) !important; -} -#search-box:hover, -xul|search-textbox.tabsFilter:hover, -#editBMPanel_namePicker:hover, -#editBMPanel_tagsField:hover, -.findbar-container .findbar-textbox:hover { - transition: border-color 0.5s var(--animation-easing-function) !important; + &:hover { + transition: border-color 0.5s var(--animation-easing-function) !important; + } } /*- Sidebar ----------------------------------------------------------------*/ @@ -106,13 +100,14 @@ xul|search-textbox.tabsFilter:hover, /* Animation */ transition: margin-inline-start 0.25s var(--animation-easing-function), opacity 0.25s ease-in-out, visibility 0s linear !important; - } - #sidebar-box[hidden="true"] { - display: -moz-box !important; - margin-inline-start: -18em; - opacity: 0; - visibility: collapse; - transition-delay: 0s, 0s, 0.25s !important; + + &[hidden="true"] { + display: -moz-box !important; + margin-inline-start: -18em; + opacity: 0; + visibility: collapse; + transition-delay: 0s, 0s, 0.25s !important; + } } } @@ -121,21 +116,23 @@ xul|search-textbox.tabsFilter:hover, /* Full screen out */ transition: margin-top 1s ease; transform-origin: top; -} -#navigator-toolbox[inFullscreen="true"] { - /* Full screen enter */ - animation-duration: 1s; - animation-name: fullscreen; - animation-timing-function: ease; - /* Full screen navbar not hover */ - // transition: margin-top 0.3s var(--animation-easing-function) 50ms; - transition: margin-top 1.3s var(--animation-easing-function) 50ms; -} -#navigator-toolbox[inFullscreen="true"]:hover { - // transition-duration: 1.5s; // Not works, because !important - // transition-delay: 0.5s; - margin-top: 0 !important; + &[inFullscreen="true"] { + /* Full screen enter */ + animation-duration: 1s; + animation-name: fullscreen; + animation-timing-function: ease; + + /* Full screen navbar not hover */ + // transition: margin-top 0.3s var(--animation-easing-function) 50ms; + transition: margin-top 1.3s var(--animation-easing-function) 50ms; + &:hover { + // Full screen navbar hover + // transition-duration: 1.5s; // Not works, because !important + // transition-delay: 0.5s; + margin-top: 0 !important; + } + } } @keyframes fullscreen { @@ -171,18 +168,19 @@ xul|search-textbox.tabsFilter:hover, @-moz-document url("chrome://browser/content/syncedtabs/sidebar.xhtml") { /* treechildren::-moz-tree-twisty: Can't apply */ - #template-container .item.client .item-twisty-container { - transition: transform 0.1s var(--animation-easing-function) !important; - } + #template-container .item.client { + .item-twisty-container { + transition: transform 0.1s var(--animation-easing-function) !important; + } - #template-container .item.client.closed .item-twisty-container { - transform: rotate(-90deg); - background-image: url("chrome://global/skin/icons/arrow-down-12.svg") !important; - } + &.closed .item-twisty-container { + transform: rotate(-90deg); + background-image: url("chrome://global/skin/icons/arrow-down-12.svg") !important; - #template-container .item.client.closed .item-twisty-container:dir(rtl) { - transform: rotate(90deg); - background-image: url("chrome://global/skin/icons/arrow-down-12.svg") !important; + &:dir(rtl) { + transform: rotate(90deg); + } + } } } @@ -193,7 +191,7 @@ xul|search-textbox.tabsFilter:hover, } #editBookmarkPanelRows .expander-up { list-style-image: url("chrome://global/skin/icons/arrow-down.svg") !important; -} -#editBookmarkPanelRows .expander-up .button-icon { - transform: rotate(180deg); + .button-icon { + transform: rotate(180deg); + } } diff --git a/src/decoration/_download_panel.scss b/src/decoration/_download_panel.scss index 9274b5d..1139ee9 100644 --- a/src/decoration/_download_panel.scss +++ b/src/decoration/_download_panel.scss @@ -1,16 +1,18 @@ /* Accent Color for downloaded item */ #downloadsListBox .download-state[exists] .downloadDetails { color: var(--button-primary-bgcolor); -} -#downloadsListBox .download-state[exists] .downloadDetails.downloadDetailsHover { - color: var(--button-primary-hover-bgcolor); + &.downloadDetailsHover { + color: var(--button-primary-hover-bgcolor); + } } /* File moved or missing */ -#downloadsListBox .download-state:not([exists], [state="0"]) .downloadTarget { - text-decoration: line-through; - text-decoration-color: color-mix(in srgb, currentColor 65%, transparent); -} -#downloadsListBox .download-state:not([exists], [state="0"]) .downloadTypeIcon { - filter: grayscale(100%) !important; +#downloadsListBox .download-state:not([exists], [state="0"]) { + .downloadTarget { + text-decoration: line-through; + text-decoration-color: color-mix(in srgb, currentColor 65%, transparent); + } + .downloadTypeIcon { + filter: grayscale(100%) !important; + } }