Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=artwork.git;a=commitdiff;h=7474ba388ffa9da209e4013e55c822a3a5df16ea

commit 7474ba388ffa9da209e4013e55c822a3a5df16ea
Author: Devil505 <devil505li...@gmail.com>
Date:   Wed Sep 28 06:57:20 2011 +0200

* updating GTK2&3 themes

diff --git a/gnome-frugalware/theme/Frugalware/gtk-2.0/apps/gmusicbrowser.rc 
b/gnome-frugalware/theme/Frugalware/gtk-2.0/apps/gmusicbrowser.rc
index d0c2a68..98c0753 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-2.0/apps/gmusicbrowser.rc
+++ b/gnome-frugalware/theme/Frugalware/gtk-2.0/apps/gmusicbrowser.rc
@@ -3,4 +3,5 @@ style "gmusicbrowser-handle"
GtkPaned::handle-size   = 1
}

-widget "Shimmer Desktop.VBMain.HPMain" style "gmusicbrowser-handle"
\ No newline at end of file
+widget "Shimmer Desktop.VBMain.HPMain" style "gmusicbrowser-handle"
+widget_class "Shimmer Desktop.VBMain.VBTop.HBTop.*" style "murrine-toolbar"
\ No newline at end of file
diff --git a/gnome-frugalware/theme/Frugalware/gtk-2.0/gtkrc 
b/gnome-frugalware/theme/Frugalware/gtk-2.0/gtkrc
index 0c53ba3..c6d0169 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-2.0/gtkrc
+++ b/gnome-frugalware/theme/Frugalware/gtk-2.0/gtkrc
@@ -60,8 +60,8 @@ style "murrine-default"
GtkScale                ::trough-side-details                   = 1

GtkScrollbar            ::min-slider-length                     = 50
-       GtkScrollbar            ::slider-width                          = 7
-       GtkScrollbar            ::trough-border                         = 4
+       GtkScrollbar            ::slider-width                          = 9
+       GtkScrollbar            ::trough-border                         = 3
#GtkScrollbar           ::trough-under-steppers                 = 0
GtkScrollbar            ::has-backward-stepper                  = 1
#GtkScrollbar           ::arrow-scaling                         = 0.8
@@ -418,76 +418,24 @@ style "murrine-progressbar"

style "murrine-scrollbar" {

-       GtkScrollbar::stepper-size      = 5
+       GtkScrollbar::stepper-size      = 0
GtkScrollbar::arrow-scaling     = 0.0

bg[NORMAL]      = shade (1.3, @base_color)
bg[SELECTED]    = shade (0.90, @bg_color)
bg[ACTIVE]      = shade (1.75, @base_color)
-       bg[PRELIGHT]    = shade (0.75, @bg_color)
+       bg[PRELIGHT]    = shade (0.55, @bg_color)
bg[INSENSITIVE] = shade (0.75, @bg_color)

engine "murrine" {
-               arrowstyle      = 0
+               #arrowstyle     = 0
colorize_scrollbar = TRUE
-               roundness       = 6
-               border_shades   = {0.60, 0.60}
-               trough_shades   = {1.1, 1.3}
-               contrast        = 0.0
-               gradient_shades = {1.1,1.1,0.95,0.95}
-               prelight_shade  = 0.75
-       }
-}
-
-style "murrine-scrollbar-mockup" {
-
-#      GtkScrollbar::trough-side-details       = 1
-       GtkScrollbar::trough-border = 4
-
-       bg[NORMAL]      = shade (0.9, @bg_color)
-       bg[SELECTED]    = shade (0.6, @base_color)
-       bg[ACTIVE]      = shade (0.8, @bg_color)
-       bg[PRELIGHT]    = shade (0.7, @bg_color)
-       bg[INSENSITIVE] = shade (0.8, @bg_color)
-
-       engine "murrine" {
-               arrowstyle      = 1
-               roundness       = 6
+               roundness       = 10
border_shades   = {0.80, 0.80}
trough_shades   = {1.1, 1.3}
contrast        = 0.0
-               glowstyle       = 4
-               gradient_shades = {1.05,0.85,0.85,1.05}
-       }
-}
-
-style "murrine-scrollbar-old"
-{
-       bg[ACTIVE]      = @base_color
-       bg[PRELIGHT]    = @panel_bg
-       bg[NORMAL]      = shade (1.4, @panel_bg)
-       bg[SELECTED]    = @base_color
-       bg[INSENSITIVE] = @base_color
-
-       engine "murrine" {
-               arrowstyle              = 1
-               roundness               = 6
-               gradient_shades         = {1.0,1.0,1.0,1.0}
-               #highlight_shade                = 1.0
-               #glow_shade             = 1.0
-               #reliefstyle            = 0
-               #gradient_colors                = FALSE
-               #lightborder_shade       = 1.0
-               #lightborderstyle       = 0
-               #trough_shades          = { 0.97, 0.97}
-               #trough_border_shades   = { 2.0, 2.0 }
-               #border_shades          = { 0.85, 0.85}         # slider border 
outline
-               #shadow_shades          = { 0.5, 0.8 }
-               #trough_shades          = { 1.135, 1.135}
-               trough_shades           = { 1.5, 1.5 }
-               border_shades           = { 2.0, 2.0 }          # slider border 
outline
-               contrast                = 0.0                   # no 
trough-border
-               prelight_shade          = 0.65
+               gradient_shades = {1.2,1.2,1.15,1.15}
+               #prelight_shade = 0.9
}
}

