VesperOS/Colloid-gtk-theme
6
0
Fork 0
mirror of https://github.com/vinceliuice/Colloid-gtk-theme.git synced 2026-07-04 22:10:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issues

Browse Source
This commit is contained in:
Vince
2021-12-11 12:42:37 +08:00
parent 1abe9faa99
commit eec1bf3b8b
9 changed files with 172 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/gtk-3.0/gtk-dark.css
+23 -20
View File
@@ -1868,6 +1868,29 @@ searchbar > revealer > box {
box-shadow: none;
}
.titlebar + separator, .titlebar + separator.sidebar {
background-color: #242424;
background-image: none;
transition: all 75ms cubic-bezier(0, 0, 0.2, 1);
box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
}
.titlebar + separator:backdrop, .titlebar + separator.sidebar:backdrop {
background-color: #2C2C2C;
}
.titlebar.selection-mode + separator, .titlebar.selection-mode + separator.sidebar, .selection-mode .titlebar + separator, .selection-mode .titlebar + separator.sidebar {
background-color: #5b9bf8;
}
.titlebar.selection-mode + separator:backdrop, .titlebar.selection-mode + separator.sidebar:backdrop, .selection-mode .titlebar + separator:backdrop, .selection-mode .titlebar + separator.sidebar:backdrop {
background-color: #5b9bf8;
}
.background.csd.unified .titlebar + separator, .background.csd.unified .titlebar + separator.sidebar {
box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
}
.titlebar .linked:not(.vertical) > entry {
border-radius: 6px;
margin-left: 3px;
@@ -2020,26 +2043,6 @@ headerbar separator.titlebutton {
background-color: transparent;
}
headerbar + separator, headerbar + separator.sidebar {
background-color: #242424;
background-image: none;
box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
transition: all 75ms cubic-bezier(0, 0, 0.2, 1);
}
headerbar + separator:backdrop, headerbar + separator.sidebar:backdrop {
background-color: #2C2C2C;
}
headerbar.selection-mode + separator, headerbar.selection-mode + separator.sidebar, .selection-mode headerbar + separator, .selection-mode headerbar + separator.sidebar {
background-color: #5b9bf8;
box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
}
headerbar.selection-mode + separator:backdrop, headerbar.selection-mode + separator.sidebar:backdrop, .selection-mode headerbar + separator:backdrop, .selection-mode headerbar + separator.sidebar:backdrop {
background-color: #5b9bf8;
}
headerbar switch {
margin-top: 12px;
margin-bottom: 12px;
src/main/gtk-3.0/gtk-light.css
+28 -25
View File
@@ -1826,7 +1826,7 @@ searchbar > revealer > box {
background-color: #FAFAFA;
color: rgba(0, 0, 0, 0.87);
border-radius: 12px 12px 0 0;
box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -1px rgba(0, 0, 0, 0.12);
box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.15);
}
.titlebar:disabled {
@@ -1868,6 +1868,29 @@ searchbar > revealer > box {
box-shadow: none;
}
.titlebar + separator, .titlebar + separator.sidebar {
background-color: #FAFAFA;
background-image: none;
transition: all 75ms cubic-bezier(0, 0, 0.2, 1);
box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.15);
}
.titlebar + separator:backdrop, .titlebar + separator.sidebar:backdrop {
background-color: #FFFFFF;
}
.titlebar.selection-mode + separator, .titlebar.selection-mode + separator.sidebar, .selection-mode .titlebar + separator, .selection-mode .titlebar + separator.sidebar {
background-color: #3c84f7;
}
.titlebar.selection-mode + separator:backdrop, .titlebar.selection-mode + separator.sidebar:backdrop, .selection-mode .titlebar + separator:backdrop, .selection-mode .titlebar + separator.sidebar:backdrop {
background-color: #3c84f7;
}
.background.csd.unified .titlebar + separator, .background.csd.unified .titlebar + separator.sidebar {
box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
}
.titlebar .linked:not(.vertical) > entry {
border-radius: 6px;
margin-left: 3px;
@@ -2020,26 +2043,6 @@ headerbar separator.titlebutton {
background-color: transparent;
}
headerbar + separator, headerbar + separator.sidebar {
background-color: #FAFAFA;
background-image: none;
box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
transition: all 75ms cubic-bezier(0, 0, 0.2, 1);
}
headerbar + separator:backdrop, headerbar + separator.sidebar:backdrop {
background-color: #FFFFFF;
}
headerbar.selection-mode + separator, headerbar.selection-mode + separator.sidebar, .selection-mode headerbar + separator, .selection-mode headerbar + separator.sidebar {
background-color: #3c84f7;
box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
}
headerbar.selection-mode + separator:backdrop, headerbar.selection-mode + separator.sidebar:backdrop, .selection-mode headerbar + separator:backdrop, .selection-mode headerbar + separator.sidebar:backdrop {
background-color: #3c84f7;
}
headerbar switch {
margin-top: 12px;
margin-bottom: 12px;
@@ -2494,13 +2497,13 @@ popover.background {
}
popover.background, .csd popover.background {
border: 1px solid rgba(255, 255, 255, 0.15);
box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(0, 0, 0, 0.12);
background-clip: border-box;
border: 1px solid rgba(0, 0, 0, 0.25);
box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
background-clip: padding-box;
}
popover.background:backdrop, .csd popover.background:backdrop {
box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(0, 0, 0, 0.12);
box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12);
}
popover.background > stack {
src/main/gtk-3.0/gtk.css
+28 -25
View File
@@ -1826,7 +1826,7 @@ searchbar > revealer > box {
background-color: #242424;
color: white;
border-radius: 12px 12px 0 0;
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), inset 0 -1px rgba(0, 0, 0, 0.12);
box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
}
.titlebar:disabled {
@@ -1868,6 +1868,29 @@ searchbar > revealer > box {
box-shadow: none;
}
.titlebar + separator, .titlebar + separator.sidebar {
background-color: #242424;
background-image: none;
transition: all 75ms cubic-bezier(0, 0, 0.2, 1);
box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
}
.titlebar + separator:backdrop, .titlebar + separator.sidebar:backdrop {
background-color: #2C2C2C;
}
.titlebar.selection-mode + separator, .titlebar.selection-mode + separator.sidebar, .selection-mode .titlebar + separator, .selection-mode .titlebar + separator.sidebar {
background-color: #3c84f7;
}
.titlebar.selection-mode + separator:backdrop, .titlebar.selection-mode + separator.sidebar:backdrop, .selection-mode .titlebar + separator:backdrop, .selection-mode .titlebar + separator.sidebar:backdrop {
background-color: #3c84f7;
}
.background.csd.unified .titlebar + separator, .background.csd.unified .titlebar + separator.sidebar {
box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
}
.titlebar .linked:not(.vertical) > entry {
border-radius: 6px;
margin-left: 3px;
@@ -2029,26 +2052,6 @@ headerbar separator.titlebutton {
background-color: transparent;
}
headerbar + separator, headerbar + separator.sidebar {
background-color: #242424;
background-image: none;
box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
transition: all 75ms cubic-bezier(0, 0, 0.2, 1);
}
headerbar + separator:backdrop, headerbar + separator.sidebar:backdrop {
background-color: #2C2C2C;
}
headerbar.selection-mode + separator, headerbar.selection-mode + separator.sidebar, .selection-mode headerbar + separator, .selection-mode headerbar + separator.sidebar {
background-color: #3c84f7;
box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
}
headerbar.selection-mode + separator:backdrop, headerbar.selection-mode + separator.sidebar:backdrop, .selection-mode headerbar + separator:backdrop, .selection-mode headerbar + separator.sidebar:backdrop {
background-color: #3c84f7;
}
headerbar switch {
margin-top: 12px;
margin-bottom: 12px;
@@ -2503,13 +2506,13 @@ popover.background {
}
popover.background, .csd popover.background {
border: 1px solid rgba(255, 255, 255, 0.15);
box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(0, 0, 0, 0.12);
background-clip: border-box;
border: 1px solid rgba(0, 0, 0, 0.25);
box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
background-clip: padding-box;
}
popover.background:backdrop, .csd popover.background:backdrop {
box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(0, 0, 0, 0.12);
box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12);
}
popover.background > stack {
src/main/gtk-4.0/gtk-dark.css
+5 -24
View File
@@ -245,11 +245,6 @@ entry:disabled {
color: rgba(255, 255, 255, 0.5);
}
spinbutton.search.vertical, spinbutton.search:not(.vertical),
entry.search {
border-radius: 9999px;
}
spinbutton.flat.vertical, spinbutton.flat:not(.vertical),
entry.flat {
min-height: 0;
@@ -1802,11 +1797,6 @@ menubar > item label:disabled {
color: inherit;
}
menubar > item popover.menu.background > contents {
padding: 12px;
border-radius: 12px;
}
menubar > item popover.menu popover.menu {
margin-left: 9px;
}
@@ -1903,27 +1893,18 @@ popover.background, popover.background:backdrop {
background-color: transparent;
}
popover.background > arrow {
border: none;
background: none;
padding: 0;
-gtk-icon-size: 0;
height: 0;
}
popover.background > arrow,
popover.background > contents {
transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
padding: 6px;
background-color: #3C3C3C;
border-radius: 12px;
border: none;
outline-color: rgba(255, 255, 255, 0.1);
outline-offset: -1px;
outline-style: solid;
outline-width: 1px;
border: 1px solid rgba(255, 255, 255, 0.1);
background-clip: border-box;
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.75), 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
}
popover.background > arrow:backdrop,
popover.background > contents:backdrop {
box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(0, 0, 0, 0.75);
}
@@ -4559,7 +4540,7 @@ popover.emoji-picker > contents {
button.emoji-section {
margin: 0;
padding: 6px;
border-radius: 3px;
border-radius: 6px;
}
button.emoji-section:checked {
src/main/gtk-4.0/gtk-light.css
+13 -24
View File
@@ -245,11 +245,6 @@ entry:disabled {
color: rgba(0, 0, 0, 0.38);
}
spinbutton.search.vertical, spinbutton.search:not(.vertical),
entry.search {
border-radius: 9999px;
}
spinbutton.flat.vertical, spinbutton.flat:not(.vertical),
entry.flat {
min-height: 0;
@@ -1802,11 +1797,6 @@ menubar > item label:disabled {
color: inherit;
}
menubar > item popover.menu.background > contents {
padding: 12px;
border-radius: 12px;
}
menubar > item popover.menu popover.menu {
margin-left: 9px;
}
@@ -1903,31 +1893,30 @@ popover.background, popover.background:backdrop {
background-color: transparent;
}
popover.background > arrow {
border: none;
background: none;
padding: 0;
-gtk-icon-size: 0;
height: 0;
}
popover.background > arrow,
popover.background > contents {
transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
padding: 6px;
background-color: #FFFFFF;
border-radius: 12px;
border: none;
outline-color: rgba(255, 255, 255, 0.15);
outline-offset: -1px;
outline-style: solid;
outline-width: 1px;
border: 1px solid rgba(255, 255, 255, 0.15);
background-clip: border-box;
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.12), 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
}
popover.background > arrow:backdrop,
popover.background > contents:backdrop {
box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(0, 0, 0, 0.12);
}
popover.background > arrow {
border: 1px solid rgba(0, 0, 0, 0.12);
}
popover.background > contents {
border: none;
}
popover.background > contents > list,
popover.background > contents > .view,
popover.background > contents > toolbar {
@@ -4559,7 +4548,7 @@ popover.emoji-picker > contents {
button.emoji-section {
margin: 0;
padding: 6px;
border-radius: 3px;
border-radius: 6px;
}
button.emoji-section:checked {
src/main/gtk-4.0/gtk.css
+13 -24
View File
@@ -245,11 +245,6 @@ entry:disabled {
color: rgba(0, 0, 0, 0.38);
}
spinbutton.search.vertical, spinbutton.search:not(.vertical),
entry.search {
border-radius: 9999px;
}
spinbutton.flat.vertical, spinbutton.flat:not(.vertical),
entry.flat {
min-height: 0;
@@ -1811,11 +1806,6 @@ menubar > item label:disabled {
color: inherit;
}
menubar > item popover.menu.background > contents {
padding: 12px;
border-radius: 12px;
}
menubar > item popover.menu popover.menu {
margin-left: 9px;
}
@@ -1912,31 +1902,30 @@ popover.background, popover.background:backdrop {
background-color: transparent;
}
popover.background > arrow {
border: none;
background: none;
padding: 0;
-gtk-icon-size: 0;
height: 0;
}
popover.background > arrow,
popover.background > contents {
transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
padding: 6px;
background-color: #FFFFFF;
border-radius: 12px;
border: none;
outline-color: rgba(255, 255, 255, 0.15);
outline-offset: -1px;
outline-style: solid;
outline-width: 1px;
border: 1px solid rgba(255, 255, 255, 0.15);
background-clip: border-box;
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.12), 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
}
popover.background > arrow:backdrop,
popover.background > contents:backdrop {
box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(0, 0, 0, 0.12);
}
popover.background > arrow {
border: 1px solid rgba(0, 0, 0, 0.12);
}
popover.background > contents {
border: none;
}
popover.background > contents > list,
popover.background > contents > .view,
popover.background > contents > toolbar {
@@ -4568,7 +4557,7 @@ popover.emoji-picker > contents {
button.emoji-section {
margin: 0;
padding: 6px;
border-radius: 3px;
border-radius: 6px;
}
button.emoji-section:checked {
src/sass/_tweaks-temp.scss
+1 -1
View File
@@ -23,4 +23,4 @@ $color_type: 'default';
$rimless: 'false';
// Windows button style : mac/normal
$window_button: 'normal';
$window_button: 'mac';
src/sass/gtk/_common-3.0.scss
+41 -25
View File
@@ -1131,10 +1131,10 @@ searchbar > revealer > box {
color: $titlebar-text;
border-radius: $window-radius $window-radius 0 0;
@if $variant == 'dark' {
box-shadow: inset 0 -1px $border;
@if $variant == 'light' or $rimless == 'true' {
box-shadow: inset 0 -1px $border, inset 0 1px highlight($titlebar);
} @else {
box-shadow: inset 0 1px highlight($titlebar), inset 0 -1px $border;
box-shadow: inset 0 -1px $border;
}
&:disabled { color: $titlebar-text-disabled; }
@@ -1170,6 +1170,37 @@ searchbar > revealer > box {
box-shadow: none;
}
// separator between headerbars
+ separator, + separator.sidebar {
background-color: $titlebar;
background-image: none;
transition: all $duration $ease-out;
@if $variant == 'light' or $rimless == 'true' {
box-shadow: inset 0 -1px $border, inset 0 1px highlight($titlebar);
} @else {
box-shadow: inset 0 -1px $border;
}
&:backdrop {
background-color: $titlebar-backdrop;
}
}
&.selection-mode + separator, &.selection-mode + separator.sidebar,
.selection-mode & + separator, .selection-mode & + separator.sidebar {
background-color: $primary;
&:backdrop {
background-color: $primary;
}
}
.background.csd.unified & + separator,
.background.csd.unified & + separator.sidebar { // reset
box-shadow: inset 0 -1px $border;
}
entry { @extend %titlebar-entry; }
.linked:not(.vertical) > entry {
@@ -1350,27 +1381,6 @@ headerbar {
background-color: transparent;
}
+ separator, + separator.sidebar {
background-color: $titlebar;
background-image: none;
box-shadow: inset 0 -1px $border;
transition: all $duration $ease-out;
&:backdrop {
background-color: $titlebar-backdrop;
}
}
&.selection-mode + separator, &.selection-mode + separator.sidebar,
.selection-mode & + separator, .selection-mode & + separator.sidebar {
background-color: $primary;
box-shadow: inset 0 -1px $border;
&:backdrop {
background-color: $primary;
}
}
switch {
margin-top: ($large-size - 24px) / 2;
margin-bottom: ($large-size - 24px) / 2;
@@ -1755,12 +1765,18 @@ popover.background {
box-shadow: $shadow-z4;
&:backdrop { box-shadow: $shadow-z2; }
} @else {
} @else if $variant == 'dark' {
border: 1px solid highlight($surface);
box-shadow: $shadow-z4, 0 0 0 1px $window-border;
background-clip: border-box;
&:backdrop { box-shadow: $shadow-z2, 0 0 0 1px $window-border; }
} @else {
border: 1px solid rgba(black, 0.25);
box-shadow: $shadow-z4;
background-clip: padding-box;
&:backdrop { box-shadow: $shadow-z2; }
}
}
src/sass/gtk/_common-4.0.scss
+20 -24
View File
@@ -256,7 +256,7 @@ entry {
&:disabled { @include entry(disabled); }
&.search { border-radius: $circular-radius; }
// &.search { border-radius: $circular-radius; }
&.flat {
min-height: 0;
@@ -1582,7 +1582,7 @@ menubar {
> item {
transition: $transition;
min-height: 20px;
padding: 4px 8px;
padding: $space-size - 2px $space-size + 2px;
color: $titlebar-text-secondary;
&:selected { // Seems like it :hover even with keyboard focus
@@ -1596,14 +1596,9 @@ menubar {
label:disabled { color: inherit; } // to inherit the above color
}
& > item popover.menu.background > contents {
padding: $menu-radius;
border-radius: $menu-radius;
}
//nested submenus
& > item popover.menu popover.menu {
margin-left: $space-size*1.5;
margin-left: $space-size * 1.5;
}
& > item popover.menu.background popover.menu.background > contents {
@@ -1699,28 +1694,19 @@ popover.background {
background-color: transparent;
}
> arrow {
border: none;
background: none;
padding: 0;
-gtk-icon-size: 0;
height: 0;
}
> arrow,
> contents {
transition: $transition-shadow;
padding: $space-size;
background-color: $surface;
border-radius: $menu-radius;
border: none;
outline-color: highlight($surface);
outline-offset: -1px;
outline-style: solid;
outline-width: 1px;
@if $rimless == 'true' {
border: none;
box-shadow: $shadow-z4;
} @else {
border: 1px solid highlight($surface);
background-clip: border-box;
box-shadow: 0 0 0 1px $window-border, $shadow-z4;
}
@@ -1733,6 +1719,16 @@ popover.background {
}
}
@if $rimless == 'false' and $variant == 'light' {
> arrow {
border: 1px solid $window-border;
}
> contents {
border: none;
}
}
> contents {
> list,
> .view,
@@ -4279,7 +4275,7 @@ popover.emoji-picker {
.emoji-toolbar {
padding: 0;
border-spacing: $space-size/2;
border-spacing: $space-size / 2;
border-top: 1px solid $divider;
background: none;
}
@@ -4287,7 +4283,7 @@ popover.emoji-picker {
button.emoji-section {
margin: 0;
padding: $space-size;
border-radius: $corner-radius -$space-size/2;
border-radius: $corner-radius;
&:checked {
color: $primary;
@@ -4308,7 +4304,7 @@ popover.emoji-picker emoji {
emoji-completion-row {
min-height: $menuitem-size;
padding: 0 $space-size*2;
padding: 0 $space-size * 2;
> box {
border-spacing: $space-size;