Git-Url: 
https://github.com/frugalware/artwork/commit/99762706c1aec024251897066019544f3c7ff616

commit 99762706c1aec024251897066019544f3c7ff616
Author: Devil505 <devil505li...@gmail.com>
Date:   Fri Nov 11 10:59:11 2011 +0100

* updating GTK2 & 3 themes

diff --git a/gnome-frugalware/theme/Frugalware/gtk-2.0/apps/terminal.rc 
b/gnome-frugalware/theme/Frugalware/gtk-2.0/apps/terminal.rc
index 0689afa..98cc5ad 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-2.0/apps/terminal.rc
+++ b/gnome-frugalware/theme/Frugalware/gtk-2.0/apps/terminal.rc
@@ -1,49 +1,51 @@
-style "terminal"       = "murrine-dark"
+style "terminal"
{
-       bg[NORMAL]      = @text_color
-       bg[ACTIVE]      = @text_color
-       bg[PRELIGHT]    = @text_color
-       bg[SELECTED]    = @text_color
-       base[NORMAL]    = @text_color
-}
-
-style "terminal-screen" = "murrine-dark"
-{
-       base[NORMAL]    = @text_color
-       bg[NORMAL]      = @selected_fg_color
-       bg[PRELIGHT]    = shade (0.7, @selected_fg_color)
-       TerminalScreen::background-darkness     = 0.75
+       bg[NORMAL]      = @bg_color
+       bg[ACTIVE]      = @bg_color
+       bg[PRELIGHT]    = @bg_color
+       bg[SELECTED]    = @bg_color
+       base[NORMAL]    = @bg_color
}

style "terminal-scrollbar"
{
+       base[NORMAL]    = @bg_color
+       bg[NORMAL]      = @bg_color
+       bg[PRELIGHT]    = shade(0.95,@bg_color)
engine "murrine" {
-               gradient_shades                 = {2.5,2.5,2.5,2.5}
-               glowstyle                       = 0
-               trough_shades                   = { 0.1, 0.1}
-               border_shades                   = { 0.1, 0.1}
-               prelight_shade                  = 1.35
+               gradient_shades                 = {0.85,0.85,0.85,0.85}
+               colorize_scrollbar              = FALSE
+               glow_shade                      = 1.0
+               trough_shades                   = { 0.975, 0.975 } # make the 
trough  #CECECE (@bg_color)
+               trough_border_shades            = { 1.03, 1.03 } # make the 
trough #CECECE
+               border_shades                   = { 0.75, 0.75 }
contrast                        = 0.0
}
}

style "terminal-notebook" = "murrine-dark"
{
-       bg[NORMAL]      = shade (0.0, @text_color_dark) # Tab background.
-       bg[ACTIVE]      = shade (0.2, @text_color_dark) # Unfocused tab 
background.
+       bg[NORMAL]      = @bg_color # Tab background.
+       bg[ACTIVE]      = shade (0.7, @bg_color) # Unfocused tab background.
bg[PRELIGHT]    = shade (0.1, @selected_fg_color)
base[NORMAL]    = @text_color
-       fg[NORMAL]      = "#fff"
-       fg[ACTIVE]      = "#fff"
engine "murrine"
{
-               roundness       = 0
-               contrast        = 0.1
-               prelight_shade  = 1.5
+               highlight_shade     = 1.08
+               roundness       = 3
+               contrast        = 0.0
+
+
+               ## things that don't work:
+               #glow_shade     = 0.8
+               #glowstyle           = 2
+               #focusstyle         = 3
+               #glazestyle          = 3
+               #border_shades  = { 0.45, 2.5 }
+               #prelight_shade = 1.5
}
}

class "*TerminalWindow"                         style "terminal"
-#widget_class "TerminalWindow*GtkNotebook"                     style 
"terminal-notebook"
-widget "*TerminalWindow.*.GtkVScrollbar"               style 
"terminal-scrollbar"
-widget "*TerminalWindow.*.TerminalScreen*"              style "terminal-screen"
\ No newline at end of file
+widget_class "TerminalWindow*GtkNotebook"                      style 
"terminal-notebook"
+widget "*TerminalWindow.*.GtkVScrollbar"               style 
"terminal-scrollbar"
\ 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 c6d0169..62ad227 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-2.0/gtkrc
+++ b/gnome-frugalware/theme/Frugalware/gtk-2.0/gtkrc
@@ -558,26 +558,17 @@ style "xfdesktop-windowlist" #= "murrine-menu"
text[INSENSITIVE]   = shade (0.95, @base_color)
}