diff --git a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-bars.css 
b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-bars.css
index 8282457..91783fe 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-bars.css
+++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-bars.css
@@ -9,13 +9,13 @@
.progressbar row:selected:focused {
background-image: -gtk-gradient (linear,
left top, left bottom,
-               from (@progressbar_background_a),
-               to (@progressbar_background_b));
-
-       border-radius: 0;
+               from (@progressbar_background_b),
+               to (@progressbar_background_a));
+       -unico-background-texture: url("progressbar.png");
+       border-radius: 4;
border-style: solid;
border-width: 1;
-       border-color: @progressbar_border;
+       border-color: shade(@progressbar_border,0.9);
-unico-inner-stroke-style: custom;
-unico-inner-stroke-gradient: -gtk-gradient (linear,
left top, left bottom,
@@ -30,13 +30,13 @@
.progressbar.vertical row:selected:focused {
background-image: -gtk-gradient (linear,
left top, right top,
-               from (@progressbar_background_a),
-               to (@progressbar_background_b));
+               from (@progressbar_background_b),
+               to (@progressbar_background_a));

-       border-radius: 0;
+       border-radius: 4;
border-style: solid;
border-width: 1;
-       border-color: @progressbar_border;
+       border-color: shade(@progressbar_border,0.9);
-unico-inner-stroke-style: custom;
-unico-inner-stroke-gradient: -gtk-gradient (linear,
left top, right top,
@@ -55,13 +55,13 @@ GtkProgressBar.trough,
.trough row:hover {
background-image: -gtk-gradient (linear,
left top, left bottom,
-               from (@progressbar_through_a),
-               to (@progressbar_through_b));
+               from (shade(@bg_color,1.02)),
+               to (shade(@bg_color,1.20)));

border-width: 1;
border-style: solid;
-       border-radius: 0;
-       border-color: shade (@progressbar_through_border, 1.0);
+       border-radius: 4;
+       border-color: shade (@progressbar_through_border, 0.9);
}

GtkProgressBar.trough.vertical,
@@ -69,13 +69,13 @@ GtkProgressBar.trough.vertical,
.trough.vertical row:hover {
background-image: -gtk-gradient (linear,
left top, right top,
-               from (@progressbar_through_a),
-               to (@progressbar_through_b));
+               from (shade(@bg_color,1.05)),
+               to (shade(@bg_color,1.20)));

border-width: 1;
border-style: solid;
-       border-radius: 0;
-       border-color: shade (@progressbar_through_border, 1.0);
+       border-radius: 4;
+       border-color: shade (@progressbar_through_border, 0.9);
}

