[gtk+] Adwaita: scss cosmetic fixes



commit e355eff2bcdcf6d04e74642df9bcf0121a235e52
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Mon Dec 1 10:14:47 2014 +0100

    Adwaita: scss cosmetic fixes

 gtk/theme/Adwaita/_common.scss |   79 ++++++++++++++++++++++------------------
 1 files changed, 43 insertions(+), 36 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index d2dc82a..8da007a 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -311,10 +311,10 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
   }
 
   &.image { // entry icons colors
-    color: mix($fg_color,$base_color,80%);
+    color: mix($fg_color, $base_color, 80%);
     &:hover { color: $fg_color; }
     &:active { color: $selected_bg_color; }
-    &:backdrop { color: mix($backdrop_fg_color,$backdrop_base_color,80%); }
+    &:backdrop { color: mix($backdrop_fg_color, $backdrop_base_color, 80%); }
   }
 
   .linked.vertical & { //FIXME comment stuff and make the whole thing smarter.
@@ -822,7 +822,7 @@ $_dot_color: if($variant=='light', $selected_bg_color,
 .menuitem.button.flat {
   @extend %undecorated_button;
   outline-offset: -1px;
-  &:hover { background-color: mix($fg_color,$bg_color,10%); }
+  &:hover { background-color: mix($fg_color, $bg_color, 10%); }
   &:selected { @extend %selected_items; }
   &:backdrop, &:backdrop:hover {
     @extend %undecorated_button;
@@ -889,8 +889,8 @@ GtkColorButton.button {
   .button {
     background-image: none;
     border-style: none none none solid;
-    border-color: transparentize($borders_color,0.7);
-    color: mix($fg_color, $base_color,90%);
+    border-color: transparentize($borders_color, 0.7);
+    color: mix($fg_color, $base_color, 90%);
     border-radius: 0;
     box-shadow: none;
   //  padding-left: 6px;
@@ -898,18 +898,18 @@ GtkColorButton.button {
     &:dir(rtl) { border-style: none solid none none; }
     &:hover {
       color: $fg_color;
-      background-color: transparentize($fg_color,0.95);
+      background-color: transparentize($fg_color, 0.95);
     }
     &:insensitive {
-      color: transparentize($insensitive_fg_color,0.7);
+      color: transparentize($insensitive_fg_color, 0.7);
     }
     &:active {
-      box-shadow: inset 0 2px 3px -1px transparentize(black,0.8);
-      background-color: transparentize(black,0.9);
+      box-shadow: inset 0 2px 3px -1px transparentize(black, 0.8);
+      background-color: transparentize(black, 0.9);
     }
     &:backdrop {
       color: mix($backdrop_fg_color, $backdrop_base_color, 90%);
-      border-color: transparentize($backdrop_borders_color,0.7);
+      border-color: transparentize($backdrop_borders_color, 0.7);
       background-color: transparent;
     }
     &:backdrop:insensitive {
@@ -1208,7 +1208,7 @@ GtkComboBox {
 
     &:backdrop {
       background-image: linear-gradient(to bottom, $selected_bg_color);
-      box-shadow: inset 0 1px mix($top_hilight,$selected_bg_color, 60%);
+      box-shadow: inset 0 1px mix($top_hilight, $selected_bg_color, 60%);
     }
 
     .subtitle:link { @extend *:link:selected;  }
@@ -1385,11 +1385,12 @@ GtkTreeView.view {
       &:hover { color: $selected_fg_color; }
       &:backdrop { color: mix($backdrop_selected_fg_color, $selected_bg_color, 70%); }
     }
-    &:checked {
-      -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
-    }
+
+    &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); }
+
     &:backdrop { color: mix($backdrop_fg_color, $backdrop_base_color, 70%); }
   }
+
   &.progressbar { // progress bar in treeviews
     @if $variant == light { color: $base_color; }
     border-radius: 4px;
@@ -1401,21 +1402,26 @@ GtkTreeView.view {
                                                   transparentize(white,0.85)),
                       0 1px if($variant=='light', transparentize(black, 0.8),
                                                   transparentize(black,0.9));
+
     &:selected {
       @if $variant == 'light' {
          color: $selected_bg_color;
          box-shadow: none;
       }
+
       @else { box-shadow: inset 0 1px transparentize(white, 0.95); }
+
       background-image: linear-gradient(to bottom,
                                         $base_color,
                                         darken($base_color,10%));
+
       &:backdrop {
         @if $variant == 'light' { color: $selected_bg_color; }
         @else { border-color: $backdrop_base_color; }
         background-color: $backdrop_base_color;
       }
     }
+
     &:backdrop {
       @if $variant == 'light' { color: $backdrop_base_color; }
       @else { border-color: $backdrop_base_color; }
@@ -1423,9 +1429,11 @@ GtkTreeView.view {
       box-shadow: none;
     }
   }
+
   &.trough { // progress bar trough in treeviews
     background-color: transparentize($fg_color,0.9);
     border-radius: 4px;
+
     &:selected {
       background-color: if($variant == 'light',
                            transparentize($selected_fg_color, 0.7),
@@ -1442,7 +1450,7 @@ GtkTreeView.view {
 column-header {
   .button {
     @extend %column_header_button;
-    $_column_header_color: mix($fg_color,$base_color,50%);
+    $_column_header_color: mix($fg_color, $base_color, 50%);
     color: $_column_header_color;
     background-color: $base_color;
     font-weight: bold;
@@ -1450,7 +1458,7 @@ column-header {
     box-shadow: none;
     &:hover {
       @extend %column_header_button;
-      color: mix($_column_header_color,$fg_color,50%);
+      color: mix($_column_header_color, $fg_color, 50%);
       box-shadow: none;
       transition: none; //I shouldn't need this
     }
@@ -1496,7 +1504,7 @@ column-header.button.dnd { // for treeview-like derive widgets
   &:backdrop {
     border-color: $backdrop_bg_color;
     border-style: none solid solid none;
-    color: mix($backdrop_fg_color, $backdrop_bg_color,50%);
+    color: mix($backdrop_fg_color, $backdrop_bg_color, 50%);
     background-image: none;
     background-color: $backdrop_base_color;
     &:insensitive {
@@ -2025,16 +2033,15 @@ GtkSwitch {
     border: 1px solid $borders_color;
     border-radius: 3px;
     color: $fg_color;
-    background-image: linear-gradient(to bottom,
-                                      mix($bg_color,$borders_color,60%));
+    background-image: linear-gradient(to bottom, mix($bg_color, $borders_color, 60%));
     text-shadow: 0 1px transparentize(black, 0.9);
     &:active {
       @include progressbar_fill;
       color: white;
       border-color: $selected_borders_color;
       box-shadow: _widget_edge();
-      text-shadow: 0 1px transparentize($selected_borders_color,0.5),
-                   0 0 2px transparentize(white,0.4);
+      text-shadow: 0 1px transparentize($selected_borders_color, 0.5),
+                   0 0 2px transparentize(white, 0.4);
     }
     &:insensitive {
       color: $insensitive_fg_color;
@@ -2070,15 +2077,15 @@ GtkSwitch {
     border-radius: 3px;
     @include button(normal);
     box-shadow: inset 0 1px if($variant=='light', white,
-                               transparentize(white,0.85)),
-                inset 0 -2px transparentize($bg_color,0.4),
-                inset 0 -1px mix($bg_color,$borders_color,50%);
+                               transparentize(white, 0.85)),
+                inset 0 -2px transparentize($bg_color, 0.4),
+                inset 0 -1px mix($bg_color, $borders_color, 50%);
     &:hover {
       @include button(hover);
       box-shadow: inset 0 1px if($variant=='light', white,
-                                 transparentize(white,0.85)),
-                  inset 0 -2px transparentize($bg_color,0.4),
-                  inset 0 -1px mix($bg_color,$borders_color,50%);
+                                 transparentize(white, 0.85)),
+                  inset 0 -2px transparentize($bg_color, 0.4),
+                  inset 0 -1px mix($bg_color, $borders_color, 50%);
     }
     &:active { border: 1px solid $selected_borders_color; }
     &:insensitive { @include button(insensitive, $edge:none); }
@@ -2241,16 +2248,16 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     box-shadow: inset 0 1px if($variant=='light', white,
                                transparentize(white,0.85)),
                 inset 0 #{-2px} $bg_color,
-                inset 0 #{-1px} mix($bg_color,$borders_color,50%);
+                inset 0 #{-1px} mix($bg_color, $borders_color, 50%);
     &:hover {
       @include button(hover);
       border-color: darken($borders_color,3%);
       border-radius: 50%; // needed for double marks scales
       box-shadow: inset 0 1px if($variant=='light', white,
-                                 transparentize(white,0.85)),
+                                 transparentize(white, 0.85)),
                   inset 0 #{-2px} if($variant=='light', white,
-                                     transparentize(white,0.86)),
-                  inset 0 #{-1px} mix($bg_color,$borders_color,70%);
+                                     transparentize(white, 0.86)),
+                  inset 0 #{-1px} mix($bg_color, $borders_color, 70%);
     }
     &:insensitive {
       border-style: solid; // needed for double marks scales or they'll get
@@ -2285,7 +2292,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     margin: 10px;
     border: 1px solid $borders_color;
     border-radius: 3px;
-    background-color: mix($bg_color,$borders_color,60%);
+    background-color: mix($bg_color, $borders_color, 60%);
     box-shadow: inset 1px 1px transparentize(black, 0.9),
                 _widget_edge();
     &.highlight {
@@ -2308,7 +2315,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     }
     &:backdrop {
       border-color: $backdrop_borders_color;
-      background-color: mix($backdrop_bg_color,$borders_color);
+      background-color: mix($backdrop_bg_color, $borders_color, 50%);
       box-shadow: none;
     }
     &:backdrop:insensitive, .highlight:backdrop:insensitive {
@@ -2413,7 +2420,7 @@ GtkProgressBar {
   &.trough {  // background
     border: 1px solid $borders_color;
     border-radius: 3px;
-    background-color: mix($borders_color,$bg_color, 35%);
+    background-color: mix($borders_color, $bg_color, 35%);
     &:backdrop{
       border-color: $backdrop_borders_color;
       background-color: $backdrop_dark_fill;
@@ -2600,10 +2607,10 @@ GtkScrolledWindow {
     background-color: mix($fg_color, $base_color, 5%);
   }
   &:active {
-    box-shadow: inset 0 2px 2px -2px transparentize(black,0.8);
+    box-shadow: inset 0 2px 2px -2px transparentize(black, 0.8);
   }
   &:selected {
-    &:active { box-shadow: inset 0 2px 3px -1px transparentize(black,0.5); }
+    &:active { box-shadow: inset 0 2px 3px -1px transparentize(black, 0.5); }
     &:hover {
       background-color: mix($fg_color, $selected_bg_color, 10%);
     }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]