-
-style "murrine-borderless"
-{
-#      GtkPaned::border_width = 0
-#      base[NORMAL] = @base_color
-#      base[NORMAL] = @base_color
-#      base[ACTIVE] = @base_color
-#      base[SELECTED]  = @base_color
-#      base[INSENSITIVE] = @base_color
-       bg[NORMAL] = @base_color
-#      bg[ACTIVE] = @base_color
-#      bg[SELECTED]    = @base_color
-#      bg[INSENSITIVE] = @base_color
-#      fg[INSENSITIVE] = @base_color
-#      text[INSENSITIVE] = @base_color
-       engine "murrine"
-       {
-       #       roundness       = 0
-       #       contrast        = 0.0
-       }
+style "murrine-calendar" = "murrine-dark"
+{
+       GtkWindow       ::resize-grip-height                    = 0
+        GtkWindow      ::resize-grip-width                     = 0
+       GtkWindow       ::border-width  = 0
+       GtkFrame        ::border-width  = 0
+       base[NORMAL]    = @bg_color_dark
+       base[SELECTED]    = shade (0.65, @bg_color_dark)
+       base[ACTIVE]    = shade (0.65, @bg_color_dark)
+       fg[ACTIVE]      = "#FFFFFF"
+       bg[NORMAL]   = shade (0.2, @text_color_dark)
}

###############################################################################
@@ -642,6 +633,8 @@ widget_class "*<GtkMenuItem>.*.<GtkScale>" style 
"murrine-scale"
widget_class "*.<GtkFrame>.<GtkLabel>" style "murrine-frame-title"
widget_class "*.<GtkTreeView>*"        style "murrine-treeview"

+widget_class "*GtkCalendar*"   style "murrine-calendar"
+
widget_class "*GtkHPaned" style "murrine-paned"
widget_class "*GtkVPaned" style "murrine-paned"

diff --git a/gnome-frugalware/theme/Frugalware/gtk-2.0/resize_grip.png 
b/gnome-frugalware/theme/Frugalware/gtk-2.0/resize_grip.png
index 0bce445..4aabef3 100644
Binary files a/gnome-frugalware/theme/Frugalware/gtk-2.0/resize_grip.png and 
b/gnome-frugalware/theme/Frugalware/gtk-2.0/resize_grip.png differ
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 91783fe..ebc9e91 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-bars.css
+++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-bars.css
@@ -19,7 +19,7 @@
-unico-inner-stroke-style: custom;
-unico-inner-stroke-gradient: -gtk-gradient (linear,
left top, left bottom,
-               from (alpha (@theme_base_color, 0.5)),
+               from (alpha (@base_color, 0.5)),
to (alpha (shade (@button_bg_color, 1.26), 0.0)));
}

@@ -40,7 +40,7 @@
-unico-inner-stroke-style: custom;
-unico-inner-stroke-gradient: -gtk-gradient (linear,
left top, right top,
-               from (alpha (@theme_base_color, 0.5)),
+               from (alpha (@base_color, 0.5)),
to (alpha (shade (@button_bg_color, 1.26), 0.0)));
}

@@ -82,16 +82,16 @@ GtkProgressBar.trough.vertical,
.trough row:selected:focused {
background-image: -gtk-gradient (linear,
left top, left bottom,
-               from (mix (@trough_bg_color_a, @theme_selected_bg_color, 0.25)),
-               to (mix (@trough_bg_color_b, @theme_selected_bg_color, 0.25)));
+               from (mix (@trough_bg_color_a, @selected_bg_color, 0.25)),
+               to (mix (@trough_bg_color_b, @selected_bg_color, 0.25)));
}

.trough.vertical row:selected,
.trough.vertical row:selected:focused {
background-image: -gtk-gradient (linear,
left top, right top,
-               from (mix (@trough_bg_color_a, @theme_selected_bg_color, 0.25)),
-               to (mix (@trough_bg_color_b, @theme_selected_bg_color, 0.25)));
+               from (mix (@trough_bg_color_a, @selected_bg_color, 0.25)),
+               to (mix (@trough_bg_color_b, @selected_bg_color, 0.25)));
}