.trough row:selected,
@@ -100,9 +100,9 @@ GtkProgressBar.trough.vertical,
.scrollbar {
background-image: none;
border-style: solid;
-       -GtkRange-trough-border: 4;
-       -GtkRange-arrow-scaling: 0.444;
-       -GtkRange-slider-width: 7;
+       -GtkRange-trough-border: 3;
+       -GtkRange-arrow-scaling: 0.0;
+       -GtkRange-slider-width: 9;
-GtkRange-stepper-size: 0;
-GtkScrollbar-min-slider-length: 50;
-GtkRange-stepper-spacing: 0;
@@ -114,14 +114,10 @@ GtkProgressBar.trough.vertical,
.scrollbar.trough.vertical {
background-image: -gtk-gradient (linear,
left top, right top,
-               from (shade (@trough_bg_color_b, 1.0)),
+               from (shade (@trough_bg_color_b, 1.05)),
to (shade (@trough_bg_color_a,1.3)));
background-color: shade (@theme_bg_color, 0.882);
border-radius: 0;
-       -adwaita-border-gradient: -gtk-gradient (linear,
-               left top, right top,
-               from (alpha (@scrollslider_gradient_a, 1.00)),
-               to (alpha (@scrollslider_gradient_a, 0.00)));
border-width: 0;
border-style: none;
}
@@ -129,14 +125,10 @@ GtkProgressBar.trough.vertical,
.scrollbar.trough.horizontal {
background-image: -gtk-gradient (linear,
left top, left bottom,
-               from (shade (@trough_bg_color_b, 1.0)),
+               from (shade (@trough_bg_color_b, 1.05)),
to (shade (@trough_bg_color_a,1.3)));
background-color: shade (@theme_bg_color, 0.882);
border-radius: 0;
-       -adwaita-border-gradient: -gtk-gradient (linear,
-               left top, left bottom,
-               from (alpha (@scrollslider_gradient_a, 1.00)),
-               to (alpha (@scrollslider_gradient_a, 0.00)));
border-width: 0;
border-style: none;
}
@@ -147,9 +139,9 @@ GtkProgressBar.trough.vertical,
background-image: -gtk-gradient (linear,
left top, right top,
from (@scrollslider_gradient_a),
-               to (@scrollslider_gradient_b));
+               to (shade(@scrollslider_gradient_a,0.95)));
background-color: @theme_base_color;
-       border-color: @scrollslider_border;
+       border-color: shade(@scrollslider_border,1.1);
border-radius: 10;
border-width: 1;
}
@@ -157,19 +149,19 @@ GtkProgressBar.trough.vertical,
.scrollbar.slider.vertical:prelight {
background-image: -gtk-gradient (linear,
left top, right top,
-               from (shade (@scrollslider_gradient_a, 0.75)),
-               to (shade (@scrollslider_gradient_b, 0.75)));
+               from (shade (@scrollslider_gradient_a, 0.94)),
+               to (shade (@scrollslider_gradient_a, 0.9)));
background-color: @theme_base_color;
-       border-color: shade (@scrollslider_border, 0.75);
+       border-color: shade (@scrollslider_border, 1.05);
}

.scrollbar.slider.vertical:prelight:active {
background-image: -gtk-gradient (linear,
left top, right top,
-               from (shade (@scrollslider_gradient_a, 0.75)),
-               to (shade (@scrollslider_gradient_b, 0.75)));
+               from (shade (@scrollslider_gradient_a, 0.94)),
+               to (shade (@scrollslider_gradient_b, 0.9)));
background-color: @theme_base_color;
-       border-color: shade (@scrollslider_border, 0.75);
+       border-color: shade (@scrollslider_border, 1.05);
}

.scrollbar.slider.horizontal,
@@ -177,9 +169,9 @@ GtkProgressBar.trough.vertical,
background-image: -gtk-gradient (linear,
left top, left bottom,
from (@scrollslider_gradient_a),
-               to (@scrollslider_gradient_b));
+               to (shade(@scrollslider_gradient_a,0.95)));
background-color: @theme_base_color;
-       border-color: @scrollslider_border;
+       border-color: shade (@scrollslider_border, 1.05);
border-radius: 10;
border-width: 1;
}
@@ -187,19 +179,19 @@ GtkProgressBar.trough.vertical,
.scrollbar.slider.horizontal:prelight {
background-image: -gtk-gradient (linear,
left top, left bottom,
-               from (shade (@scrollslider_gradient_a, 0.90)),
-               to (shade (@scrollslider_gradient_b, 0.90)));
+               from (shade (@scrollslider_gradient_a, 0.94)),
+               to (shade (@scrollslider_gradient_a, 0.9)));
background-color: @theme_base_color;
-       border-color: shade (@scrollslider_border, 0.90);
+       border-color: @scrollslider_border;
}

.scrollbar.slider.horizontal:prelight:active {
background-image: -gtk-gradient (linear,
left top, left bottom,
-               from (shade (@scrollslider_gradient_a, 0.90)),
-               to (shade (@scrollslider_gradient_b, 0.90)));
+               from (shade (@scrollslider_gradient_a, 0.94)),
+               to (shade (@scrollslider_gradient_b, 0.9)));
background-color: @theme_base_color;
-       border-color: shade (@scrollslider_border, 0.90);
+       border-color: shade (@scrollslider_border, 1.05);
}

