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

commit da8c355277f8989579e2fe2eae76ee25a2b5be7a
Author: Devil505 <devil505li...@gmail.com>
Date:   Sat Dec 17 14:23:50 2011 +0100

* updating gtk2 and 3, metacity theme

diff --git a/gnome-frugalware/theme/Frugalware/gtk-2.0/apps/panel.rc 
b/gnome-frugalware/theme/Frugalware/gtk-2.0/apps/panel.rc
index 4c36545..b804c50 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-2.0/apps/panel.rc
+++ b/gnome-frugalware/theme/Frugalware/gtk-2.0/apps/panel.rc
@@ -1,6 +1,6 @@
style "theme-panel" = "murrine-dark"
{
-       xthickness      = 1
+       xthickness      = 0
ythickness      = 0

bg[NORMAL]      = shade (0.7, @bg_color_dark)
@@ -108,4 +108,4 @@ widget "*.gtk-combobox-popup-menu.*"                style 
"murrine-wide-dark"

# dark bg and black text for gdm's panel
widget_class "*GdmGreeterPanel*" style "panel-entry"
-widget "*GdmClockWidget*" style "murrine-dark"
\ No newline at end of file
+widget "*GdmClockWidget*" style "murrine-dark"
diff --git a/gnome-frugalware/theme/Frugalware/gtk-2.0/gtkrc 
b/gnome-frugalware/theme/Frugalware/gtk-2.0/gtkrc
index f01e894..d00a0f8 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-2.0/gtkrc
+++ b/gnome-frugalware/theme/Frugalware/gtk-2.0/gtkrc
@@ -223,15 +223,6 @@ style "murrine-wide-dark" = "murrine-dark"
xthickness        = 4
}

-style "tabwin-dark" = "murrine-dark" {
-       bg[NORMAL]      = "#424242"
-       bg[SELECTED]    = @panel_bg
-       engine "murrine"
-       {
-               focusstyle = 0
-       }
-}
-
style "murrine-wide"
{
xthickness = 2
@@ -549,9 +540,11 @@ style "murrine-toolbar" = "murrine-default"

style "xfce-header"
{
+       font_name = "Serif"
+       bg[NORMAL]       = shade (0.9, @bg_color)
base[NORMAL]     = shade (1.18, @bg_color)
engine "murrine" {
-               gradient_shades = {0.1,0.5,0.6,1.0}
+               textstyle       = 1
}
}

@@ -562,6 +555,16 @@ style "xfdesktop-windowlist" #= "murrine-menu"
text[INSENSITIVE]   = shade (0.95, @base_color)
}

+
+style "tabwin-dark" = "murrine-dark" {
+       bg[NORMAL]      = "#424242"
+       bg[SELECTED]    = @panel_bg
+       engine "murrine"
+       {
+               focusstyle = 0
+       }
+}
+
style "murrine-calendar" = "murrine-dark"
{
base[NORMAL]    = @bg_color_dark
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 d2d0d73..bc386e6 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-widgets.css
+++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-widgets.css
@@ -377,21 +377,19 @@ GtkComboBox.combobox-entry .button:insensitive,
/* default button */
.button.default {
background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (mix (shade (@selected_bg_color, 
1.04), @bg_color, 0.3)),
-                                     to (mix (shade (@selected_bg_color, 
0.96), @bg_color, 0.3)));
-
-    text-shadow: 0 1 alpha (shade (@selected_bg_color, 1.26), 0.4);
-
-    -unico-focus-border-color: @transparent;
-    -unico-focus-outer-stroke-color: alpha (@selected_bg_color, 0.2);
-
+                                     from (mix (shade (@bg_color, 1.1), shade 
(@selected_bg_color, 0.65),0.17)),
+                                     to (mix (shade (@bg_color, 0.9), shade 
(@selected_bg_color, 0.65),0.17)));
+    -unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
+                                                 from (alpha (mix (shade 
(@button_bg_color, 0.78), shade (@selected_bg_color, 0.35),0.3), 0.15)),
+                                                 to (alpha (mix (shade 
(@button_bg_color, 0.78), shade (@selected_bg_color, 0.35),0.3), 0.15)));
+    -unico-outer-stroke-width: 1;
-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-                                           from (mix (shade 
(@selected_bg_color, 0.85), @bg_color, 0.3)),
-                                           to (mix (shade (@selected_bg_color, 
0.7), @bg_color, 0.3)));
-
+                                           from (alpha (shade 
(@selected_bg_color, 0.4),0.4)),
+                                           to (alpha (shade 
(@selected_bg_color, 0.3),0.6)));
+
-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-                                                 from (mix (shade 
(@selected_bg_color, 1.42), @bg_color, 0.3)),
-                                                 to (mix (shade 
(@selected_bg_color, 1.12), @bg_color, 0.3)));
+                                                 from (shade 
(@button_bg_color, 1.2)),
+                                                 to (shade (@button_bg_color, 
1.06)));
}

.button.default:hover {
@@ -438,6 +436,23 @@ GtkComboBox.combobox-entry .button:insensitive,
to (shade (@button_bg_color, 1.06)));
}