/*************
@@ -116,7 +116,7 @@ GtkProgressBar.trough.vertical,
left top, right top,
from (shade (@trough_bg_color_b, 1.05)),
to (shade (@trough_bg_color_a,1.3)));
-       background-color: shade (@theme_bg_color, 0.882);
+       background-color: shade (@bg_color, 0.882);
border-radius: 0;
border-width: 0;
border-style: none;
@@ -127,7 +127,7 @@ GtkProgressBar.trough.vertical,
left top, left bottom,
from (shade (@trough_bg_color_b, 1.05)),
to (shade (@trough_bg_color_a,1.3)));
-       background-color: shade (@theme_bg_color, 0.882);
+       background-color: shade (@bg_color, 0.882);
border-radius: 0;
border-width: 0;
border-style: none;
@@ -140,7 +140,7 @@ GtkProgressBar.trough.vertical,
left top, right top,
from (@scrollslider_gradient_a),
to (shade(@scrollslider_gradient_a,0.95)));
-       background-color: @theme_base_color;
+       background-color: @base_color;
border-color: shade(@scrollslider_border,1.1);
border-radius: 10;
border-width: 1;
@@ -151,7 +151,7 @@ GtkProgressBar.trough.vertical,
left top, right top,
from (shade (@scrollslider_gradient_a, 0.94)),
to (shade (@scrollslider_gradient_a, 0.9)));
-       background-color: @theme_base_color;
+       background-color: @base_color;
border-color: shade (@scrollslider_border, 1.05);
}

@@ -160,7 +160,7 @@ GtkProgressBar.trough.vertical,
left top, right top,
from (shade (@scrollslider_gradient_a, 0.94)),
to (shade (@scrollslider_gradient_b, 0.9)));
-       background-color: @theme_base_color;
+       background-color: @base_color;
border-color: shade (@scrollslider_border, 1.05);
}

@@ -170,7 +170,7 @@ GtkProgressBar.trough.vertical,
left top, left bottom,
from (@scrollslider_gradient_a),
to (shade(@scrollslider_gradient_a,0.95)));
-       background-color: @theme_base_color;
+       background-color: @base_color;
border-color: shade (@scrollslider_border, 1.05);
border-radius: 10;
border-width: 1;
@@ -181,7 +181,7 @@ GtkProgressBar.trough.vertical,
left top, left bottom,
from (shade (@scrollslider_gradient_a, 0.94)),
to (shade (@scrollslider_gradient_a, 0.9)));
-       background-color: @theme_base_color;
+       background-color: @base_color;
border-color: @scrollslider_border;
}

@@ -190,16 +190,16 @@ GtkProgressBar.trough.vertical,
left top, left bottom,
from (shade (@scrollslider_gradient_a, 0.94)),
to (shade (@scrollslider_gradient_b, 0.9)));
-       background-color: @theme_base_color;
+       background-color: @base_color;
border-color: shade (@scrollslider_border, 1.05);
}

.scrollbar.slider:insensitive {
-       background-color: @theme_base_color;
+       background-color: @base_color;
}

.scrollbar.trough:insensitive {
-       background-color: shade (@theme_bg_color, 0.882);
+       background-color: shade (@bg_color, 0.882);
}

/* GtkScrolledWindow */
@@ -291,7 +291,7 @@ GtkViewport.frame {

.toolbar {
border-style: solid;
-       border-color: shade (@theme_bg_color,0.9);
+       border-color: shade (@bg_color,0.9);
background-color: shade (@bg_color,0.86);
border-width: 0;
border-radius: 0;
@@ -307,11 +307,11 @@ GtkViewport.frame {
.toolbar:insensitive {
color: shade (@fg_color, 0.7);
background-image: none;
-       background-color: shade (@theme_bg_color, 0.97);
+       background-color: shade (@bg_color, 0.97);

border-style: solid;
border-width: 1;
-       border-color: shade (@theme_bg_color, 0.91);
+       border-color: shade (@bg_color, 0.91);
}

/* Toolbar buttons */
@@ -334,7 +334,7 @@ GtkViewport.frame {
border-width: 0;
color: shade (@insensitive_fg_color, 0.5);
background-image: none;
-       background-color: alpha (@theme_base_color, 0.0);
+       background-color: alpha (@base_color, 0.0);
-GtkWidget-focus-line-width: 0;
}

@@ -347,8 +347,8 @@ GtkViewport.frame {
border-radius: 2;
-unico-border-gradient: -gtk-gradient (linear,
left top, left bottom,
-               from (shade (@theme_border_color_a, 1.10)),
-               to (shade (@theme_border_color_b, 1.10)));
+               from (shade (@border_color_a, 1.10)),
+               to (shade (@border_color_b, 1.10)));
}

.primary-toolbar.toolbar.button:active {
@@ -360,9 +360,9 @@ GtkViewport.frame {
border-style: solid;
-unico-border-gradient: -gtk-gradient (linear,
left top, left bottom,
-               from (shade (@theme_border_color_b, 1.00)),
-               to (shade (@theme_border_color_a, 1.00)));
-       color: @theme_fg_color;
+               from (shade (@border_color_b, 1.00)),
+               to (shade (@border_color_a, 1.00)));
+       color: @fg_color;
}

.primary-toolbar.toolbar.button:active:hover {
@@ -374,9 +374,9 @@ GtkViewport.frame {
border-style: solid;
-unico-border-gradient: -gtk-gradient (linear,
left top, left bottom,
-               from (shade (@theme_border_color_b, 1.10)),
-               to (shade (@theme_border_color_a, 1.10)));
-       color: @theme_fg_color;
+               from (shade (@border_color_b, 1.10)),
+               to (shade (@border_color_a, 1.10)));
+       color: @fg_color;
}

.primary-toolbar.toolbar.button:active:insensitive {
@@ -397,8 +397,8 @@ GtkViewport.frame {

-unico-border-gradient: -gtk-gradient (linear,
left top, left bottom,
-               from (shade (@theme_border_color_a, 1.00)),
-               to (shade (@theme_border_color_b, 1.00)));
+               from (shade (@border_color_a, 1.00)),
+               to (shade (@border_color_b, 1.00)));
}

.primary-toolbar.toolbar.raised.button:insensitive {
@@ -414,8 +414,8 @@ GtkViewport.frame {

-unico-border-gradient: -gtk-gradient (linear,
left top, left bottom,
-               from (shade (@theme_border_color_a, 1.10)),
-               to (shade (@theme_border_color_b, 1.10)));
+               from (shade (@border_color_a, 1.10)),
+               to (shade (@border_color_b, 1.10)));
border-width: 1;
border-style: solid;
}
@@ -426,7 +426,7 @@ GtkViewport.frame {
left top, left bottom,
from (@button_active_gradient_color_a),
to (alpha (@button_active_gradient_color_b, 0.13)));
-       background-color: @theme_base_color;
+       background-color: @base_color;

border-color: @highlighted_border;
border-width: 1;
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 6fe3d0b..3f98cd1 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-buttons.css
+++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-buttons.css
@@ -62,11 +62,11 @@ GtkScale.slider:hover,
transition: 200ms ease-in-out;
-unico-border-gradient: -gtk-gradient (linear,
left top, left bottom,
-               from (shade(@theme_border_color_a,1.4)),
-               to (shade(@theme_border_color_b,1.1)));
+               from (shade(@border_color_a,1.4)),
+               to (shade(@border_color_b,1.1)));

-unico-inner-stroke-style: custom;
-       -unico-inner-stroke-color: alpha (shade (@theme_bg_color, 1.26), 0.0);
+       -unico-inner-stroke-color: alpha (shade (@bg_color, 1.26), 0.0);
}