.scrollbar.slider:insensitive {
@@ -210,6 +202,76 @@ GtkProgressBar.trough.vertical,
background-color: shade (@theme_bg_color, 0.882);
}

+/* GtkScrolledWindow */
+GtkScrolledWindow.frame {
+    border-top-color: shade (@bg_color, 0.84);
+    border-right-color: shade (@bg_color, 0.76);
+    border-bottom-color: shade (@bg_color, 0.86);
+    border-left-color: shade (@bg_color, 0.76);
+    border-radius: 0;
+    border-style: solid;
+
+    -unico-border-gradient: none;
+    -unico-inner-stroke-width: 0;
+    -unico-outer-stroke-width: 0;
+}
+
+/**************
+ * Separators *
+ **************/
+.separator {
+    border-color: shade (@bg_color, 0.8);
+    border-style: solid;
+
+    -unico-border-gradient: none;
+    -unico-inner-stroke-color: alpha (shade (@bg_color, 1.26), 0.6);
+    -unico-inner-stroke-gradient: none;
+}
+
+.button .separator,
+.button.separator {
+    border-color: shade (@button_bg_color, 0.84);
+
+    -unico-inner-stroke-color: alpha (shade (@button_bg_color, 1.26), 0.5);
+    -unico-inner-stroke-gradient: none;
+}
+
+.notebook .button .separator,
+.notebook .button.separator {
+    border-color: shade (@bg_color, 0.9);
+
+    -unico-inner-stroke-color: alpha (shade (@bg_color, 1.26), 0.6);
+    -unico-inner-stroke-gradient: none;
+}
+
+.button .separator:insensitive,
+.button.separator:insensitive {
+    border-color: shade (@button_insensitive_bg_color, 0.9);
+
+    -unico-inner-stroke-color: alpha (shade (@button_insensitive_bg_color, 
1.26), 0.6);
+    -unico-inner-stroke-gradient: none;
+}
+
+.notebook .button .separator,
+.notebook .button.separator {
+    border-color: shade (@bg_color, 0.84);
+
+    -unico-inner-stroke-color: alpha (shade (@bg_color, 1.26), 0.4);
+    -unico-inner-stroke-gradient: none;
+}
+
+.menuitem.separator {
+    -GtkMenuItem-horizontal-padding: 0;
+    border-color: shade (@dark_bg_color, 0.96);
+
+    -unico-inner-stroke-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
+}
+
+GtkViewport.frame {
+       border-width: 0;
+       -unico-inner-stroke-width: 0;
+}
+
/************
* Toolbars *
************/
diff --git a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-buttons.css 
b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-buttons.css
index 70f7042..6fe3d0b 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-buttons.css
+++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-buttons.css
@@ -1,19 +1,69 @@
/***********
* Buttons *
***********/
-GtkScale.slider,
+
+/* shadow */
.button,
-.toolbar .button {
-       border-radius: 2.5;
+.combobox-entry,
+.check:active,
+.frame,
+.notebook .button,
+.notebook,
+.radio:active {
+    -unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
+                                                 from (alpha (@bg_color, 
0.00)),
+                                                 to (alpha (shade (@bg_color, 
1.25), 0.5)));
+    -unico-outer-stroke-width: 1;
+}
+
+
+GtkComboBox.combobox-entry .button:insensitive,
+.notebook .button:insensitive,
+.inline-toolbar.toolbar .button:insensitive {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@bg_color, 1.04)),
+                                     to (shade (@bg_color, 0.96)));
+
+    -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
+                                           from (shade (@bg_color, 0.8)),
+                                           to (shade (@bg_color, 0.8)));
+    -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
+                                                 from (shade (@bg_color, 1.1)),
+                                                 to (shade (@bg_color, 1.0)));
+}
+
+GtkScale.slider,
+.button {
+       background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@bg_color, 1.1)),
+                                     to (shade (@bg_color, 0.9)));
+       border-radius: 6;
+       -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
+                                           from (shade (@bg_color, 0.85)),
+                                           to (shade (@bg_color, 0.7)));
+}
+
+GtkScale.slider:hover,
+.button:hover {
+       background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@bg_color, 0.9)),
+                                     to (shade (@bg_color, 0.8)));
+       -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
+                                           from (shade (@bg_color, 0.7)),
+                                           to (shade (@bg_color, 0.6)));
+}
+
+.button {
+       border-radius: 3;
background-image: -gtk-gradient (linear,
left top, left bottom,
from (@button_gradient_color_a),
to (@button_gradient_color_b));
-
+       transition: 200ms ease-in-out;
-unico-border-gradient: -gtk-gradient (linear,
left top, left bottom,
-               from (@theme_border_color_a),
-               to (@theme_border_color_b));
+               from (shade(@theme_border_color_a,1.4)),
+               to (shade(@theme_border_color_b,1.1)));

