diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css index 8651987..dc2c3c5 100644 --- a/gtk-4.0/gtk.css +++ b/gtk-4.0/gtk.css @@ -32,7 +32,7 @@ entry.accent, entry.accent > text, label.accent, label.accent > text { color: #D entry.accent:disabled, entry.accent > text:disabled, label.accent:disabled, label.accent > text:disabled { color: #ac7842; } -paned > separator, scale > trough > slider, switch > slider, scrollbar > range > trough > slider, tab.reorderable-page, tabbox tab { background-image: radial-gradient(circle, alpha(currentColor,0.4) 15%, alpha(currentColor,0) 20%); background-size: 0.3em 0.3em; background-repeat: repeat; background-clip: padding-box; } +tabbox > tabboxchild > tab, paned > separator, scale > trough > slider, switch > slider, scrollbar > range > trough > slider, tab.reorderable-page, tabbox tab { background-image: radial-gradient(circle, alpha(currentColor,0.4) 15%, alpha(currentColor,0) 20%); background-size: 0.3em 0.3em; background-repeat: repeat; background-clip: padding-box; } splitbutton:disabled, splitbutton.text-button:disabled, splitbutton.image-button:disabled, splitbutton.flat:disabled, tabbox > tabboxchild > tab:disabled:active, tabbox > tabboxchild > tab:disabled:selected, tabbox > tabboxchild > tab:disabled, cursor-handle:disabled, .osd scale > trough > slider:disabled, scale > trough > slider:disabled, .osd check:disabled, .osd radio:disabled, check:checked:disabled, check.view:checked:disabled, .view check:checked:disabled, radio:checked:disabled, radio.view:checked:disabled, .view radio:checked:disabled, check:disabled, check.view:disabled, .view check:disabled, radio:disabled, radio.view:disabled, .view radio:disabled, switch:disabled > slider, tab.reorderable-page:disabled, tabbox tab:disabled, notebook > header tab:disabled, notebook.frame > header tab:disabled, windowcontrols button.minimize:disabled, windowcontrols button.maximize:disabled, windowcontrols button.close:disabled, infobar.error button:disabled, infobar.warning button:disabled, infobar.question button:disabled, infobar.info button:disabled, infobar button:disabled, .osd spinbutton.vertical > button:first-child:disabled, modelbutton.flat:disabled, headerbar splitbutton:backdrop:disabled:active, .topbar splitbutton:backdrop:disabled:active, headerbar splitbutton.text-button:backdrop:disabled:active, .topbar splitbutton.text-button:backdrop:disabled:active, headerbar splitbutton.image-button:backdrop:disabled:active, .topbar splitbutton.image-button:backdrop:disabled:active, headerbar splitbutton.flat:backdrop:disabled:active, .topbar splitbutton.flat:backdrop:disabled:active, headerbar splitbutton:backdrop:disabled:checked, .topbar splitbutton:backdrop:disabled:checked, headerbar splitbutton.text-button:backdrop:disabled:checked, .topbar splitbutton.text-button:backdrop:disabled:checked, headerbar splitbutton.image-button:backdrop:disabled:checked, .topbar splitbutton.image-button:backdrop:disabled:checked, headerbar splitbutton.flat:backdrop:disabled:checked, .topbar splitbutton.flat:backdrop:disabled:checked, headerbar button:backdrop:disabled:active, headerbar button:backdrop:disabled:checked, .topbar button:backdrop:disabled:active, .topbar button:backdrop:disabled:checked, headerbar splitbutton:backdrop:disabled, .topbar splitbutton:backdrop:disabled, headerbar splitbutton.text-button:backdrop:disabled, .topbar splitbutton.text-button:backdrop:disabled, headerbar splitbutton.image-button:backdrop:disabled, .topbar splitbutton.image-button:backdrop:disabled, headerbar splitbutton.flat:backdrop:disabled, .topbar splitbutton.flat:backdrop:disabled, headerbar button:backdrop:disabled, .topbar button:backdrop:disabled, headerbar splitbutton:disabled:active, .topbar splitbutton:disabled:active, headerbar splitbutton.text-button:disabled:active, .topbar splitbutton.text-button:disabled:active, headerbar splitbutton.image-button:disabled:active, .topbar splitbutton.image-button:disabled:active, headerbar splitbutton.flat:disabled:active, .topbar splitbutton.flat:disabled:active, headerbar splitbutton:disabled:checked, .topbar splitbutton:disabled:checked, headerbar splitbutton.text-button:disabled:checked, .topbar splitbutton.text-button:disabled:checked, headerbar splitbutton.image-button:disabled:checked, .topbar splitbutton.image-button:disabled:checked, headerbar splitbutton.flat:disabled:checked, .topbar splitbutton.flat:disabled:checked, headerbar button:disabled:active, headerbar button:disabled:checked, .topbar button:disabled:active, .topbar button:disabled:checked, headerbar splitbutton:disabled, .topbar splitbutton:disabled, headerbar splitbutton.text-button:disabled, .topbar splitbutton.text-button:disabled, headerbar splitbutton.image-button:disabled, .topbar splitbutton.image-button:disabled, headerbar splitbutton.flat:disabled, .topbar splitbutton.flat:disabled, headerbar button:disabled, .topbar button:disabled, .osd button.destructive-action:disabled, button.destructive-action:disabled:active, button.destructive-action:disabled:checked, button.destructive-action:disabled, .osd button.suggested-action:disabled, button.suggested-action:disabled:active, button.suggested-action:disabled:checked, button.suggested-action:disabled, .app-notification button.flat:disabled, .osd button.flat:disabled, .app-notification button:disabled, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .osd button:disabled, splitbutton:disabled:active, splitbutton.text-button:disabled:active, splitbutton.image-button:disabled:active, splitbutton.flat:disabled:active, tabbox > tabboxchild > tab:disabled:active, .card.activatable:disabled:active, .card.button:disabled:active, notebook > header > tabs > arrow:disabled:active, notebook.frame > header > tabs > arrow:disabled:active, windowcontrols button:disabled:active, splitbutton:disabled:checked, splitbutton.text-button:disabled:checked, splitbutton.image-button:disabled:checked, splitbutton.flat:disabled:checked, tabbox > tabboxchild > tab:disabled:checked, .card.activatable:disabled:checked, .card.button:disabled:checked, notebook > header > tabs > arrow:disabled:checked, notebook.frame > header > tabs > arrow:disabled:checked, windowcontrols button:disabled:checked, button:disabled:active, button:disabled:checked, button.opaque:disabled:active, button.opaque:disabled:checked, button.card:disabled:active, button.card:disabled:checked, splitbutton:disabled, splitbutton.text-button:disabled, splitbutton.image-button:disabled, splitbutton.flat:disabled, tabbox > tabboxchild > tab:disabled, .card.activatable:disabled, .card.button:disabled, notebook > header > tabs > arrow:disabled, notebook.frame > header > tabs > arrow:disabled, .nautilus-path-bar .path-buttons-box button:disabled, windowcontrols button:disabled, button:disabled, button.opaque:disabled, button.card:disabled, spinbutton.vertical > text:disabled, spinbutton:disabled:not(.vertical), entry:disabled { background-image: linear-gradient(45deg, alpha(currentColor,0.5) 10%, alpha(currentColor,0) 10%, alpha(currentColor,0) 50%, alpha(currentColor,0.5) 50%, alpha(currentColor,0.5) 60%, alpha(currentColor,0) 60%); background-size: 0.6em 0.6em; background-repeat: repeat; background-position: center; } @@ -1707,16 +1707,20 @@ menubutton arrow.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } tabbox > tabboxchild { border-radius: 0px; } -tabbox > tabboxchild > tab { border-radius: 0px; border-width: 2px; color: #1d1d1d; background-color: #dddddd; border-left-color: #fafafa; border-top-color: #fafafa; border-right-color: #cecece; border-bottom-color: #cecece; transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; } +tabbox > tabboxchild > tab { border-radius: 0px; transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; } tabbox > tabboxchild > tab { outline: 0 solid transparent; outline-offset: 4px; } tabbox > tabboxchild > tab:focus:focus-visible { outline-color: transparent; outline-width: 0; outline-offset: -2px; } +tabbox > tabboxchild > tab label { background-color: #dddddd; } + tabbox > tabboxchild > tab:hover { border-width: 2px; background-color: #eaeaea; border-left-color: #fdfdfd; border-top-color: #fdfdfd; border-right-color: #e0e0e0; border-bottom-color: #e0e0e0; -gtk-icon-filter: brightness(1.2); } tabbox > tabboxchild > tab.keyboard-activating, tabbox > tabboxchild > tab:active { border-width: 2px; background-color: #dddddd; border-left-color: #cecece; border-top-color: #cecece; border-right-color: #fafafa; border-bottom-color: #fafafa; transition-duration: 50ms; } +tabbox > tabboxchild > tab:selected label { background-color: #D8761A; } + tabbox > tabboxchild > tab:selected:hover:not(:active) { border-width: 2px; color: #000000; background-color: #e58327; border-left-color: #af641d; border-top-color: #af641d; border-right-color: #f3c498; border-bottom-color: #f3c498; } tabbox > tabboxchild > tab:selected, tabbox > tabboxchild > tab:selected:active { border-width: 2px; color: #000000; background-color: #D8761A; border-left-color: #9f5713; border-top-color: #9f5713; border-right-color: #ebb787; border-bottom-color: #ebb787; } diff --git a/source/gtk4/_common.scss b/source/gtk4/_common.scss index 5d3597b..21671d2 100644 --- a/source/gtk4/_common.scss +++ b/source/gtk4/_common.scss @@ -3870,10 +3870,13 @@ tabbox { & > tab { @extend %button_basic; border-radius: $button_radius; - @include button(normal); - + //@include button(normal); @include focus-ring(); + @extend %draggable; + & label { + background-color: $button_bg; + } &:hover { @include button(hover); -gtk-icon-filter: brightness(1.2); @@ -3886,8 +3889,12 @@ tabbox { transition-duration: 50ms; } - &:selected:hover:not(:active) { @include button(checked-hover); } - &:selected, &:selected:active { @include button(checked-active); } + &:selected { + label { background-color: $selected_bg_color;} + &:hover:not(:active) { @include button(checked-hover); } + &, &:active { @include button(checked-active); } + } + //removed backdrop diff --git a/source/gtk4/gtk-new.css b/source/gtk4/gtk-new.css index 8651987..dc2c3c5 100644 --- a/source/gtk4/gtk-new.css +++ b/source/gtk4/gtk-new.css @@ -32,7 +32,7 @@ entry.accent, entry.accent > text, label.accent, label.accent > text { color: #D entry.accent:disabled, entry.accent > text:disabled, label.accent:disabled, label.accent > text:disabled { color: #ac7842; } -paned > separator, scale > trough > slider, switch > slider, scrollbar > range > trough > slider, tab.reorderable-page, tabbox tab { background-image: radial-gradient(circle, alpha(currentColor,0.4) 15%, alpha(currentColor,0) 20%); background-size: 0.3em 0.3em; background-repeat: repeat; background-clip: padding-box; } +tabbox > tabboxchild > tab, paned > separator, scale > trough > slider, switch > slider, scrollbar > range > trough > slider, tab.reorderable-page, tabbox tab { background-image: radial-gradient(circle, alpha(currentColor,0.4) 15%, alpha(currentColor,0) 20%); background-size: 0.3em 0.3em; background-repeat: repeat; background-clip: padding-box; } splitbutton:disabled, splitbutton.text-button:disabled, splitbutton.image-button:disabled, splitbutton.flat:disabled, tabbox > tabboxchild > tab:disabled:active, tabbox > tabboxchild > tab:disabled:selected, tabbox > tabboxchild > tab:disabled, cursor-handle:disabled, .osd scale > trough > slider:disabled, scale > trough > slider:disabled, .osd check:disabled, .osd radio:disabled, check:checked:disabled, check.view:checked:disabled, .view check:checked:disabled, radio:checked:disabled, radio.view:checked:disabled, .view radio:checked:disabled, check:disabled, check.view:disabled, .view check:disabled, radio:disabled, radio.view:disabled, .view radio:disabled, switch:disabled > slider, tab.reorderable-page:disabled, tabbox tab:disabled, notebook > header tab:disabled, notebook.frame > header tab:disabled, windowcontrols button.minimize:disabled, windowcontrols button.maximize:disabled, windowcontrols button.close:disabled, infobar.error button:disabled, infobar.warning button:disabled, infobar.question button:disabled, infobar.info button:disabled, infobar button:disabled, .osd spinbutton.vertical > button:first-child:disabled, modelbutton.flat:disabled, headerbar splitbutton:backdrop:disabled:active, .topbar splitbutton:backdrop:disabled:active, headerbar splitbutton.text-button:backdrop:disabled:active, .topbar splitbutton.text-button:backdrop:disabled:active, headerbar splitbutton.image-button:backdrop:disabled:active, .topbar splitbutton.image-button:backdrop:disabled:active, headerbar splitbutton.flat:backdrop:disabled:active, .topbar splitbutton.flat:backdrop:disabled:active, headerbar splitbutton:backdrop:disabled:checked, .topbar splitbutton:backdrop:disabled:checked, headerbar splitbutton.text-button:backdrop:disabled:checked, .topbar splitbutton.text-button:backdrop:disabled:checked, headerbar splitbutton.image-button:backdrop:disabled:checked, .topbar splitbutton.image-button:backdrop:disabled:checked, headerbar splitbutton.flat:backdrop:disabled:checked, .topbar splitbutton.flat:backdrop:disabled:checked, headerbar button:backdrop:disabled:active, headerbar button:backdrop:disabled:checked, .topbar button:backdrop:disabled:active, .topbar button:backdrop:disabled:checked, headerbar splitbutton:backdrop:disabled, .topbar splitbutton:backdrop:disabled, headerbar splitbutton.text-button:backdrop:disabled, .topbar splitbutton.text-button:backdrop:disabled, headerbar splitbutton.image-button:backdrop:disabled, .topbar splitbutton.image-button:backdrop:disabled, headerbar splitbutton.flat:backdrop:disabled, .topbar splitbutton.flat:backdrop:disabled, headerbar button:backdrop:disabled, .topbar button:backdrop:disabled, headerbar splitbutton:disabled:active, .topbar splitbutton:disabled:active, headerbar splitbutton.text-button:disabled:active, .topbar splitbutton.text-button:disabled:active, headerbar splitbutton.image-button:disabled:active, .topbar splitbutton.image-button:disabled:active, headerbar splitbutton.flat:disabled:active, .topbar splitbutton.flat:disabled:active, headerbar splitbutton:disabled:checked, .topbar splitbutton:disabled:checked, headerbar splitbutton.text-button:disabled:checked, .topbar splitbutton.text-button:disabled:checked, headerbar splitbutton.image-button:disabled:checked, .topbar splitbutton.image-button:disabled:checked, headerbar splitbutton.flat:disabled:checked, .topbar splitbutton.flat:disabled:checked, headerbar button:disabled:active, headerbar button:disabled:checked, .topbar button:disabled:active, .topbar button:disabled:checked, headerbar splitbutton:disabled, .topbar splitbutton:disabled, headerbar splitbutton.text-button:disabled, .topbar splitbutton.text-button:disabled, headerbar splitbutton.image-button:disabled, .topbar splitbutton.image-button:disabled, headerbar splitbutton.flat:disabled, .topbar splitbutton.flat:disabled, headerbar button:disabled, .topbar button:disabled, .osd button.destructive-action:disabled, button.destructive-action:disabled:active, button.destructive-action:disabled:checked, button.destructive-action:disabled, .osd button.suggested-action:disabled, button.suggested-action:disabled:active, button.suggested-action:disabled:checked, button.suggested-action:disabled, .app-notification button.flat:disabled, .osd button.flat:disabled, .app-notification button:disabled, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .osd button:disabled, splitbutton:disabled:active, splitbutton.text-button:disabled:active, splitbutton.image-button:disabled:active, splitbutton.flat:disabled:active, tabbox > tabboxchild > tab:disabled:active, .card.activatable:disabled:active, .card.button:disabled:active, notebook > header > tabs > arrow:disabled:active, notebook.frame > header > tabs > arrow:disabled:active, windowcontrols button:disabled:active, splitbutton:disabled:checked, splitbutton.text-button:disabled:checked, splitbutton.image-button:disabled:checked, splitbutton.flat:disabled:checked, tabbox > tabboxchild > tab:disabled:checked, .card.activatable:disabled:checked, .card.button:disabled:checked, notebook > header > tabs > arrow:disabled:checked, notebook.frame > header > tabs > arrow:disabled:checked, windowcontrols button:disabled:checked, button:disabled:active, button:disabled:checked, button.opaque:disabled:active, button.opaque:disabled:checked, button.card:disabled:active, button.card:disabled:checked, splitbutton:disabled, splitbutton.text-button:disabled, splitbutton.image-button:disabled, splitbutton.flat:disabled, tabbox > tabboxchild > tab:disabled, .card.activatable:disabled, .card.button:disabled, notebook > header > tabs > arrow:disabled, notebook.frame > header > tabs > arrow:disabled, .nautilus-path-bar .path-buttons-box button:disabled, windowcontrols button:disabled, button:disabled, button.opaque:disabled, button.card:disabled, spinbutton.vertical > text:disabled, spinbutton:disabled:not(.vertical), entry:disabled { background-image: linear-gradient(45deg, alpha(currentColor,0.5) 10%, alpha(currentColor,0) 10%, alpha(currentColor,0) 50%, alpha(currentColor,0.5) 50%, alpha(currentColor,0.5) 60%, alpha(currentColor,0) 60%); background-size: 0.6em 0.6em; background-repeat: repeat; background-position: center; } @@ -1707,16 +1707,20 @@ menubutton arrow.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } tabbox > tabboxchild { border-radius: 0px; } -tabbox > tabboxchild > tab { border-radius: 0px; border-width: 2px; color: #1d1d1d; background-color: #dddddd; border-left-color: #fafafa; border-top-color: #fafafa; border-right-color: #cecece; border-bottom-color: #cecece; transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; } +tabbox > tabboxchild > tab { border-radius: 0px; transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; } tabbox > tabboxchild > tab { outline: 0 solid transparent; outline-offset: 4px; } tabbox > tabboxchild > tab:focus:focus-visible { outline-color: transparent; outline-width: 0; outline-offset: -2px; } +tabbox > tabboxchild > tab label { background-color: #dddddd; } + tabbox > tabboxchild > tab:hover { border-width: 2px; background-color: #eaeaea; border-left-color: #fdfdfd; border-top-color: #fdfdfd; border-right-color: #e0e0e0; border-bottom-color: #e0e0e0; -gtk-icon-filter: brightness(1.2); } tabbox > tabboxchild > tab.keyboard-activating, tabbox > tabboxchild > tab:active { border-width: 2px; background-color: #dddddd; border-left-color: #cecece; border-top-color: #cecece; border-right-color: #fafafa; border-bottom-color: #fafafa; transition-duration: 50ms; } +tabbox > tabboxchild > tab:selected label { background-color: #D8761A; } + tabbox > tabboxchild > tab:selected:hover:not(:active) { border-width: 2px; color: #000000; background-color: #e58327; border-left-color: #af641d; border-top-color: #af641d; border-right-color: #f3c498; border-bottom-color: #f3c498; } tabbox > tabboxchild > tab:selected, tabbox > tabboxchild > tab:selected:active { border-width: 2px; color: #000000; background-color: #D8761A; border-left-color: #9f5713; border-top-color: #9f5713; border-right-color: #ebb787; border-bottom-color: #ebb787; }