.button:hover,
@@ -78,8 +78,8 @@ GtkScale.slider:hover,

-unico-border-gradient: -gtk-gradient (linear,
left top, left bottom,
-               from (shade (@theme_border_color_a, 0.90)),
-               to (shade (@theme_border_color_b, 0.90)));
+               from (shade (@border_color_a, 0.90)),
+               to (shade (@border_color_b, 0.90)));
}

.button:active,
@@ -93,22 +93,22 @@ GtkScale.slider:hover,
-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, 1.00)),
-               to (shade (@theme_border_color_a, 0.90)));
+               from (shade (@border_color_b, 1.00)),
+               to (shade (@border_color_a, 0.90)));
-unico-inner-stroke-style: custom;
-unico-inner-stroke-gradient: -gtk-gradient (linear,
left top, left bottom,
-               from (alpha (@theme_fg_color, 0.2)),
+               from (alpha (@fg_color, 0.2)),
to (alpha (shade (@button_bg_color, 1.26), 0.0)));
}

.button:insensitive {
background-image: none;
-       background-color: shade (@theme_bg_color, 0.97);
+       background-color: shade (@bg_color, 0.97);

border-style: solid;
border-width: 1;
-       border-color: shade (@theme_bg_color, 0.91);
+       border-color: shade (@bg_color, 0.91);
/*      background-image: -gtk-gradient (linear, left top, left bottom,
from (shade (@button_insensitive_bg_color, 1.04)),
to (shade (@button_insensitive_bg_color, 0.96)));
@@ -207,7 +207,7 @@ row:selected:focused {
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);
+       background-color: shade(@selected_bg_color,1.1);
}

row:selected {
@@ -227,15 +227,15 @@ row:selected {
.radio,
.radio row {
background-image: -gtk-gradient (linear, left top, left bottom,
-               from (shade (@theme_base_color, 0.96)),
-               color-stop (0.10, shade (@theme_base_color, 0.98)),
-               to (@theme_base_color));
+               from (shade (@base_color, 0.96)),
+               color-stop (0.10, shade (@base_color, 0.98)),
+               to (@base_color));

-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-               from (shade (@theme_bg_color, 0.68)),
-               to (shade (@theme_bg_color, 0.68)));
+               from (shade (@bg_color, 0.68)),
+               to (shade (@bg_color, 0.68)));
-unico-inner-stroke-style: custom;
-       -unico-inner-stroke-color: alpha (shade (@theme_base_color, 0.1), 0.02);
+       -unico-inner-stroke-color: alpha (shade (@base_color, 0.1), 0.02);
border-width: 1;
border-style: solid;
}
@@ -245,15 +245,15 @@ row:selected {
.radio:hover,
.radio row:hover {
background-image: -gtk-gradient (linear, left top, left bottom,
-               from (shade (@theme_base_color, 0.96)),
-               color-stop (0.10, shade (@theme_base_color, 0.98)),
-               to (@theme_base_color));
+               from (shade (@base_color, 0.96)),
+               color-stop (0.10, shade (@base_color, 0.98)),
+               to (@base_color));

-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-               from (shade (@theme_bg_color, 0.68)),
-               to (shade (@theme_bg_color, 0.68)));
+               from (shade (@bg_color, 0.68)),
+               to (shade (@bg_color, 0.68)));
-unico-inner-stroke-style: custom;
-       -unico-inner-stroke-color: alpha (shade (@theme_base_color, 0.1), 0.02);
+       -unico-inner-stroke-color: alpha (shade (@base_color, 0.1), 0.02);
border-width: 1;
border-style: solid;
}
@@ -277,20 +277,20 @@ row:selected {
.radio row:selected:active,
.radio row:selected:focused:active {
background-image: -gtk-gradient (linear, left top, left bottom,
-               from (shade (@theme_selected_bg_color, 1.1)),
-               to (shade (@theme_selected_bg_color, 0.9)));
+               from (shade (@selected_bg_color, 1.1)),
+               to (shade (@selected_bg_color, 0.9)));

-       -unico-bullet-color: @text_color; /* shade (@theme_selected_fg_color, 
1.0); */
-       -unico-bullet-outline-color: shade (@theme_selected_bg_color, 1.2);
+       -unico-bullet-color: @text_color; /* shade (@selected_fg_color, 1.0); */
+       -unico-bullet-outline-color: shade (@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)));
+               from (shade (@selected_bg_color, 0.7)),
+               to (shade (@selected_bg_color, 0.7)));
-unico-inner-stroke-style: custom;
-       -unico-inner-stroke-color: alpha (shade (@theme_selected_bg_color, 
1.56), 0.4);
+       -unico-inner-stroke-color: alpha (shade (@selected_bg_color, 1.56), 
0.4);
-unico-outer-stroke-style: custom;
-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-               from (alpha (shade (@theme_bg_color, 0.05), 0.02)),
-               to (alpha (shade (@theme_bg_color, 0.05), 0.08)));
+               from (alpha (shade (@bg_color, 0.05), 0.02)),
+               to (alpha (shade (@bg_color, 0.05), 0.08)));
border-width: 1;
border-style: solid;
}
@@ -304,20 +304,20 @@ row:selected {
.radio row:selected:active:hover,
.radio row:selected:focused:active:hover {
background-image: -gtk-gradient (linear, left top, left bottom,
-               from (shade (@theme_selected_bg_color, 1.1)),
-               to (shade (@theme_selected_bg_color, 0.9)));
+               from (shade (@selected_bg_color, 1.1)),
+               to (shade (@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: shade (@selected_fg_color, 1.0);
+       -unico-bullet-outline-color: shade (@selected_bg_color, 0.6);
-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)));
+               from (shade (@selected_bg_color, 0.7)),
+               to (shade (@selected_bg_color, 0.7)));
-unico-inner-stroke-style: custom;
-       -unico-inner-stroke-color: alpha (shade (@theme_selected_bg_color, 
1.56), 0.4);
+       -unico-inner-stroke-color: alpha (shade (@selected_bg_color, 1.56), 
0.4);
-unico-outer-stroke-style: custom;
-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-               from (alpha (shade (@theme_bg_color, 0.05), 0.02)),
-               to (alpha (shade (@theme_bg_color, 0.05), 0.08)));
+               from (alpha (shade (@bg_color, 0.05), 0.02)),
+               to (alpha (shade (@bg_color, 0.05), 0.08)));
border-width: 1;
border-style: solid;
}
@@ -325,7 +325,7 @@ row:selected {
.check:insensitive,
.radio:insensitive {
background-image: none;
-       background-color: shade (@theme_bg_color, 0.96);
+       background-color: shade (@bg_color, 0.96);
border-width: 1;
border-style: solid;
}
@@ -333,17 +333,17 @@ row:selected {
.check:insensitive:active,
.radio:insensitive:active {
background-image: -gtk-gradient (linear, left top, left bottom,
-               from (shade (@theme_bg_color, 0.96)),
-               to (shade (@theme_bg_color, 0.9)));
+               from (shade (@bg_color, 0.96)),
+               to (shade (@bg_color, 0.9)));

-       -unico-bullet-color: shade (@theme_bg_color, 0.6);
-       -unico-bullet-outline-color: shade (@theme_bg_color, 1.0);
+       -unico-bullet-color: shade (@bg_color, 0.6);
+       -unico-bullet-outline-color: shade (@bg_color, 1.0);
-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-               from (shade (@theme_bg_color, 0.8)),
-               to (shade (@theme_bg_color, 0.7)));
+               from (shade (@bg_color, 0.8)),
+               to (shade (@bg_color, 0.7)));
-unico-inner-stroke-style: custom;
-unico-inner-stroke-gradient: none;
-       -unico-inner-stroke-color: alpha (shade (@theme_bg_color, 1.26), 0.2);
+       -unico-inner-stroke-color: alpha (shade (@bg_color, 1.26), 0.2);
border-width: 1;
border-style: solid;
}
@@ -438,8 +438,8 @@ GtkScale.progressbar {

GtkScale.trough {
background-image: -gtk-gradient (linear, left top, left bottom,
-               from (shade (@theme_bg_color, 0.92)),
-               to (shade (@theme_bg_color, 0.96)));
+               from (shade (@bg_color, 0.92)),
+               to (shade (@bg_color, 0.96)));
}

