Prelim: Fix Luna (Blue) CSD caption buttons regression and tidy

This commit is contained in:
Rory Fewell
2023-02-07 22:37:45 +00:00
parent 18ca43747a
commit f491678e55
2 changed files with 5 additions and 125 deletions

View File

@@ -27,13 +27,6 @@ headerbar
//
@include __wintc_apply_props_not_in_category($headerbar_styles, "fg");
//background-image: url("../Resources/gtk-3.0/headerbar-body.png");
//background-size: 100% 100%;
//border-image: url("../Resources/gtk-3.0/headerbar-frame-csd.png") 6 9 3 9 stretch;
//border-style: solid;
//border-width: 6px 9px 3px;
//padding: 0 6px;
.title,
.subtitle,
& > box > label // Selector for 'Name:' label in FileChooserDialog
@@ -44,22 +37,12 @@ headerbar
.title
{
@include __wintc_apply_props($headerbar_title_styles);
//color: #FFF;
//font-weight: bold;
//padding-left: 12px;
//padding-right: 12px;
}
.subtitle
{
@include __wintc_apply_props($headerbar_subtitle_styles);
//color: #FFF;
//font-size: smaller;
//padding-left: 12px;
//padding-right: 12px;
@extend .dim-label;
}
@@ -67,9 +50,6 @@ headerbar
{
@include __wintc_apply_props_not_in_category($headerbar_backdrop_styles, "fg");
//background-image: url("../Resources/gtk-3.0/headerbar-body-backdrop.png");
//border-image: url("../Resources/gtk-3.0/headerbar-frame-backdrop-csd.png") 6 9 3 9 stretch;
.title,
.subtitle
{
@@ -213,20 +193,11 @@ headerbar
.maximized &,
.fullscreen &
{
// FIXME: Why do we have this nested &
//
&
@include __wintc_apply_props($headerbar_maximized_styles);
&:backdrop
{
@include __wintc_apply_props($headerbar_maximized_styles);
//border-image: url("../Resources/gtk-3.0/headerbar-frame.png") 6 9 3 9 stretch;
&:backdrop
{
@include __wintc_apply_props($headerbar_maximized_backdrop_styles);
//border-image: url("../Resources/gtk-3.0/header-frame-backdrop.png") 6 9 3 9 stretch;
}
@include __wintc_apply_props($headerbar_maximized_backdrop_styles);
}
}
@@ -307,40 +278,20 @@ headerbar
{
@include __wintc_apply_props($caption_button_styles);
//background-image: url("../Resources/gtk-3.0/caption_button_body.png"), linear-gradient(170deg, rgba(154,183,250,1) 0%, rgba(49,107,244,1) 15%, rgba(19,105,244,1) 65%, rgba(2,90,240,1) 100%);
//background-position: center;
//background-size: 100% 100%;
//border-image: url("../Resources/gtk-3.0/caption_button_border.png") 3 3 3 3 stretch;
//border-style: solid;
//border-width: 3px;
//color: #FFF;
&:focus
{
@include __wintc_apply_props($caption_button_focused_styles);
//background-image: url("../Resources/gtk-3.0/caption_button_body.png"), linear-gradient(170deg, rgba(154,183,250,1) 0%, rgba(49,107,244,1) 15%, rgba(19,105,244,1) 65%, rgba(2,90,240,1) 100%);
//border-image: url("../Resources/gtk-3.0/caption_button_border.png") 3 3 3 3 stretch;
//color: #FFF;
}
&:hover
{
@include __wintc_apply_props($caption_button_hover_styles);
//background-image: url("../Resources/gtk-3.0/caption_button_hover_body.png"), linear-gradient(170deg, rgba(164,194,255,1) 0%, rgba(56,121,252,1) 15%, rgba(31,151,253,1) 80%, rgba(17,132,250,1) 100%);
//border-image: url("../Resources/gtk-3.0/caption_button_hover_border.png") 3 3 3 3 stretch;
//color: #FFF;
}
&:checked
{
@include __wintc_apply_props($caption_button_selected_styles);
//background-image: url("../Resources/gtk-3.0/caption_button_press_body.png"), linear-gradient(170deg, rgba(0,56,130,1) 0%, rgba(0,77,178,1) 20%, rgba(0,94,195,1) 80%, rgba(0,91,192,1) 100%);
//border-image: url("../Resources/gtk-3.0/caption_button_press_border.png") 3 3 3 3 stretch;
//color: #FFF;
&:focus
{
@include __wintc_apply_props($caption_button_selected_focused_styles);
@@ -355,20 +306,12 @@ headerbar
&:active
{
@include __wintc_apply_props($caption_button_press_styles);
//background-image: url("../Resources/gtk-3.0/caption_button_press_body.png"), linear-gradient(170deg, rgba(0,56,130,1) 0%, rgba(0,77,178,1) 20%, rgba(0,94,195,1) 80%, rgba(0,91,192,1) 100%);
//border-image: url("../Resources/gtk-3.0/caption_button_press_border.png") 3 3 3 3 stretch;
//color: #78A2D8;
}
&:disabled
{
@include __wintc_apply_props($caption_button_inactive_styles);
//background-image: url("../Resources/gtk-3.0/caption_button_inactive_body.png"), linear-gradient(170deg, rgba(82,130,234,1) 0%, rgba(1,83,241,1) 20%, rgba(1,83,241,1) 100%);
//border-image: url("../Resources/gtk-3.0/caption_button_inactive_border.png") 3 3 3 3 stretch;
//color: #8C9DE7;
&:checked
{
@include __wintc_apply_props($caption_button_inactive_selected_styles);
@@ -379,34 +322,15 @@ headerbar
{
@include __wintc_apply_props($caption_button_backdrop_styles);
//background-image: url("../Resources/gtk-3.0/caption_button_backdrop_body.png"), linear-gradient(179deg, rgba(136,162,234,1) 0%, rgba(136,162,234,1) 2%, rgba(92,127,233,1) 10%, rgba(92,127,233,1) 50%, rgba(63,119,235,1) 100%);
//border-image: url("../Resources/gtk-3.0/caption_button_backdrop_border.png") 3 3 3 3 stretch;
//color: #FFF;
//&:focus
//{
//background-image: url("../Resources/gtk-3.0/caption_button_backdrop_body.png"), linear-gradient(179deg, rgba(136,162,234,1) 0%, rgba(136,162,234,1) 2%, rgba(92,127,233,1) 10%, rgba(92,127,233,1) 50%, rgba(63,119,235,1) 100%);
//border-image: url("../Resources/gtk-3.0/caption_button_backdrop_border.png") 3 3 3 3 stretch;
//color: #FFF;
//}
&:hover
{
@include __wintc_apply_props($caption_button_backdrop_hover_styles);
//background-image: url("../Resources/gtk-3.0/caption_button_backdrop_hover_body.png"), linear-gradient(175deg, rgba(164,194,255,1) 0%, rgba(56,121,252,1) 20%, rgba(56,121,252,1) 45%, rgba(31,151,253,1) 75%, rgba(63,119,235,1) 100%);
//border-image: url("../Resources/gtk-3.0/caption_button_backdrop_hover_border.png") 3 3 3 3 stretch;
//color: #FFF;
}
&:checked
{
@include __wintc_apply_props($caption_button_backdrop_selected_styles);
//background-image: url("../Resources/gtk-3.0/caption_button_backdrop_press_body.png"), linear-gradient(175deg, rgba(75,121,204,1) 0%, rgba(79,136,225,1) 100%);
//border-image: url("../Resources/gtk-3.0/caption_button_backdrop_press_border.png") 3 3 3 3 stretch;
//color: #FFF;
&:hover
{
@include __wintc_apply_props($caption_button_backdrop_selected_hover_styles);
@@ -416,20 +340,12 @@ headerbar
&:active
{
@include __wintc_apply_props($caption_button_backdrop_press_styles);
//background-image: url("../Resources/gtk-3.0/caption_button_backdrop_press_body.png"), linear-gradient(175deg, rgba(75,121,204,1) 0%, rgba(79,136,225,1) 100%);
//border-image: url("../Resources/gtk-3.0/caption_button_backdrop_press_border.png") 3 3 3 3 stretch;
//color: #97B0E2;
}
&:disabled
{
@include __wintc_apply_props($caption_button_backdrop_inactive_styles);
//background-image: url("../Resources/gtk-3.0/caption_button_backdrop_inactive_body.png"), linear-gradient(175deg, rgba(127,150,226,1) 0%, rgba(100,125,224,1) 40%, rgba(96,134,232,1) 100%);
//border-image: url("../Resources/gtk-3.0/caption_button_backdrop_inactive_border.png") 3 3 3 3 stretch;
//color: #919FE6;
&:checked
{
@include __wintc_apply_props($caption_button_backdrop_inactive_selected_styles);
@@ -442,74 +358,38 @@ headerbar
{
@include __wintc_apply_props($close_button_styles);
//background-image: url("../Resources/gtk-3.0/close_button_body.png"), linear-gradient(170deg, rgba(241,172,154,1) 0%, rgba(223,82,46,1) 15%, rgba(224,56,2,1) 100%);
//background-position: center;
//background-size: 100% 100%;
//border-image: url("../Resources/gtk-3.0/close_button_border.png") 3 3 3 3 stretch;
//border-style: solid;
//border-width: 3px;
//color: #FFF;
&:hover
{
@include __wintc_apply_props($close_button_hover_styles);
//background-image: url("../Resources/gtk-3.0/close_button_hover_body.png"), linear-gradient(170deg, rgba(255,184,176,1) 0%, rgba(253,100,81,1) 15%, rgba(254,133,102,1) 80%, rgba(252,107,71,1) 100%);
//border-image: url("../Resources/gtk-3.0/close_button_hover_border.png") 3 3 3 3 stretch;
//color: #FFF;
}
&:active
{
@include __wintc_apply_props($close_button_press_styles);
//background-image: url("../Resources/gtk-3.0/close_button_press_body.png"), linear-gradient(170deg, rgba(141,44,20,1) 0%, rgba(191,61,28,1) 15%, rgba(203,73,34,1) 80%, rgba(202,72,33,1) 100%);
//border-image: url("../Resources/gtk-3.0/close_button_press_border.png") 3 3 3 3 stretch;
//color: #DF9A88;
}
&:disabled
{
@include __wintc_apply_props($close_button_inactive_styles);
//background-image: url("../Resources/gtk-3.0/close_button_inactive_body.png"), linear-gradient(170deg, rgba(120,135,207,1) 0%, rgba(116,112,177,1) 100%);
//border-image: url("../Resources/gtk-3.0/close_button_inactive_border.png") 3 3 3 3 stretch;
//color: #9598CC;
}
&:backdrop
{
@include __wintc_apply_props($close_button_backdrop_styles);
//background-image: url("../Resources/gtk-3.0/close_button_backdrop_body.png"), linear-gradient(170deg, rgba(180,156,186,1) 0%, rgba(175,102,115,1) 100%);
//border-image: url("../Resources/gtk-3.0/close_button_backdrop_border.png") 3 3 3 3 stretch;
//color: #FFF;
&:hover
{
@include __wintc_apply_props($close_button_backdrop_hover_styles);
//background-image: url("../Resources/gtk-3.0/close_button_backdrop_hover_body.png"), linear-gradient(170deg, rgba(255,184,176,1) 0%, rgba(252,100,83,1) 15%, rgba(254,129,94,1) 80%, rgba(252,107,71,1) 100%);
//border-image: url("../Resources/gtk-3.0/close_button_backdrop_hover_border.png") 3 3 3 3 stretch;
//color: #FFF;
}
&:active
{
@include __wintc_apply_props($close_button_backdrop_press_styles);
//background-image: url("../Resources/gtk-3.0/close_button_backdrop_press_body.png"), linear-gradient(170deg, rgba(141,44,20,1) 0%, rgba(192,62,29,1) 15%, rgba(204,73,34,1) 100%);
//border-image: url("../Resources/gtk-3.0/close_button_backdrop_press_border.png") 3 3 3 3 stretch;
//color: #CBADBA;
}
&:disabled
{
@include __wintc_apply_props($close_button_backdrop_inactive_styles);
//background-image: url("../Resources/gtk-3.0/close_button_backdrop_inactive_body.png"), linear-gradient(170deg, rgba(120,135,207,1) 0%, rgba(116,112,177,1) 100%);
//border-image: url("../Resources/gtk-3.0/close_button_backdrop_inactive_border.png") 3 3 3 3 stretch;
//color: #A0A2D8;
}
}
}

View File

@@ -157,7 +157,7 @@ $caption_button_styles:
$caption_button_styles,
false,
undefined,
cover,
100% 100%,
undefined,
undefined,
url('../Resources/caption_button.png'),