Merge branch 'main' of github.com:vinceliuice/Colloid-gtk-theme into main

This commit is contained in:
vinceliuice
2023-03-04 14:06:40 +08:00
3 changed files with 51 additions and 20 deletions

View File

@@ -294,10 +294,20 @@ toolbarseparator, menuseparator {
padding: 0 !important; padding: 0 !important;
margin: 6px 0 !important; margin: 6px 0 !important;
} }
#PlacesToolbar menupopup[placespopup="true"] menuseparator::before { #PlacesToolbar menupopup[placespopup="true"] menuseparator::before {
border: 0 !important; border: 0 !important;
} }
toolbarbutton menupopup[placespopup] menuseparator {
padding-top: 0 !important;
padding-bottom: 0 !important;
}
toolbarbutton menupopup[placespopup] menuseparator::before {
border-top: 0 !important;
}
toolbarseparator:not([orient="vertical"]), menupopup menuseparator { toolbarseparator:not([orient="vertical"]), menupopup menuseparator {
border-top: 1px solid var(--gnome-menu-separator-color) !important; border-top: 1px solid var(--gnome-menu-separator-color) !important;
margin: 6px 0 !important; margin: 6px 0 !important;

View File

@@ -81,24 +81,32 @@ tab > stack {
display: none; display: none;
} }
#tabbrowser-tabs[movingtab=true] #tabbrowser-arrowscrollbox::after { #tabbrowser-tabs[movingtab=true] #tabbrowser-arrowscrollbox::after {
bottom: unset; bottom: unset;
top: 38px; top: 38px;
} }
/* Tab separators */ /* Tabs separators */
.tabbrowser-tab:not([selected], :hover, [last-visible-tab="true"], [beforeselected-visible="true"], [beforehovered="true"])::after { .tabbrowser-tab {
content: ""; border-width: 1px !important;
display: block; border-left: 1px solid transparent !important;
border-left: 1px solid var(--gnome-toolbar-border-color) !important;
/* height: 26px;*/
position: absolute;
top: 10px;
bottom: 10px;
} }
.tabbrowser-tab::after { .tabbrowser-tab + .tabbrowser-tab:not([selected], :hover) {
right: -1px; border-image: linear-gradient(
to bottom,
transparent 0,
transparent 20%,
var(--gnome-tabbar-tab-border-color) 20%,
var(--gnome-tabbar-tab-border-color) 80%,
transparent 80%,
transparent 100%) 1 !important;
}
.tabbrowser-tab[selected] + .tabbrowser-tab,
.tabbrowser-tab:hover + .tabbrowser-tab,
.tabbrowser-tab[pinned] + .tabbrowser-tab {
border-image: none !important;
} }
/* Space between tabs */ /* Space between tabs */
@@ -108,6 +116,10 @@ tab > stack {
padding: 3px 2px 3px !important; padding: 3px 2px 3px !important;
} }
#tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab[first-visible-unpinned-tab] {
margin-inline-start: 6px !important;
}
/* Tab labels */ /* Tab labels */
tab { tab {
color: var(--gnome-toolbar-color) !important; color: var(--gnome-toolbar-color) !important;

View File

@@ -813,7 +813,7 @@ window.background.csd.unified {
/************* /*************
* Rhythmbox * * Rhythmbox *
*************/ *************/
%image-button { %rhythmbox-image-button {
min-height: 24px; min-height: 24px;
min-width: 24px; min-width: 24px;
padding: ($medium-size - 24px) / 2; padding: ($medium-size - 24px) / 2;
@@ -860,7 +860,7 @@ window.solid-csd > box.vertical > box.vertical {
> toolitem > .linked > button, > toolitem > .linked > button,
> toolitem > box.horizontal > button { > toolitem > box.horizontal > button {
@extend %circular-button; @extend %circular-button;
@extend %image-button; @extend %rhythmbox-image-button;
} }
} }
@@ -877,21 +877,30 @@ window.solid-csd > box.vertical > box.vertical {
window.background > box.vertical > toolbar.primary-toolbar { window.background > box.vertical > toolbar.primary-toolbar {
> toolitem { > toolitem {
> .linked > button.image-button.raised { // 'shuffle/repeat' > .linked > button.image-button.raised { // 'shuffle/repeat'
@extend %circular-button; // @extend %circular-button;
@extend %image-button; // @extend %rhythmbox-image-button;
@include button(normal);
> widget > box > image { padding: 0; } &:hover { @include button(hover); }
&:active { @include button(active); }
&:disabled { @include button(disabled); }
&:checked { @include button(checked); }
> widget > box > image { padding: 0 3px; }
} }
button.flat.scale { // 'volume' button.flat.scale { // 'volume'
@extend %circular-button; // @extend %circular-button;
@extend %image-button; @extend %rhythmbox-image-button;
} }
> box.horizontal:not(.linked) > button.toggle, > box.horizontal:not(.linked) > button.toggle,
> .linked > button:not(.toggle):not(.raised):not(.flat) { > .linked > button:not(.toggle):not(.raised):not(.flat) {
@extend %circular-button; @extend %circular-button;
@extend %image-button; @extend %rhythmbox-image-button;
} }
} }
} }