/***************
@@ -470,13 +470,13 @@ GtkSwitch {

-unico-border-gradient: -gtk-gradient (linear,
left top, left bottom,
-               from (@theme_border_color_a),
-               to (@theme_border_color_b));
+               from (@border_color_a),
+               to (@border_color_b));

-unico-inner-stroke-style: custom;
-unico-inner-stroke-gradient: -gtk-gradient (linear,
left top, left bottom,
-               from (alpha (@theme_base_color, 0.9)),
+               from (alpha (@base_color, 0.9)),
to (alpha (shade (@button_bg_color, 1.26), 0.0)));
}

@@ -487,30 +487,30 @@ GtkSwitch.trough {
to (shade (@progressbar_through_b, 1.0)));

-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-               from (shade (@theme_border_color_b, 1.00)),
-               to (shade (@theme_border_color_a, 1.00)));
+               from (shade (@border_color_b, 1.00)),
+               to (shade (@border_color_a, 1.00)));
-unico-inner-stroke-style: custom;
-unico-inner-stroke-gradient: -gtk-gradient (linear,
left top, left bottom,
-               from (alpha (@theme_fg_color, 0.2)),
+               from (alpha (@fg_color, 0.2)),
to (alpha (shade (@button_bg_color, 1.26), 0.0)));
}

GtkSwitch.trough:active {
background-image: -gtk-gradient (linear,
left top, left bottom,
-               from (shade (@theme_selected_bg_color, 0.9)),
-               to (shade (@theme_selected_bg_color, 1.0)));
+               from (shade (@selected_bg_color, 0.9)),
+               to (shade (@selected_bg_color, 1.0)));

-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-               from (shade (@theme_border_color_b, 1.00)),
-               to (shade (@theme_border_color_a, 1.00)));
+               from (shade (@border_color_b, 1.00)),
+               to (shade (@border_color_a, 1.00)));
-unico-inner-stroke-style: custom;
-unico-inner-stroke-gradient: -gtk-gradient (linear,
left top, left bottom,
-               from (alpha (shade (@theme_selected_bg_color, 0.6),0.2)),
-               to (alpha (shade (@theme_selected_bg_color, 1.26), 0.0)));
-       color: @theme_base_color;
+               from (alpha (shade (@selected_bg_color, 0.6),0.2)),
+               to (alpha (shade (@selected_bg_color, 1.26), 0.0)));
+       color: @base_color;
}

/*******************
@@ -519,19 +519,19 @@ GtkSwitch.trough:active {
.notebook {
padding: 2;
border-radius: 4;
-       background-color: shade (@theme_bg_color, 1.1);
+       background-color: shade (@bg_color, 1.1);
}

.notebook tab {
border-radius: 4;
padding: 2 3 0;
background-image: -gtk-gradient (linear, left top, left bottom,
-               from (shade (@theme_bg_color, 0.85)),
-               to (shade (@theme_bg_color, 0.78)));
+               from (shade (@bg_color, 0.85)),
+               to (shade (@bg_color, 0.78)));
}

.notebook tab:active {
background-image: -gtk-gradient (linear, left top, left bottom,
-               from (shade (@theme_bg_color, 1.05)),
-               to (shade (@theme_bg_color, 1.1)));
+               from (shade (@bg_color, 1.05)),
+               to (shade (@bg_color, 1.1)));
}
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 8d69f5f..a8dd68b 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-frames.css
+++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-frames.css
@@ -14,12 +14,12 @@
.frame:insensitive,
.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)));
+               from (shade (@bg_color, 0.8)),
+               to (shade (@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)));
+               from (alpha (shade (@bg_color, 0.9), 0.6)),
+               to (alpha (shade (@bg_color, 1.1), 0.7)));
}

/* inset */
@@ -30,8 +30,8 @@
.radio {
-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.05), 0.6)));
+               from (alpha (shade (@bg_color, 0.9), 0.6)),
+               to (alpha (shade (@bg_color, 1.05), 0.6)));
}

