From e4b80117b5a7203e25b91c35efc2c52b0d948538 Mon Sep 17 00:00:00 2001
From: Sam Hewitt <sam@snwh.org>
Date: Fri, 25 Feb 2022 11:40:24 -0330
Subject: [PATCH] theme: Minor screenshot UI fixes

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2215>
---
 .../gnome-shell-sass/widgets/_screenshot.scss | 37 +++++++++----------
 .../widgets/_window-picker.scss               |  2 +-
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/data/theme/gnome-shell-sass/widgets/_screenshot.scss b/data/theme/gnome-shell-sass/widgets/_screenshot.scss
index 458c6f04d..c0a983df9 100644
--- a/data/theme/gnome-shell-sass/widgets/_screenshot.scss
+++ b/data/theme/gnome-shell-sass/widgets/_screenshot.scss
@@ -24,14 +24,15 @@ $screenshot_ui_button_red: $error_color;
 }
 
 .screenshot-ui-close-button {
-  @extend .window-close;  // copy window close button
-  padding: $base_padding; // but with more padding
-  &.left { margin-left: 8px; }
-  &.right { margin-right: 8px; }
+  @extend .window-close; // copy window close button
+  padding: $base_padding !important; // but with more padding
+  &.left { margin-left: 8px;}
+  &.right { margin-right: 8px;}
 }
 
 .screenshot-ui-type-button {
   @extend %osd_button;
+  min-width: 48px;
   padding: $base_padding * 2 $base_padding * 3 !important;
   border-radius: $screenshot_ui_panel_border_radius - $screenshot_ui_panel_padding;
 }
@@ -46,7 +47,7 @@ $screenshot_ui_button_red: $error_color;
   .screenshot-ui-capture-button-circle {
     background-color: $osd_fg_color;
     transition-duration: 200ms;
-    &:hover, &:focus { background-color: $hover_bg_color; }
+    &:hover, &:focus { background-color: $hover_bg_color;}
     border-radius: 99px;
   }
 
@@ -66,16 +67,14 @@ $screenshot_ui_button_red: $error_color;
     .screenshot-ui-capture-button-circle {
       background-color: $screenshot_ui_button_red;
     }
-
     &:hover, &:focus {
       .screenshot-ui-capture-button-circle {
-        background-color: darken($screenshot_ui_button_red, 15%);
+        background-color: lighten($screenshot_ui_button_red, 5%);
       }
     }
-
     &:active {
       .screenshot-ui-capture-button-circle {
-        background-color: darken($screenshot_ui_button_red, 30%);
+        background-color: darken($screenshot_ui_button_red, 7%);
       }
     }
   }
@@ -87,27 +86,27 @@ $screenshot_ui_button_red: $error_color;
   padding: $screenshot_ui_shot_cast_spacing;
   spacing: $screenshot_ui_shot_cast_spacing;
 
-  &:ltr { margin-left: $screenshot_ui_shot_cast_margin - $screenshot_ui_panel_padding; }
-  &:rtl { margin-right: $screenshot_ui_shot_cast_margin - $screenshot_ui_panel_padding; }
+  &:ltr { margin-left: $screenshot_ui_shot_cast_margin - $screenshot_ui_panel_padding;}
+  &:rtl { margin-right: $screenshot_ui_shot_cast_margin - $screenshot_ui_panel_padding;}
 }
 
 .screenshot-ui-shot-cast-button {
   padding: $base_padding $base_padding*2;
   background-color: transparent;
-  &:hover, &:focus { background-color: lighten($hover_bg_color, 5%); }
-  &:active { background-color: lighten($active_bg_color,5%); }
-  &:checked { background-color: white; color: black; }
+  &:hover, &:focus { background-color: lighten($hover_bg_color, 5%);}
+  &:active { background-color: lighten($active_bg_color,5%);}
+  &:checked { background-color: white;color: black;}
 
   border-radius: $modal_radius - $screenshot_ui_shot_cast_spacing;
 
-  StIcon { icon-size: $base_icon_size; }
+  StIcon { icon-size: $base_icon_size;}
 }
 
 .screenshot-ui-show-pointer-button {
   @extend %osd_button;
   border-radius: 99px;
   padding: $base_padding * 2 !important;
-  StIcon { icon-size: $base_icon_size; }
+  StIcon { icon-size: $base_icon_size;}
 }
 
 .screenshot-ui-area-indicator-shade {
@@ -174,7 +173,7 @@ $screenshot_ui_button_red: $error_color;
     }
 
     .screenshot-ui-window-selector-check {
-      color: white;
+      color: $selected_fg_color;
       background-color: $selected_bg_color;
     }
   }
@@ -184,8 +183,8 @@ $screenshot_ui_button_red: $error_color;
   transition-duration: 200ms;
   background-color: rgba(0,0,0,.5);
 
-  &:hover { background-color: rgba(0,0,0,.3); }
-  &:active { background-color: rgba(0,0,0,.7); }
+  &:hover { background-color: rgba(0,0,0,.3);}
+  &:active { background-color: rgba(0,0,0,.7);}
   &:checked {
     background-color: transparent;
     border: 2px white;
diff --git a/data/theme/gnome-shell-sass/widgets/_window-picker.scss b/data/theme/gnome-shell-sass/widgets/_window-picker.scss
index e494f6d8a..84aaa43a6 100644
--- a/data/theme/gnome-shell-sass/widgets/_window-picker.scss
+++ b/data/theme/gnome-shell-sass/widgets/_window-picker.scss
@@ -27,7 +27,7 @@ $window_close_button_padding: 3px;
 .window-close {
   background-color: $window_close_button_color;
   color: $osd_fg_color;
-  border-radius: $window_close_button_size * 0.5 + $window_close_button_padding * 2;
+  border-radius: 99px;
   padding: $window_close_button_padding;
   height: $window_close_button_size;
   width: $window_close_button_size;