[gnome-themes-standard/wip/sass] Removed rounded corners on header-bar on tiled windows. Avoided using a var for window shadows.



commit 776f5b05b86fb30cdba22c2270e359a174675ad5
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Fri May 23 15:17:21 2014 +0200

    Removed rounded corners on header-bar on tiled windows.
    Avoided using a var for window shadows.

 themes/Adwaita/gtk-3.0/_common.scss            |   19 ++++++++++++-------
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css  |    8 ++++----
 themes/Adwaita/gtk-3.0/gtk-contained-dark.scss |    1 -
 themes/Adwaita/gtk-3.0/gtk-contained.css       |    8 ++++----
 themes/Adwaita/gtk-3.0/gtk-contained.scss      |    1 -
 5 files changed, 20 insertions(+), 17 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index 06f31ea..541aea4 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -488,8 +488,8 @@ GtkComboBox {
   }
 }
 
-.window-frame.tiled .header-bar {
-  border-radius: 0; // FIXME doesn't work
+.tiled .header-bar {
+  border-radius: 0;
 }
 
 /***************
@@ -655,23 +655,28 @@ GtkScrolledWindow.frame {
 .window-frame {
   border-radius: 7px 7px 0 0;
   /* lamefun trick to get rounded borders regardless of CSD use */
-  border-width: 0px;    
+  border-width: 0px;
+  // the second box shadow is the window border
+  // it needs to be transparent, see bug #722563   
   @if $variant == 'dark' { 
-    box-shadow: 0 2px 10px 4px transparentize($wm_shadow, 0.4), 0 0 0 1px transparentize($wm_shadow,.2);
+    box-shadow: 0 2px 10px 4px transparentize(black, 0.9),
+                inset 0 0 0 1px transparentize(black, 0.4);
   }
   @else {
-    box-shadow: 0 2px 10px 4px transparentize($wm_shadow, 0.4), 0 0 0 1px transparentize($wm_shadow,.5);
+    box-shadow: 0 2px 10px 4px transparentize(black, 0.9),
+                0 0 0 1px transparentize(black, 0.8);
   }
 
   /* this is used for the resize cursor area */
   margin: 10px;
 
   &:backdrop {
-    box-shadow: 0 3px 6px 2px transparentize($wm_shadow, 0.4), 0 0 0 1px transparentize($wm_shadow,.5);
+    box-shadow: 0 3px 6px 2px transparentize(black, 0.9),
+                0 0 0 1px transparentize(black,0.7);
   }
   &.tiled {
     border-radius: 0;
-    background-color: $theme_bg_color;
+    background-color: red;;
   }
 }
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 47b029c..26e85d5 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -511,7 +511,7 @@ GtkComboBox {
     text-shadow: 0 1px rgba(0, 0, 0, 0.6);
     background-image: linear-gradient(to bottom, #3583d5, #2b7bcf); }
 
-.window-frame.tiled .header-bar {
+.tiled .header-bar {
   border-radius: 0; }
 
 /***************
@@ -661,14 +661,14 @@ GtkScrolledWindow.frame {
   border-radius: 7px 7px 0 0;
   /* lamefun trick to get rounded borders regardless of CSD use */
   border-width: 0px;
-  box-shadow: 0 2px 10px 4px rgba(0, 0, 0, 0.45), 0 0 0 1px rgba(0, 0, 0, 0.65);
+  box-shadow: 0 2px 10px 4px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(0, 0, 0, 0.6);
   /* this is used for the resize cursor area */
   margin: 10px; }
   .window-frame:backdrop {
-    box-shadow: 0 3px 6px 2px rgba(0, 0, 0, 0.45), 0 0 0 1px rgba(0, 0, 0, 0.35); }
+    box-shadow: 0 3px 6px 2px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.3); }
   .window-frame.tiled {
     border-radius: 0;
-    background-color: #393f3f; }
+    background-color: red; }
 
 .button.titlebutton {
   padding: 8px;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.scss b/themes/Adwaita/gtk-3.0/gtk-contained-dark.scss
index 56b54fa..faad2f6 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.scss
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.scss
@@ -12,7 +12,6 @@ $borders_color: darken($theme_bg_color,12%);
 $borders_edge: transparentize($theme_fg_color,.9);
 
 $theme_shade: rgba(0,0,0,.6); //shadow seems to be a reserved word
-$wm_shadow: transparentize(black, 0.15);
 
 $link_color: lighten($selected_bg_color,10%);
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 0f21a69..c00cceb 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -511,7 +511,7 @@ GtkComboBox {
     text-shadow: 0 1px rgba(0, 0, 0, 0.5);
     background-image: linear-gradient(to bottom, #85acd5, #7aa4d2); }
 
-.window-frame.tiled .header-bar {
+.tiled .header-bar {
   border-radius: 0; }
 
 /***************
@@ -661,14 +661,14 @@ GtkScrolledWindow.frame {
   border-radius: 7px 7px 0 0;
   /* lamefun trick to get rounded borders regardless of CSD use */
   border-width: 0px;
-  box-shadow: 0 2px 10px 4px rgba(0, 0, 0, 0.35), 0 0 0 1px rgba(0, 0, 0, 0.25);
+  box-shadow: 0 2px 10px 4px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.2);
   /* this is used for the resize cursor area */
   margin: 10px; }
   .window-frame:backdrop {
-    box-shadow: 0 3px 6px 2px rgba(0, 0, 0, 0.35), 0 0 0 1px rgba(0, 0, 0, 0.25); }
+    box-shadow: 0 3px 6px 2px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.3); }
   .window-frame.tiled {
     border-radius: 0;
-    background-color: #ededed; }
+    background-color: red; }
 
 .button.titlebutton {
   padding: 8px;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.scss b/themes/Adwaita/gtk-3.0/gtk-contained.scss
index 855cf3c..7c63a5c 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.scss
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.scss
@@ -18,7 +18,6 @@ $borders_color: darken($theme_bg_color,30%);
 $borders_edge: transparentize($theme_base_color,0.95);
 
 $theme_shade: rgba(0,0,0,.5); //shadow seems to be a reserved word
-$wm_shadow: transparentize(black, 0.25);
 
 $link_color: lighten($selected_bg_color,10%);
 


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