/* shadow */
@@ -44,8 +44,8 @@
.radio:active {
-unico-outer-stroke-style: custom;
-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-               from (alpha (shade (@theme_bg_color, 0.05), 0.05)),
-               to (alpha (shade (@theme_bg_color, 0.05), 0.09)));
+               from (alpha (shade (@bg_color, 0.05), 0.05)),
+               to (alpha (shade (@bg_color, 0.05), 0.09)));
}

/* frame */
@@ -59,25 +59,25 @@
****************/
.entry,
.toolbar.entry {
-       background-color: @theme_base_color;
+       background-color: @base_color;
background-image: -gtk-gradient (linear,
left top, left bottom,
-               from (shade (@theme_base_color, 0.82)),
-               color-stop (0.12, shade (@theme_base_color, 0.98)),
-               color-stop (0.16, shade (@theme_base_color, 1.0)),
-               to (@theme_base_color));
+               from (shade (@base_color, 0.82)),
+               color-stop (0.12, shade (@base_color, 0.98)),
+               color-stop (0.16, shade (@base_color, 1.0)),
+               to (@base_color));
border-radius: 2;
border-width: 1;
border-style: solid;
-unico-border-gradient: -gtk-gradient (linear,
left top, left bottom,
-               from (shade (@theme_border_color_b, 1.00)),
-               to (shade (@theme_border_color_a, 1.00)));
+               from (shade (@border_color_b, 1.00)),
+               to (shade (@border_color_a, 1.00)));
padding: 2;
}