-unico-inner-stroke-style: custom;
-unico-inner-stroke-color: alpha (shade (@theme_bg_color, 1.26), 0.0);
@@ -38,11 +88,12 @@ GtkScale.slider,
.toolbar.button:hover:active {
background-image: -gtk-gradient (linear,
left top, left bottom,
-               from (shade (@button_active_gradient_color_a, 1.00)),
-               to (shade (@button_active_gradient_color_b, 1.00)));
-
+               from (shade (@button_active_gradient_color_b, 1.00)),
+               to (shade (@button_active_gradient_color_a, 1.00)));
+       -unico-glow-color: shade(@bg_color,0.9);
+       -unico-glow-radius: 0;
-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-               from (shade (@theme_border_color_b, 0.90)),
+               from (shade (@theme_border_color_b, 1.00)),
to (shade (@theme_border_color_a, 0.90)));
-unico-inner-stroke-style: custom;
-unico-inner-stroke-gradient: -gtk-gradient (linear,
@@ -76,7 +127,96 @@ GtkScale.slider,
-unico-inner-stroke-color: alpha (shade (@button_insensitive_bg_color, 0.9), 
0.2);
}

-GtkScale.slider {
+GtkComboBox.combobox-entry .button,
+.button:active,
+.button:insensitive,
+.check,
+.entry,
+.radio {
+       -unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left 
bottom,
+                                                 from (alpha (shade 
(@bg_color, 0.85), 0.2)),
+                                                 to (alpha (shade (@bg_color, 
1.25), 0.6)));
+       -unico-outer-stroke-width: 1;
+}
+
+/******************
+ * combobox entry *
+ ******************/
+.primary-toolbar GtkComboBox.combobox-entry .entry,
+.primary-toolbar GtkComboBox.combobox-entry .entry:active,
+.primary-toolbar GtkComboBox.combobox-entry .entry:focused,
+.primary-toolbar GtkComboBox.combobox-entry .entry:insensitive,
+GtkComboBox.combobox-entry .entry,
+GtkComboBox.combobox-entry .entry:active,
+GtkComboBox.combobox-entry .entry:focused,
+GtkComboBox.combobox-entry .entry:insensitive {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    border-width: 1 0 1 1;
+
+    -unico-outer-stroke-width: 1 0 1 1;
+}
+
+.primary-toolbar GtkComboBox.combobox-entry .button,
+.primary-toolbar GtkComboBox.combobox-entry .button:hover,
+.primary-toolbar GtkComboBox.combobox-entry .button:active,
+.primary-toolbar GtkComboBox.combobox-entry .button:insensitive,
+GtkComboBox.combobox-entry .button,
+GtkComboBox.combobox-entry .button:hover,
+GtkComboBox.combobox-entry .button:active,
+GtkComboBox.combobox-entry .button:insensitive {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    border-width: 1 1 1 1;
+
+    -unico-outer-stroke-width: 1 1 1 0;
+}
+
+GtkComboBox.combobox-entry .button,
+GtkComboBox.combobox-entry .button:hover,
+GtkComboBox.combobox-entry .button:active,
+GtkComboBox.combobox-entry .button:insensitive {
+    border-top-color: shade (@bg_color, 0.64);
+    border-right-color: shade (@bg_color, 0.8);
+    border-bottom-color: shade (@bg_color, 0.86);
+    border-left-color: shade (@bg_color, 0.76);
+}
+
+/* Cell */
+
+.cell {
+       border-radius: 0;
+       border-width: 0;
+}
+
+.cell:selected {
+}
+
+/* Row */
+row:hover {
+       background-color: shade (@selected_bg_color,1.35);
+}
+
+row:insensitive {
+}
+
+row:selected:focused {
+       border-width: 0;
+       border-style: none;
+       background-image: -gtk-gradient (linear,
+               left top, left bottom,
+               from (shade (@menuitem_background_a, 1.00)),
+               to (shade (@menuitem_background_b, 1.00)));
+       background-color: shade(@theme_selected_bg_color,1.1);
+}
+
+row:selected {
+       background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@selected_bg_color, 1.06)),
+                                     to (shade (@selected_bg_color, 0.94)));
+       border-top-color: shade (@selected_bg_color, 0.88);
+       border-style: solid;
+       border-width: 1 0 0 0;
}

