sass: Drop $base-alt

src/_colors.scss

@@ -95,7 +95,6 @@ $-dark-surface-switch: mix(white, $-dark-background, 60%);

                                
                                
                                
                            
                                
                                    
                                        
                                            95  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            96  
                                            $background: #f9f9f9;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            97  
                                            $base: #fff; // for views
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        98 -
                                        $base-alt: #fff;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            98  
                                            $surface: #fff;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            99  
                                            $switch-surface: #fff; // Special case for switches
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            100  
                                            $on-surface: on($surface);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -153,7 +152,6 @@ $titlebar-indicator: currentcolor;

                                
                                
                                
                            
                                
                                    
                                        
                                            152  
                                            @if $variant == "dark" {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            153  
                                              $background: $-dark-background;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            154  
                                              $base: $-dark-surface-1dp;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        156 -
                                          $base-alt: $-dark-surface-1dp;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            155  
                                              $surface: $-dark-surface-8dp;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            156  
                                              $switch-surface: $-dark-surface-switch;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            157  
                                              $on-surface: on($surface);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

src/_colors.scss.template

@@ -95,7 +95,6 @@ $-dark-surface-switch: mix(white, $-dark-background, 60%);

                                
                                
                                
                            
                                
                                    
                                        
                                            95  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            96  
                                            $background: %BG%;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            97  
                                            $base: %MATERIA_VIEW%; // for views
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        98 -
                                        $base-alt: %INACTIVE_MATERIA_VIEW%;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            98  
                                            $surface: %MATERIA_SURFACE%;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            99  
                                            $switch-surface: %MATERIA_SURFACE%; // Special case for switches
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            100  
                                            $on-surface: %FG%;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -153,7 +152,6 @@ $titlebar-indicator: currentcolor;

                                
                                
                                
                            
                                
                                    
                                        
                                            152  
                                            @if $variant == "dark" {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            153  
                                              $background: if(tone(%BG%) == "dark", %BG%, $-dark-background);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            154  
                                              $base: if(tone(%BG%) == "dark", %MATERIA_VIEW%, $-dark-surface-1dp);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        156 -
                                          $base-alt: if(tone(%BG%) == "dark", %INACTIVE_MATERIA_VIEW%, $-dark-surface-1dp);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            155  
                                              $surface: if(tone(%BG%) == "dark", %MATERIA_SURFACE%, $-dark-surface-8dp);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            156  
                                              $switch-surface: if(tone(%BG%) == "dark", %MATERIA_SURFACE%, $-dark-surface-switch);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            157  
                                              $on-surface: if(tone(%BG%) == "dark", %FG%, on($surface));
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

src/gtk/sass/_colors-public.scss

@@ -39,7 +39,7 @@ text foreground color of insensitive widgets */

                                
                                
                                
                            
                                
                                    
                                        
                                            39  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            40  
                                            /*
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            41  
                                            insensitive text widgets and the like base background color */
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        42 -
                                        @define-color insensitive_base_color #{"" + $base-alt};
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        42 +
                                        @define-color insensitive_base_color #{"" + $base};
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            43  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            44  
                                            /*
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            45  
                                            widget text/foreground color on backdrop windows */
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

src/gtk/sass/_drawing-3.20.scss

@@ -92,7 +92,7 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            92  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            93  
                                              @if $t == raised-disabled {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            94  
                                                box-shadow: $shadow-z1;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        95 -
                                            background-color: $base-alt;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        95 +
                                            background-color: $base;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            96  
                                                color: disabled($on-surface);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            97  
                                              }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            98  
                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

src/gtk/sass/apps/_misc.scss

@@ -227,7 +227,7 @@ tooltip.background.chromium {

                                
                                
                                
                            
                                
                                    
                                        
                                            227  
                                                  }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            228  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            229  
                                                  &:disabled {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        230 -
                                                background-color: $base-alt;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        230 +
                                                background-color: $base;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            231  
                                                  }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            232  
                                                }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            233