.entry:focused {
-       border-color: @theme_selected_bg_color;
+       border-color: @selected_bg_color;
-unico-border-gradient: none;
}

@@ -91,8 +91,8 @@
}

.entry.progressbar {
-       background-color: @theme_selected_bg_color;
-       color: @theme_selected_fg_color;
+       background-color: @selected_bg_color;
+       color: @selected_fg_color;
border-width: 1;
border-radius: 1;
border-color: @progressbar_border;
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 aea49d7..5680c09 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-menus.css
+++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-menus.css
@@ -23,8 +23,8 @@

-unico-bullet-color: @selected_fg_color;
-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-               from (alpha (@theme_selected_bg_color, 0.0)),
-               to (alpha (@theme_selected_bg_color, 0.0)));
+               from (alpha (@selected_bg_color, 0.0)),
+               to (alpha (@selected_bg_color, 0.0)));
-unico-inner-stroke-style: none;
}

@@ -34,8 +34,8 @@

.menuitem:prelight {
background-image: -gtk-gradient (linear, left top, left bottom,
-               from (shade (@theme_dark_bg_color, 0.50)),
-               to (shade (@theme_dark_bg_color, 0.40)));
+               from (shade (@dark_bg_color, 0.50)),
+               to (shade (@dark_bg_color, 0.40)));
background-color: shade (@bg_color_dark,0.5);
border-style: solid;
border-width: 1; /* Keep at 1. Menu gets bumpy otherwise. */
@@ -52,7 +52,7 @@

.menuitem:insensitive,
.menuitem *:insensitive {
-       color: mix (@theme_fg_color, @theme_bg_color, 0.5);
+       color: mix (@fg_color, @bg_color, 0.5);
}

.menuitem.check:active,
@@ -70,14 +70,14 @@
/* menubar */
.menubar {
-GtkWidget-window-dragging: true;
-       color: @theme_fg_color;
+       color: @fg_color;
background-image: -gtk-gradient (linear,
left top,
left bottom,
from (@toolbar_gradient_base),
to (@toolbar_gradient_final));
-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-               from (alpha (@theme_bg_color, 1.0)),
+               from (alpha (@bg_color, 1.0)),
to (alpha (@toolbar_border, 1.0)));
border-style: solid;
border-width: 1;
@@ -93,7 +93,7 @@
}