+.button.default:focused {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (mix (shade (@bg_color, 1.12), shade 
(@selected_bg_color, 0.65),0.2)),
+                                     to (mix (shade (@bg_color, 0.92), shade 
(@selected_bg_color, 0.65),0.2)));
+    -unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
+                                                 from (alpha (mix (shade 
(@button_bg_color, 0.58), shade (@selected_bg_color, 0.35),0.3), 0.3)),
+                                                 to (alpha (mix (shade 
(@button_bg_color, 0.58), shade (@selected_bg_color, 0.35),0.3), 0.3)));
+    -unico-outer-stroke-width: 1;
+    -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
+                                           from (alpha (shade 
(@selected_bg_color, 0.4),0.8)),
+                                           to (alpha (shade 
(@selected_bg_color, 0.3),0.9)));
+
+    -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
+                                                 from (shade 
(@button_bg_color, 1.2)),
+                                                 to (shade (@button_bg_color, 
1.06)));
+}
+
.button.default:insensitive {
-unico-glow-radius: 0;
-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
@@ -888,47 +903,40 @@ GtkIconView.view.cell:selected:focused {
padding: 0;
background-image: none;
background-color: @dark_bg_color;
-       border-color: shade (@dark_bg_color,0.5);
+       border-color: shade (@dark_bg_color,0.6);
color: @selected_fg_color;
-       border-width: 1 1 1 1;
+       border-width: 1;
border-style: solid;
}

/* menuitem */
.menuitem {
-       padding: 2;
+       padding: 4 0 4 0;
border-width: 1;
border-radius: 0;
border-style: solid;
+       border-color: shade (@dark_bg_color,0.3);
+       color: @selected_fg_color;
background-image: -gtk-gradient (linear, left top, left bottom,
from (shade (@menuitem_background_a, 1.0)),
to (shade (@menuitem_background_b, 1.0)));

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

-.menuitem:active {
-       color: @selected_fg_color;
-}
-
-.menuitem:prelight {
+.menuitem:hover,
+.menuitem *:hover {
background-image: -gtk-gradient (linear, left top, left bottom,
-               from (shade (@dark_bg_color, 0.50)),
-               to (shade (@dark_bg_color, 0.40)));
-       background-color: shade (@bg_color_dark,0.5);
+               from (shade (@dark_bg_color, 0.75)),
+               to (shade (@dark_bg_color, 0.5)));
border-style: solid;
-       border-width: 1; /* Keep at 1. Menu gets bumpy otherwise. */
+       border-width: 0;
border-radius: 0;
-       border-color: shade (@dark_bg_color,0.3);
-}
-
-
-
-.menuitem *:prelight {
+       -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left 
bottom,
+                                                 from (shade 
(@dark_bg_color,0.48)),
+                                                 to (shade 
(@dark_bg_color,0.48)));
+       -unico-inner-stroke-width: 1;
color: @selected_fg_color;
text-shadow: none;
}
@@ -967,17 +975,17 @@ GtkIconView.view.cell:selected:focused {
border-width: 1;
}

-.menubar.menuitem {
+.menubar.menuitem,
+.menubar .menuitem {
border-radius: 0;
border-width: 1;
+       padding: 2 6 2 6;
+       color: @fg_color;
}

-.menubar.menuitem {
-       color: @text_color;
-}
-
-.menubar.menuitem:prelight {
-       color: @fg_color;
+.menubar.menuitem:hover,
+.menubar .menuitem *:hover {
+       color: @selected_fg_color;
text-shadow: none;
background-image: -gtk-gradient (linear, left top, left bottom,
from (shade (@dark_bg_color, 0.70)),
@@ -1403,7 +1411,8 @@ GtkScrolledWindow.frame {

.menuitem.separator {
-GtkMenuItem-horizontal-padding: 0;
-    border-color: shade (@dark_bg_color, 0.96);
+    padding: 2 0 2 0;
+    border-color: shade (@dark_bg_color, 0.86);

-unico-inner-stroke-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
}
@@ -1791,6 +1800,14 @@ GtkHandleBox {
-unico-inner-stroke-gradient: none;
}

+/* secondary toolbar */
+
+.secondary-toolbar.toolbar {
+       border-style: solid;
+       border-bottom-color: shade (@bg_color,0.71);
+       border-width: 0 0 1 0;
+}
+
/* inline-toolbar */
.inline-toolbar.toolbar {
-GtkToolbar-button-relief: normal;
diff --git a/gnome-frugalware/theme/Frugalware/metacity-1/metacity-theme-1.xml 
b/gnome-frugalware/theme/Frugalware/metacity-1/metacity-theme-1.xml
index 25bc49f..f9f49e8 100644
--- a/gnome-frugalware/theme/Frugalware/metacity-1/metacity-theme-1.xml
+++ b/gnome-frugalware/theme/Frugalware/metacity-1/metacity-theme-1.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<metacity_theme>
<info>
-  <name>Frugalware</name>
-  <author>Shimmer-project</author>
+  <name>elementary</name>
+  <author>elementart Art Team (modified by ochosi to work with Greybird 
gtk)</author>
<copyright>GPL</copyright>
<date>November 2009 (modified July 2011)</date>
<description>A pleasant theme built to adapt to many color schemes as well as 
be optimal for both high and low resolution displays.</description>
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to