From bb6da0fa7c9d49be02aa56b9481825a0d7b61ce4 Mon Sep 17 00:00:00 2001
From: Satyajit Sahoo <satyajit.happy@gmail.com>
Date: Wed, 10 Apr 2013 15:43:55 +0530
Subject: [PATCH 1/5] Remove border from toolbar
---
gtk-3.0/gtk-widgets.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index 9e79994..d41bd98 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -1686,7 +1686,7 @@ GtkTextView {
-GtkWidget-window-dragging: true;
padding: 3px;
- border-width: 1px 0 1px 0;
+ border-width: 0 0 1px 0;
border-style: solid;
border-color: shade(@toolbar_bg_color, 0.8);
background-color: @toolbar_bg_color;
From 4bc0027f563da39b77e808e628fda01ccd0f75f8 Mon Sep 17 00:00:00 2001
From: Satyajit Sahoo <satyajit.happy@gmail.com>
Date: Wed, 10 Apr 2013 16:03:47 +0530
Subject: [PATCH 2/5] Tweak dynamic notebook
---
gtk-3.0/apps/granite-widgets.css | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gtk-3.0/apps/granite-widgets.css b/gtk-3.0/apps/granite-widgets.css
index 08d2342..507fe0a 100644
--- a/gtk-3.0/apps/granite-widgets.css
+++ b/gtk-3.0/apps/granite-widgets.css
@@ -13,12 +13,12 @@
.dynamic-notebook .notebook {
-GtkNotebook-tab-overlap: 3px;
- -GtkNotebook-initial-gap: 5px;
+ -GtkNotebook-initial-gap: 12px;
border-width: 1px 0 0 0;
border-color: shade(@theme_bg_color, 0.8);
border-radius: 0;
- padding: 1px 0 0 0;
+ padding: 0;
}
.dynamic-notebook .notebook tab {
From 73104e1e59b9c681eb235a40dc2db8a860897e8b Mon Sep 17 00:00:00 2001
From: Satyajit Sahoo <satyajit.happy@gmail.com>
Date: Thu, 18 Apr 2013 01:37:08 +0530
Subject: [PATCH 3/5] Initial GTK 3.8 support
---
gtk-3.0/gtk-widgets.css | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index d41bd98..0a3a634 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -869,7 +869,7 @@ GtkComboBox .menu {
.menubar {
-GtkWidget-window-dragging: true;
- border-width: 0;
+ border-style: none;
background-color: @menubar_bg_color;
background-image: none;
color: @menubar_fg_color;
@@ -880,8 +880,11 @@ GtkComboBox .menu {
***************/
.menubar.menuitem,
.menubar .menuitem {
- padding: 3px;
- border-width: 1px 1px 0 1px;
+ padding: 3px 5px;
+ border-style: none;
+ background-color: @menubar_bg_color;
+ background-image: none;
+ color: @menubar_fg_color;
}
.menubar.menuitem:hover,
@@ -910,9 +913,11 @@ GtkTreeMenu .menuitem * {
.menuitem,
.menu .menuitem {
padding: 3px;
- border-width: 1px;
- border-style: solid;
+ border-style: none;
border-radius: 0;
+ background-color: @menu_bg_color;
+ background-image: none;
+ color: @menu_fg_color;
}
.menu .menuitem:active,
From c323e6c83c66204823af98e36bd617676973bc0b Mon Sep 17 00:00:00 2001
From: Satyajit Sahoo <satyajit.happy@gmail.com>
Date: Thu, 18 Apr 2013 01:40:58 +0530
Subject: [PATCH 4/5] Increase width of pixmaps to fix bug
---
xfwm4/title-1-active.xpm | 52 +++++++++++++++++++-------------------
xfwm4/title-1-inactive.xpm | 52 +++++++++++++++++++-------------------
xfwm4/title-2-active.xpm | 52 +++++++++++++++++++-------------------
xfwm4/title-2-inactive.xpm | 52 +++++++++++++++++++-------------------
xfwm4/title-3-active.xpm | 52 +++++++++++++++++++-------------------
xfwm4/title-3-inactive.xpm | 52 +++++++++++++++++++-------------------
xfwm4/title-4-active.xpm | 52 +++++++++++++++++++-------------------
xfwm4/title-4-inactive.xpm | 52 +++++++++++++++++++-------------------
xfwm4/title-5-active.xpm | 52 +++++++++++++++++++-------------------
xfwm4/title-5-inactive.xpm | 52 +++++++++++++++++++-------------------
10 files changed, 260 insertions(+), 260 deletions(-)
diff --git a/xfwm4/title-1-active.xpm b/xfwm4/title-1-active.xpm
index dafd8ae..c6327b7 100644
--- a/xfwm4/title-1-active.xpm
+++ b/xfwm4/title-1-active.xpm
@@ -1,31 +1,31 @@
/* XPM */
static char * title_1_active_xpm[] = {
-"1 25 3 1",
+"2 25 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
-".",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+"};
+"..",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++"};
diff --git a/xfwm4/title-1-inactive.xpm b/xfwm4/title-1-inactive.xpm
index f2da5b3..8dd5b2e 100644
--- a/xfwm4/title-1-inactive.xpm
+++ b/xfwm4/title-1-inactive.xpm
@@ -1,31 +1,31 @@
/* XPM */
static char * title_1_inactive_xpm[] = {
-"1 25 3 1",
+"2 25 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
-".",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+"};
+"..",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++"};
diff --git a/xfwm4/title-2-active.xpm b/xfwm4/title-2-active.xpm
index a2bd671..2c8b5fb 100644
--- a/xfwm4/title-2-active.xpm
+++ b/xfwm4/title-2-active.xpm
@@ -1,31 +1,31 @@
/* XPM */
static char * title_2_active_xpm[] = {
-"1 25 3 1",
+"2 25 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
-".",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+"};
+"..",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++"};
diff --git a/xfwm4/title-2-inactive.xpm b/xfwm4/title-2-inactive.xpm
index ac1e11a..cf5c533 100644
--- a/xfwm4/title-2-inactive.xpm
+++ b/xfwm4/title-2-inactive.xpm
@@ -1,31 +1,31 @@
/* XPM */
static char * title_2_inactive_xpm[] = {
-"1 25 3 1",
+"2 25 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
-".",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+"};
+"..",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++"};
diff --git a/xfwm4/title-3-active.xpm b/xfwm4/title-3-active.xpm
index 2119dda..3864cac 100644
--- a/xfwm4/title-3-active.xpm
+++ b/xfwm4/title-3-active.xpm
@@ -1,31 +1,31 @@
/* XPM */
static char * title_3_active_xpm[] = {
-"1 25 3 1",
+"2 25 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
-".",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+"};
+"..",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++"};
diff --git a/xfwm4/title-3-inactive.xpm b/xfwm4/title-3-inactive.xpm
index 8c28bcc..2b97787 100644
--- a/xfwm4/title-3-inactive.xpm
+++ b/xfwm4/title-3-inactive.xpm
@@ -1,31 +1,31 @@
/* XPM */
static char * title_3_inactive_xpm[] = {
-"1 25 3 1",
+"2 25 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
-".",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+"};
+"..",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++"};
diff --git a/xfwm4/title-4-active.xpm b/xfwm4/title-4-active.xpm
index 13d7fee..10f1bcc 100644
--- a/xfwm4/title-4-active.xpm
+++ b/xfwm4/title-4-active.xpm
@@ -1,31 +1,31 @@
/* XPM */
static char * title_4_active_xpm[] = {
-"1 25 3 1",
+"2 25 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
-".",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+"};
+"..",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++"};
diff --git a/xfwm4/title-4-inactive.xpm b/xfwm4/title-4-inactive.xpm
index 42627ea..95cc0e6 100644
--- a/xfwm4/title-4-inactive.xpm
+++ b/xfwm4/title-4-inactive.xpm
@@ -1,31 +1,31 @@
/* XPM */
static char * title_4_inactive_xpm[] = {
-"1 25 3 1",
+"2 25 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
-".",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+"};
+"..",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++"};
diff --git a/xfwm4/title-5-active.xpm b/xfwm4/title-5-active.xpm
index 7936fc7..1d4c0f8 100644
--- a/xfwm4/title-5-active.xpm
+++ b/xfwm4/title-5-active.xpm
@@ -1,31 +1,31 @@
/* XPM */
static char * title_5_active_xpm[] = {
-"1 25 3 1",
+"2 25 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
-".",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+"};
+"..",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++"};
diff --git a/xfwm4/title-5-inactive.xpm b/xfwm4/title-5-inactive.xpm
index 0a3c98b..98158f1 100644
--- a/xfwm4/title-5-inactive.xpm
+++ b/xfwm4/title-5-inactive.xpm
@@ -1,31 +1,31 @@
/* XPM */
static char * title_5_inactive_xpm[] = {
-"1 25 3 1",
+"2 25 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
-".",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+",
-"+"};
+"..",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++",
+"++"};
From ecdef7ee9e18f84159bb1860a0638d142544147b Mon Sep 17 00:00:00 2001
From: Satyajit Sahoo <satyajit.happy@gmail.com>
Date: Sun, 21 Apr 2013 22:45:47 +0530
Subject: [PATCH 5/5] Various fixes
---
gtk-3.0/gtk-widgets.css | 120 +++++++++++++++++++---------------------
1 file changed, 58 insertions(+), 62 deletions(-)
diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index 0a3a634..ff1e1ba 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -70,33 +70,13 @@
* base states *
***************/
GtkWindow {
- color: @theme_fg_color;
+ color: @fg_color;
}
* {
- background-color: @theme_bg_color;
+ /* inherit the color from parent by default */
color: inherit;
-}
-
-*:insensitive,
-*:insensitive:insensitive {
- color: mix(@theme_fg_color, @theme_bg_color, 0.5);
-}
-
-*:active {
- background-color: shade(@theme_bg_color, 0.85);
-}
-
-*:active:hover:insensitive {
-}
-
-*:active:insensitive {
-}
-
-*:hover {
-}
-
-*:hover:insensitive {
+ background-color: @bg_color;
}
*:selected,
@@ -105,11 +85,58 @@ GtkWindow {
color: @theme_selected_fg_color;
}
+*:active {
+ background-color: shade(@theme_bg_color, 0.85);
+}
+
+*:insensitive,
+*:insensitive:insensitive {
+ color: mix(@theme_fg_color, @theme_bg_color, 0.5);
+}
+
.background {
color: @theme_fg_color;
background-color: @theme_bg_color;
}
+.background.client-decorated {
+ background-color: transparent;
+}
+
+.background.window-content {
+ background-color: @theme_bg_color;
+}
+
+GtkClutterOffscreen {
+ background-color: @theme_bg_color;
+ color: @theme_fg_color;
+}
+
+.gtkstyle-fallback {
+ background-color: @theme_bg_color;
+ color: @theme_fg_color;
+}
+
+.gtkstyle-fallback:prelight {
+ background-color: shade(@theme_bg_color, 1.1);
+ color: @theme_fg_color;
+}
+
+.gtkstyle-fallback:active {
+ background-color: shade(@theme_bg_color, 0.9);
+ color: @theme_fg_color;
+}
+
+.gtkstyle-fallback:insensitive {
+ background-color: shade(shade(@theme_bg_color, 0.95), 1.05);
+ color: mix(@theme_fg_color, @theme_bg_color, 0.5);
+}
+
+.gtkstyle-fallback:selected {
+ background-color: @theme_selected_bg_color;
+ color: @theme_selected_fg_color;
+}
+
/******************
* common effects *
******************/
@@ -174,14 +201,6 @@ GtkAssistant .sidebar {
color: mix(@theme_fg_color, @theme_bg_color, 0.1);
}
-/**************
- * background *
- **************/
-.background {
- border-width: 0;
- background-color: @theme_bg_color;
-}
-
/**********
* button *
**********/
@@ -717,34 +736,6 @@ GtkInfoBar {
color: @error_fg_color;
}
-/************
- * gtkstyle *
- ************/
-.gtkstyle-fallback {
- background-color: @theme_bg_color;
- color: @theme_fg_color;
-}
-
-.gtkstyle-fallback:prelight {
- background-color: shade(@theme_bg_color, 1.1);
- color: @theme_fg_color;
-}
-
-.gtkstyle-fallback:active {
- background-color: shade(@theme_bg_color, 0.9);
- color: @theme_fg_color;
-}
-
-.gtkstyle-fallback:insensitive {
- background-color: shade(shade(@theme_bg_color, 0.95), 1.05);
- color: mix(@theme_fg_color, @theme_bg_color, 0.5);
-}
-
-.gtkstyle-fallback:selected {
- background-color: @theme_selected_bg_color;
- color: @theme_selected_fg_color;
-}
-
/*******************
* symbolic images *
*******************/
@@ -881,7 +872,9 @@ GtkComboBox .menu {
.menubar.menuitem,
.menubar .menuitem {
padding: 3px 5px;
- border-style: none;
+ border-style: solid;
+ border-width: 1px;
+ border-color: transparent;
background-color: @menubar_bg_color;
background-image: none;
color: @menubar_fg_color;
@@ -913,7 +906,9 @@ GtkTreeMenu .menuitem * {
.menuitem,
.menu .menuitem {
padding: 3px;
- border-style: none;
+ border-style: solid;
+ border-width: 1px;
+ border-color: transparent;
border-radius: 0;
background-color: @menu_bg_color;
background-image: none;
@@ -923,7 +918,6 @@ GtkTreeMenu .menuitem * {
.menu .menuitem:active,
.menu .menuitem:hover {
border-color: shade(@theme_selected_bg_color, 0.9);
- border-radius: 0;
background-color: @theme_selected_bg_color;
background-image: none;
}
@@ -1394,6 +1388,8 @@ GtkScrolledWindow GtkViewport.frame {
-GtkMenuItem-horizontal-padding: 0;
-GtkWidget-separator-height: 1;
+ padding: 0;
+
border-image: -gtk-gradient(linear,
left top, left bottom,
from (shade(@menu_bg_color, 0.9)),