.menubar.menuitem:prelight {
-       color: @theme_fg_color;
+       color: @fg_color;
text-shadow: none;
background-image: -gtk-gradient (linear, left top, left bottom,
from (shade (@dark_bg_color, 0.70)),
diff --git a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-misc.css 
b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-misc.css
index ff2beb8..3905d91 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-misc.css
+++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-misc.css
@@ -3,14 +3,14 @@
********/
/* gnome-terminal */
TerminalScreen {
-       background-color: @theme_base_color;
-       color: @theme_fg_color;
+       background-color: @base_color;
+       color: @fg_color;
-TerminalScreen-background-darkness: 0.95;
}

/* GtkAssistant */
GtkAssistant .sidebar .highlight {
-       color: @theme_fg_color;
+       color: @fg_color;
font: bold;
}

@@ -20,8 +20,8 @@ GtkAssistant .sidebar {
border-radius: 2;
border-style: solid;
border-color: @inactive_frame_color;
-       color: mix (@theme_fg_color, @theme_bg_color, 0.40);
-       background-color: shade (@theme_bg_color, 0.97);
+       color: mix (@fg_color, @bg_color, 0.40);
+       background-color: shade (@bg_color, 0.97);
}

/* Sidebar */
@@ -36,11 +36,11 @@ GtkAssistant .sidebar {
color-stop (0.99, shade (@sidebar_color, 1.00)),
color-stop (1.00, shade (@sidebar_color, 0.86)),
to (shade (@sidebar_color,1.00)));
-       color: @theme_fg_color;
+       color: @fg_color;
}

.sidebar.menuitem:selected {
-       background-color: shade (@theme_selected_bg_color, 0.8);
+       background-color: shade (@selected_bg_color, 0.8);
color: @text_color;
}

@@ -53,13 +53,13 @@ GtkIconView {

GtkIconView.view.cell:selected,
GtkIconView.view.cell:selected:focused {
-       background-color: @theme_selected_bg_color;
+       background-color: @selected_bg_color;
border-radius: 2;
}

.view {
-       background-color: @theme_base_color;
-       color: @theme_fg_color;
+       background-color: @base_color;
+       color: @fg_color;
border-radius: 0;
border-width: 0;
}
@@ -77,8 +77,8 @@ GtkCalendar.header {
background-image: -gtk-gradient (linear,
left top,
left bottom,
-               from (shade (@theme_bg_color, 1.04)),
-               to (shade (@theme_bg_color, 0.89)));
+               from (shade (@bg_color, 1.04)),
+               to (shade (@bg_color, 0.89)));
border-width: 0;
}

@@ -92,8 +92,8 @@ GtkCalendar.button {

.highlight,
GtkCalendar.highlight {
-       background-color: @theme_selected_bg_color;
-       color: @theme_selected_fg_color;
+       background-color: @selected_bg_color;
+       color: @selected_fg_color;
border-radius: 0;
padding: 0;
border-width: 0;
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 7410e94..cbe5da1 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-widgets.css
+++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-widgets.css
@@ -75,28 +75,28 @@
***************/

GtkWindow {
-       color: @theme_fg_color;
+       color: @fg_color;
}

* {
-       background-color: @theme_bg_color;
+       background-color: @bg_color;
-unico-inner-stroke-style: none;
-unico-outer-stroke-style: none;
}

*:hover {
-       background-color: shade (@theme_bg_color, 1.02);
-       color: @theme_fg_color;
+       background-color: shade (@bg_color, 1.02);
+       color: @fg_color;
}

*:selected {
-       background-color: @theme_selected_bg_color;
-       color: @theme_selected_fg_color;
+       background-color: @selected_bg_color;
+       color: @selected_fg_color;
}

*:selected:focused {
-       background-color: @theme_selected_bg_color;
-       color: @theme_selected_fg_color;
+       background-color: @selected_bg_color;
+       color: @selected_fg_color;
}

*:insensitive {
@@ -106,7 +106,7 @@ GtkWindow {
}

*:active {
-       background-color: shade (@theme_bg_color, 0.915);
+       background-color: shade (@bg_color, 0.915);
}

.background {
@@ -119,9 +119,9 @@ GtkWindow {
padding: 4 4;
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;
+       border-color: shade (@tooltip_bg_color, 0.80);
+       background-color: @tooltip_bg_color;
+       color: @tooltip_fg_color;
}

.grip {
@@ -129,8 +129,8 @@ GtkWindow {
}

.rubberband {
-       background-color: alpha (@theme_selected_bg_color, 0.35);
-       border-color: @theme_selected_bg_color;
+       background-color: alpha (@selected_bg_color, 0.35);
+       border-color: @selected_bg_color;
border-style: solid;
border-width: 1;
border-radius: 2;
@@ -144,12 +144,12 @@ GtkWindow {

.pane-separator:prelight,
.pane-separator:selected {
-       color: @theme_text_color;
+       color: @text_color;
}

GtkStatusbar {
padding: 5;
-       color: @theme_fg_color;
+       color: @fg_color;
-GtkStatusbar-shadow-type: none;
}

diff --git a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk.css 
b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk.css
index f18de6a..5487a03 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk.css
+++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk.css
@@ -15,16 +15,6 @@
@define-color tooltip_bg_color #000000;
@define-color tooltip_fg_color #FFFFFF;

-/* other color schemes could simply override these */
-@define-color theme_bg_color @bg_color;
-@define-color theme_fg_color @fg_color;
-@define-color theme_base_color @base_color;
-@define-color theme_text_color @text_color;
-@define-color theme_selected_bg_color @selected_bg_color;
-@define-color theme_selected_fg_color @selected_fg_color;
-@define-color theme_tooltip_bg_color @tooltip_bg_color;
-@define-color theme_tooltip_fg_color @tooltip_fg_color;
-
/* misc colors used by gtk+ */
@define-color link_color #74a0c6;
@define-color warning_color #f57900;
@@ -33,7 +23,7 @@

/* theme common colors */
@define-color button_bg_color shade (@bg_color,1.02);
-@define-color button_insensitive_bg_color mix (@button_bg_color, 
@theme_bg_color, 0.6);
+@define-color button_insensitive_bg_color mix (@button_bg_color, @bg_color, 
0.6);
@define-color dark_bg_color #686868;
@define-color dark_fg_color #FFF;
@define-color transparent rgba (0, 0, 0, 0);
@@ -71,8 +61,8 @@
@define-color menuitem_background_b #7a94a9;

/* User defined for this theme */
-@define-color theme_border_color_a #afafaf;
-@define-color theme_border_color_b #7a7a7a;
+@define-color border_color_a #afafaf;
+@define-color border_color_b #7a7a7a;
@define-color scrollslider_gradient_a #d8d8d8;
@define-color scrollslider_gradient_b #bdbdbd;
@define-color scrollslider_border #9a9a9a;
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to