/****************
@@ -140,8 +280,8 @@ GtkScale.slider {
from (shade (@theme_selected_bg_color, 1.1)),
to (shade (@theme_selected_bg_color, 0.9)));

-       -unico-bullet-color: shade (@theme_selected_fg_color, 1.0);
-       -unico-bullet-outline-color: shade (@theme_selected_bg_color, 0.6);
+       -unico-bullet-color: @text_color; /* shade (@theme_selected_fg_color, 
1.0); */
+       -unico-bullet-outline-color: shade (@theme_selected_bg_color, 1.2);
-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
from (shade (@theme_selected_bg_color, 0.7)),
to (shade (@theme_selected_bg_color, 0.7)));
@@ -211,76 +351,71 @@ GtkScale.slider {
/************
* Treeviews *
************/
-column-header {
-       border-radius: 0;
-}

-column-header:nth-child(last) .button {
-       border-width: 0 0 1 0;
-}
+column-header .button,
+column-header .button:active,
+.notebook column-header .button,
+.notebook column-header .button:active {
+    border-radius: 0;
+    border-width: 0 1 1 0;

-column-header .button {
-       border-radius: 0;
-       padding: 1;
-       border-width: 0 1 1 0;
-       -unico-outer-stroke-style: none;
-       -GtkButton-inner-border: 2;
+    -unico-focus-border-radius: 0;
+    -unico-focus-border-color: @transparent;
+    -unico-focus-fill-color: alpha (@selected_bg_color, 0.2);
+    -unico-focus-outer-stroke-color: @transparent;
+    -unico-glow-radius: 0;
+    -unico-outer-stroke-width: 0;
+}

-       background-image: -gtk-gradient (linear,
+column-header .button,
+.notebook column-header .button {
+    background-image: -gtk-gradient (linear,
left top, left bottom,
from (shade (@listview_header_gradient_a,0.98)),
to (shade (@listview_header_gradient_b,1.35)));

-        -unico-border-gradient: -gtk-gradient (linear,
-        left top, left bottom,
-        from (shade (@bg_color, 0.94)),
-        to (shade (@bg_color, 0.70)));
+    text-shadow: 0 1 alpha (shade (@bg_color, 1.25), 0.4);

+    -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
+                                           from (shade (@bg_color, 0.8)),
+                                           to (shade (@bg_color, 0.76)));
+    -unico-glow-color: shade (@bg_color, 1.02);
+    -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
+                                                 from (shade (@bg_color, 
1.16)),
+                                                 to (shade (@bg_color, 0.99)));
}

-column-header .button:hover {
-       color: @text_color;
-       background-image: -gtk-gradient (linear,
-                    left top,
-                    left bottom,
-                    from (shade (@base_color, 0.90)),
-                                     color-stop (0.02, shade (@base_color, 
0.80)),
-                                     color-stop (0.96, @base_color),
-                                     color-stop (0.99, shade (@base_color, 
0.50)),
-                    to (shade (@base_color, 0.45)));
-}
+column-header .button:hover,
+.notebook column-header .button:hover {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@bg_color, 1.13)),
+                                     to (shade (@bg_color, 0.97)));

-/* Treeview */
-GtkTreeView.separator {
-       background-color: darker (@theme_bg_color);
+    -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
+                                           from (shade (@bg_color, 0.84)),
+                                           to (shade (@bg_color, 0.75)));
+    -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
+                                                 from (shade (@bg_color, 
1.21)),
+                                                 to (shade (@bg_color, 1.04)));
}

