sass: Rename mixin arguments from $background/$bg to $on

src/_colors.scss

@@ -51,13 +51,13 @@ $on-dark: #fff;

                                
                                
                                
                            
                                
                                    
                                        
                                            51  
                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            52  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            53  
                                            // Make translucent color opaque by blending with the background color.
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        54 -
                                        @function opacify($color, $bg) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        55 -
                                          @return mix(change-color($color, $alpha: 1), $bg, alpha($color) * 100%);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        54 +
                                        @function opacify($color, $on) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        55 +
                                          @return mix(change-color($color, $alpha: 1), $on, alpha($color) * 100%);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            56  
                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            57  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            58  
                                            // Set the accessible opacity for the overlay depending on the given color.
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        59 -
                                        @function overlay($state, $color, $background: transparent, $opacity-modifier: 0) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        60 -
                                          @if saturation($color) > 50% or saturation($background) > 50% {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        59 +
                                        @function overlay($state, $color, $on: transparent, $opacity-modifier: 0) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        60 +
                                          @if saturation($color) > 50% or saturation($on) > 50% {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            61  
                                                $opacity-modifier: .04;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            62  
                                              }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            63  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -79,7 +79,7 @@ $on-dark: #fff;

                                
                                
                                
                            
                                
                                    
                                        
                                            79  
                                                @error "Invalid type: '#{$state}'";
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            80  
                                              }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            81  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        82 -
                                          @return mix(rgba($color, 1), $background, $opacity * 100%);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        82 +
                                          @return mix(rgba($color, 1), $on, $opacity * 100%);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            83  
                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            84  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            85  
                                            // Private variables for dark background colors
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

src/_colors.scss.template

@@ -51,13 +51,13 @@ $on-dark: #fff;

                                
                                
                                
                            
                                
                                    
                                        
                                            51  
                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            52  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            53  
                                            // Make translucent color opaque by blending with the background color.
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        54 -
                                        @function opacify($color, $bg) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        55 -
                                          @return mix(change-color($color, $alpha: 1), $bg, alpha($color) * 100%);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        54 +
                                        @function opacify($color, $on) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        55 +
                                          @return mix(change-color($color, $alpha: 1), $on, alpha($color) * 100%);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            56  
                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            57  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            58  
                                            // Set the accessible opacity for the overlay depending on the given color.
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        59 -
                                        @function overlay($state, $color, $background: transparent, $opacity-modifier: 0) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        60 -
                                          @if saturation($color) > 50% or saturation($background) > 50% {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        59 +
                                        @function overlay($state, $color, $on: transparent, $opacity-modifier: 0) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        60 +
                                          @if saturation($color) > 50% or saturation($on) > 50% {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            61  
                                                $opacity-modifier: .04;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            62  
                                              }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            63  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -79,7 +79,7 @@ $on-dark: #fff;

                                
                                
                                
                            
                                
                                    
                                        
                                            79  
                                                @error "Invalid type: '#{$state}'";
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            80  
                                              }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            81  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        82 -
                                          @return mix(rgba($color, 1), $background, $opacity * 100%);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        82 +
                                          @return mix(rgba($color, 1), $on, $opacity * 100%);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            83  
                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            84  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            85  
                                            // Private variables for dark background colors
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

src/gnome-shell/sass/components/menu/_menu.scss

@@ -79,11 +79,11 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            79  
                                                font-weight: normal;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            80  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            81  
                                                &.selected {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        82 -
                                              background-color: overlay("hover", $primary, $background: $overlay-selected);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        82 +
                                              background-color: overlay("hover", $primary, $on: $overlay-selected);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            83  
                                                }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            84  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            85  
                                                &:active {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        86 -
                                              background-color: overlay("pressed", $primary, $background: $overlay-selected);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        86 +
                                              background-color: overlay("pressed", $primary, $on: $overlay-selected);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            87  
                                                }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            88  
                                              }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            89  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

src/gtk/sass/_common-3.20.scss

@@ -559,13 +559,13 @@ button {

                                
                                
                                
                            
                                
                                    
                                        
                                            559  
                                              }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            560  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            561  
                                              &:checked {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        562 -
                                            background-color: overlay("activated", $primary, $background: $surface);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        562 +
                                            background-color: overlay("activated", $primary, $on: $surface);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            563  
                                                color: $primary;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            564  
                                                @include ink-color($primary, $elevation: true);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            565  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            566  
                                                &:disabled {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            567  
                                                  box-shadow: none;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        568 -
                                              background-color: overlay("activated", $on-surface, $background: fill($on-surface));
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        568 +
                                              background-color: overlay("activated", $on-surface, $on: fill($on-surface));
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            569  
                                                  color: disabled($on-surface);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            570  
                                                }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            571  
                                              }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -715,7 +715,7 @@ button {

                                
                                
                                
                            
                                
                                    
                                        
                                            715  
                                                  }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            716  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            717  
                                                  &:checked {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        718 -
                                                background-color: overlay("activated", on($color), $background: $color);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        718 +
                                                background-color: overlay("activated", on($color), $on: $color);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            719  
                                                  }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            720  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            721  
                                                  &.flat {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -3376,7 +3376,7 @@ row {

                                
                                
                                
                            
                                
                                    
                                        
                                            3376  
                                                @include ink-color($primary, $hover-alt: true);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            3377  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            3378  
                                                &.has-open-popup {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        3379 -
                                              background-color: overlay("activated", $primary, $background: $overlay-selected);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        3379 +
                                              background-color: overlay("activated", $primary, $on: $overlay-selected);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            3380  
                                                }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            3381  
                                              }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            3382  
                                            }