[gnome-shell/wip/snwh/sass-cleanup] theme: remove unsupported calc

[Sam Hewitt <snwh src gnome org>]

commit 00a0736e3633d6edb8c2e4a5a86a7a37332a7f40
Author: Sam Hewitt <sam snwh org>
Date:   Wed Dec 18 14:19:01 2019 -0500

    theme: remove unsupported calc

 data/theme/gnome-shell-sass/_common.scss                |  2 +-
 data/theme/gnome-shell-sass/widgets/_app-grid.scss      | 15 +++++++++------
 data/theme/gnome-shell-sass/widgets/_corner-ripple.scss | 10 +++++-----
 data/theme/gnome-shell-sass/widgets/_popovers.scss      |  2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index 0f4c2175db..62d53ebe5e 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -209,7 +209,7 @@ stage {
        border-radius: $base_border_radius;
        border-width: 1px;
        min-height: 22px;
-       padding: calc($base_padding * 0.25) calc($base_padding * 2);
+       padding: $base_padding * 0.25 $base_padding * 2;
 
        @include button(normal);
        &:focus { @include button(focus);}
diff --git a/data/theme/gnome-shell-sass/widgets/_app-grid.scss 
b/data/theme/gnome-shell-sass/widgets/_app-grid.scss
index 9d293e6449..4576f8dd06 100644
--- a/data/theme/gnome-shell-sass/widgets/_app-grid.scss
+++ b/data/theme/gnome-shell-sass/widgets/_app-grid.scss
@@ -6,8 +6,8 @@ $app_icon_padding: 20px;
 // app icons
 .icon-grid {
        spacing: 30px;
-       -shell-grid-horizontal-item-size: calc($app_icon_size + ($app_icon_padding * 2));
-       -shell-grid-vertical-item-size: calc($app_icon_size + ($app_icon_padding * 2));
+       -shell-grid-horizontal-item-size: $app_icon_size + $app_icon_padding * 2;
+       -shell-grid-vertical-item-size: $app_icon_size + $app_icon_padding * 2;
 
        .overview-icon {
                icon-size: $app_icon_size;
@@ -110,7 +110,6 @@ $app_grid_fg_color: #fff;
 
 // Rename popup for app folders
 .rename-folder-popup {
-       background: red;
        .rename-folder-popup-item {
                spacing: $base_spacing;
                &:ltr, &:rtl { padding: 0, $base_padding * 2; }
@@ -162,7 +161,7 @@ $app_grid_fg_color: #fff;
        background-color: rgba(0,0,0,0.8);
        color: #fff;
        border-radius: 50%;
-       icon-size: calc($app_icon_size * 0.5);
+       icon-size: $app_icon_size * 0.5;
 }
 
 /* Frequent | All toggle */
@@ -177,6 +176,7 @@ $app_grid_fg_color: #fff;
        padding: 4px 32px;
        margin: 0;
        background-color: transparentize($osd_bg_color, 0.5);
+       border-width: 1px;
        color: darken($osd_fg_color, 25%);
 
        &:hover {
@@ -186,17 +186,20 @@ $app_grid_fg_color: #fff;
        }
 
        &:active {
-               box-shadow: inset 0 -2px $osd_fg_color;
+               box-shadow: inset 0 -2px 0 0 $osd_fg_color;
+               background-color: transparentize($selected_bg_color, 0.5) !important;
+               font-weight: bold;
        }
 
        &:checked {
                background-color: transparentize(lighten($osd_bg_color, 20%), 0.5);
                color: $osd_fg_color;
+               box-shadow: none;
                font-weight: bold;
        }
 
        &:first-child {
-               border-right-width: 0;
+               border-right-width: 0 !important;
                border-radius: $base_border_radius 0 0 $base_border_radius;
        }
 
diff --git a/data/theme/gnome-shell-sass/widgets/_corner-ripple.scss 
b/data/theme/gnome-shell-sass/widgets/_corner-ripple.scss
index fcac3f6629..4321a3f6e1 100644
--- a/data/theme/gnome-shell-sass/widgets/_corner-ripple.scss
+++ b/data/theme/gnome-shell-sass/widgets/_corner-ripple.scss
@@ -6,19 +6,19 @@ $ripple_size: 50px;
        background-color: lighten(transparentize($selected_bg_color, 0.7), 40%);
        box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
        // plus + 2px for the border (box-shadow)
-       width: calc(#{$ripple_size} + 2px);
-       height: calc(#{$ripple_size} + 2px);
-       border-radius: 0 0 calc(#{$ripple_size} + 2px) 0; // radius equals the size of the box to give us the 
curve
+       width: $ripple_size + 2px;
+       height: $ripple_size + 2px;
+       border-radius: 0 0 $ripple_size + 2px 0; // radius equals the size of the box to give us the curve
 
        // just a simple change to the border radius position
-       &:rtl { border-radius: 0 0 0 calc(#{$ripple_size} + 2px); }
+       &:rtl { border-radius: 0 0 0 $ripple_size + 2px; }
 }
 
 // Pointer location
 .ripple-pointer-location {
        width: $ripple_size;
        height: $ripple_size;
-       border-radius: calc(#{$ripple_size} * 0.5); // radius equals the size of the box to give us the curve
+       border-radius: $ripple_size * 0.5; // radius equals the size of the box to give us the curve
        background-color: lighten(transparentize($selected_bg_color, 0.7), 30%);
        box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
 }
diff --git a/data/theme/gnome-shell-sass/widgets/_popovers.scss 
b/data/theme/gnome-shell-sass/widgets/_popovers.scss
index 69c6be88c4..bfeb70fa3e 100644
--- a/data/theme/gnome-shell-sass/widgets/_popovers.scss
+++ b/data/theme/gnome-shell-sass/widgets/_popovers.scss
@@ -20,7 +20,7 @@ $popover_arrow_height: 12px;
        color: $fg_color;
 
        .popup-menu-content {
-               padding: calc(#{$base_padding} * 2 + #{$base_margin}) 0;
+               padding: $base_padding * 2 + $base_margin 0;
        }
 
        // menu items