-/* Row */
-row:hover {
-       background-color: shade (@selected_bg_color,1.35);
+column-header:nth-child(last) .button {
+    border-width: 0 0 1 0;
}

-row:insensitive {
-}
+GtkTreeView .entry {
+    background-image: none;
+    border-radius: 0;

-row:selected:focused {
-       border-width: 0;
-       border-style: none;
-       background-image: -gtk-gradient (linear,
-               left top, left bottom,
-               from (shade (@menuitem_background_a, 1.00)),
-               to (shade (@menuitem_background_b, 1.00)));
-       background-color: @theme_selected_bg_color;
+    -unico-inner-stroke-gradient: none;
+    -unico-inner-stroke-width: 1;
}

-row:selected {
+GtkTreeView.frame {
+       border-radius: 0;
border-width: 0;
-       border-style: none;
-       background-image: -gtk-gradient (linear,
-               left top, left bottom,
-               from (shade (@menuitem_background_a, 1.00)),
-               to (shade (@menuitem_background_b, 1.00)));
-       background-color: @theme_selected_bg_color;
+       -unico-inner-stroke-width: 0;
+       -unico-outer-stroke-width: 0;
}

/************
@@ -314,6 +449,13 @@ GtkSpinButton.button,
GtkSpinButton.button:insensitive,
GtkSpinButton.button:prelight,
GtkSpinButton.button:active {
+       background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@bg_color, 1.1)),
+                                     to (shade (@bg_color, 0.9)));
+
+       -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
+                                           from (shade (@bg_color, 0.65)),
+                                           to (shade (@bg_color, 0.7)));
}

/************
diff --git a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-frames.css 
b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-frames.css
index 37fac4c..8d69f5f 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-frames.css
+++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-frames.css
@@ -6,10 +6,8 @@
.frame,
.notebook {
-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-               from (shade (@theme_bg_color, 0.7)),
-               to (shade (@theme_bg_color, 0.7)));
-       -unico-inner-stroke-style: custom;
-       -unico-inner-stroke-color: alpha (shade (@theme_bg_color, 1.26), 0.2);
+                                           from (shade (@bg_color, 0.76)),
+                                           to (shade (@bg_color, 0.7)));
}

.button:insensitive,
@@ -17,7 +15,11 @@
.notebook:insensitive {
-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
from (shade (@theme_bg_color, 0.8)),
-               to (shade (@theme_bg_color, 0.8)));
+               to (shade (@theme_bg_color, 0.8)));
+       -unico-outer-stroke-style: custom;
+       -unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left 
bottom,
+               from (alpha (shade (@theme_bg_color, 0.9), 0.6)),
+               to (alpha (shade (@theme_bg_color, 1.1), 0.7)));
}

/* inset */
@@ -48,18 +50,8 @@

/* frame */
.frame {
-       border-radius: 0;
-       -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-               from (shade (@theme_bg_color, 0.8)),
-               to (shade (@theme_bg_color, 0.8)));
-}
-
-/* GtkScrolledWindow */
-GtkScrolledWindow.frame {
-       border-style: solid;
-       border-color: @internal_element_color;
-       border-width: 1;
-       border-radius: 0;
+       border-radius: 3;
+       -unico-outer-stroke-width: 0;
}

/****************
@@ -90,11 +82,12 @@ GtkScrolledWindow.frame {
}

.entry:insensitive {
-       background-color: @insensitive_bg_color;
-       -unico-border-gradient: -gtk-gradient (linear,
-               left top, left bottom,
-               from (shade (@inactive_frame_border_a, 1.00)),
-               to (shade (@inactive_frame_border_b, 1.00)));
+    background-color: shade (@bg_color, 1.06);
+    background-image: none;
+
+    -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
+                                                 from (alpha (shade 
(@bg_color, 0.05), 0.04)),
+                                                 to (alpha (shade (@bg_color, 
0.05), 0.02)));
}

.entry.progressbar {
@@ -104,29 +97,3 @@ GtkScrolledWindow.frame {
border-radius: 1;
border-color: @progressbar_border;
}
-
-/**************
- * Separators *
- **************/
-GtkSeparator {
-       border-style: solid;
-       border-color: shade (@theme_bg_color, 0.9);
-       -unico-border-gradient: none;
-       -unico-inner-stroke-style: custom;
-       -unico-inner-stroke-color: alpha (shade (@theme_bg_color, 1.26), 0.3);
-}
-
-.button GtkSeparator {
-       border-style: solid;
-       border-color: shade (@button_bg_color, 0.9);
-       -unico-inner-stroke-style: custom;
-       -unico-inner-stroke-color: alpha (shade (@button_bg_color, 1.26), 0.3);
-}
-
-.menuitem.separator {
-       border-style: solid;
-       border-color: alpha (@dark_bg_color, 0.45);
-       -unico-border-gradient: none;
-       -unico-inner-stroke-style: custom;
-       -unico-inner-stroke-color: alpha (shade (@dark_bg_color, 1.26), 0.3);
-}
diff --git a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-menus.css 
b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-menus.css
index 738ac2b..aea49d7 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-menus.css
+++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-menus.css
@@ -7,6 +7,8 @@
background-color: @dark_bg_color;
border-color: shade (@dark_bg_color,0.5);
color: @selected_fg_color;
+       border-width: 1 1 1 1;
+       border-style: solid;
}

/* menuitem */
diff --git a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-widgets.css 
b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-widgets.css
index e14f476..7410e94 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-widgets.css
+++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-widgets.css
@@ -1,4 +1,5 @@
* {
+       -GtkArrow-arrow-scaling: 0.6;
-GtkButton-child-displacement-x: 1;
-GtkButton-child-displacement-y: 1;
-GtkButton-default-border: 0;
@@ -7,8 +8,6 @@
-GtkButton-inner-border: 3;
-GtkCheckButton-indicator-size: 16;
-GtkCheckMenuItem-indicator-size: 14;
-       -GtkComboBox-arrow-scaling: 0.5;
-       -GtkComboBox-shadow-type: 2;
-GtkEntry-inner-border: 2;
-GtkEntry-progress-border: 0;
-GtkExpander-expander-size: 10;
@@ -23,10 +22,12 @@
-GtkProgressBar-min-horizontal-bar-height: 10;
-GtkProgressBar-min-vertical-bar-width: 10;
-GtkRange-trough-border: 1;
-       -GtkRange-slider-width: 11;
-       -GtkRange-stepper-size: 13;
+       -GtkRange-slider-width: 9;
+       -GtkRange-stepper-size: 9;
-GtkRange-trough-under-steppers: 1;
-GtkRange-stepper-spacing: 0;
+       -GtkRange-show-fill-level: 1;
+       -GtkScale-slider-length: 11;
-GtkScale-trough-border: 0;
-GtkScale-trough-side-details: 1;
-GtkScrollbar-activate-slider: 1;
@@ -53,8 +54,7 @@
-GtkWidget-focus-line-width: 1;
-GtkWidget-link-color: @link_color;
-GtkWidget-visited-link-color: @link_color;
-       -GtkWindow-resize-grip-width: 0;
-       -GtkWindow-resize-grip-height: 0;
+       -GtkWindow-resize-grip-default: false;
-WnckTasklist-fade-overlay-rect: 0;

border-width: 1;
@@ -62,11 +62,12 @@

engine: unico;

-       -unico-inner-stroke-color: rgba (0, 0, 0, 0);
-       -unico-focus-border-color: alpha (#fff, 0.0);
-       -unico-focus-border-radius: 2;
-       -unico-focus-fill-color: alpha (#fff, 0.0);
-       -unico-focus-outer-stroke-color: alpha (#fff, 0.0);
+       -unico-focus-border-color: alpha (@selected_bg_color, 0.6);
+       -unico-focus-border-radius: 4;
+       -unico-focus-fill-color: alpha (@selected_bg_color, 0.25);
+       -unico-focus-outer-stroke-color: @transparent;
+       -unico-inner-stroke-color: none;
+       -unico-inner-stroke-width: 0;
}

/***************
@@ -99,7 +100,7 @@ GtkWindow {
}

*:insensitive {
-       background-color: @insensitive_bg_color;
+       background-color: @bg_color;
color: @insensitive_fg_color;
border-color: @insensitive_border_color;
}
@@ -116,8 +117,8 @@ GtkWindow {

.tooltip {
padding: 4 4;
-       border-style: solid;
-       border-width: 1;
+       border-style: none;
+       border-width: 0;
border-color: shade (@theme_tooltip_bg_color, 0.80);
background-color: @theme_tooltip_bg_color;
color: @theme_tooltip_fg_color;
diff --git a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk.css 
b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk.css
index 19f7cc7..f18de6a 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk.css
+++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk.css
@@ -2,7 +2,7 @@
AUTHOR: Simon Steinbeiß
BASED ON zukitwo BY lassekongo83
LICENSE: GPL
-       DESCRIPTION: A port of greybird to gtk3.
+       DESCRIPTION: A port of Greybird to gtk3.
*/

/* default color scheme */
@@ -36,6 +36,7 @@
@define-color button_insensitive_bg_color mix (@button_bg_color, 
@theme_bg_color, 0.6);
@define-color dark_bg_color #686868;
@define-color dark_fg_color #FFF;
+@define-color transparent rgba (0, 0, 0, 0);

@define-color internal_element_color #afafaf;
@define-color insensitive_bg_color #f5f5f5;
diff --git a/gnome-frugalware/theme/Frugalware/gtk-3.0/progressbar.png 
b/gnome-frugalware/theme/Frugalware/gtk-3.0/progressbar.png
new file mode 100755
index 0000000..61f2616
Binary files /dev/null and 
b/gnome-frugalware/theme/Frugalware/gtk-3.0/progressbar.png differ
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to