gtk2 tweaks

14 files changed, 55 insertions, 45 deletions

diff --git a/common/gtk-2.0/apps.rc b/common/gtk-2.0/apps.rc
index de154bd..f919fe9 100644
--- a/common/gtk-2.0/apps.rc
+++ b/common/gtk-2.0/apps.rc
@@ -4,12 +4,12 @@
 style "thunar-handle" { GtkPaned::handle-size = 2 }
 
 style "dark-sidebar" {
-  GtkTreeView::odd_row_color = "#3c4049"
-  GtkTreeView::even_row_color = "#3c4049"
+  GtkTreeView::odd_row_color = @dark_sidebar_bg
+  GtkTreeView::even_row_color = @dark_sidebar_bg
 
 
-  base[NORMAL] = "#3c4049"
-  base[INSENSITIVE] = "#3c4049"
+  base[NORMAL] = @dark_sidebar_bg
+  base[INSENSITIVE] = @dark_sidebar_bg
 
   text[NORMAL] = "#a8adb5"
   text[ACTIVE] = @selected_fg_color
diff --git a/common/gtk-2.0/assets-dark.svg b/common/gtk-2.0/assets-dark.svg
index 0a29e78..b38a971 100644
--- a/common/gtk-2.0/assets-dark.svg
+++ b/common/gtk-2.0/assets-dark.svg
@@ -565,9 +565,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="273.6259"
-     inkscape:cy="304.97069"
+     inkscape:zoom="1"
+     inkscape:cx="287.14415"
+     inkscape:cy="307.43836"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -4970,7 +4970,7 @@
          height="23"
          width="23"
          id="rect7903-7-1-6"
-         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#181b20;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          ry="11.5" />
     </g>
     <g
@@ -5019,7 +5019,7 @@
            rx="11"
            ry="10.999999" />
         <rect
-           style="display:inline;opacity:0.55;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:0.55;fill:none;fill-opacity:1;stroke:#181b20;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect7903-7-2-3-4"
            width="23"
            height="23"
@@ -5169,7 +5169,7 @@
          height="1"
          width="2"
          id="rect4976-3"
-         style="display:inline;opacity:1;fill:#2d3036;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#34373e;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
     <g
        transform="matrix(-1,0,0,-1,560,-357.27564)"
@@ -5189,7 +5189,7 @@
          height="1"
          width="2"
          id="rect4976-3-6"
-         style="display:inline;opacity:1;fill:#2d3036;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#34373e;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
     <rect
        style="opacity:1;fill:#2d3036;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
diff --git a/common/gtk-2.0/assets-dark/line-h.png b/common/gtk-2.0/assets-dark/line-h.png
index c9f9d9d..452cefe 100644
--- a/common/gtk-2.0/assets-dark/line-h.png
+++ b/common/gtk-2.0/assets-dark/line-h.png
diff --git a/common/gtk-2.0/assets-dark/line-v.png b/common/gtk-2.0/assets-dark/line-v.png
index ddd17cd..51b37c8 100644
--- a/common/gtk-2.0/assets-dark/line-v.png
+++ b/common/gtk-2.0/assets-dark/line-v.png
diff --git a/common/gtk-2.0/assets-dark/toolbar-entry-border-bg.png b/common/gtk-2.0/assets-dark/toolbar-entry-border-bg.png
index 2882909..3849377 100644
--- a/common/gtk-2.0/assets-dark/toolbar-entry-border-bg.png
+++ b/common/gtk-2.0/assets-dark/toolbar-entry-border-bg.png
diff --git a/common/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png b/common/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png
index 1267825..227548c 100644
--- a/common/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png
+++ b/common/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png
diff --git a/common/gtk-2.0/gtkrc b/common/gtk-2.0/gtkrc
index bed8aa4..a3cd47e 100644
--- a/common/gtk-2.0/gtkrc
+++ b/common/gtk-2.0/gtkrc
@@ -1,4 +1,4 @@
-gtk-color-scheme = "base_color:#FFFFFF\nfg_color:#5c616c\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#5294E2\nselected_fg_color:#FFFFFF\ntext_color:#5c616c\nbg_color:#F5F6F7\ninsensitive_bg_color:#fbfcfc\ninsensitive_fg_color:#a9acb2\nnotebook_bg:#FEFEFE\ntooltip_bg_color:#3A4451\nlink_color:#5294E2"
+gtk-color-scheme = "base_color:#FFFFFF\nfg_color:#5c616c\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#5294E2\nselected_fg_color:#FFFFFF\ntext_color:#5c616c\nbg_color:#F5F6F7\ninsensitive_bg_color:#fbfcfc\ninsensitive_fg_color:#a9acb2\nnotebook_bg:#FEFEFE\ndark_sidebar_bg:#3c4049\ntooltip_bg_color:#3A4451\nlink_color:#5294E2"
 
 gtk-icon-sizes = "gtk-button=16,16" # This makes button icons smaller.
 gtk-auto-mnemonics = 1
@@ -7,4 +7,4 @@ gtk-primary-button-warps-slider = 1
 include "main.rc"
 include "apps.rc"
 include "panel.rc"
-include "menubar-toolbar/menubar-toolbar-dark.rc"
+include "menubar-toolbar/menubar-toolbar.rc"
diff --git a/common/gtk-2.0/gtkrc-dark b/common/gtk-2.0/gtkrc-dark
index ffc084f..0be5915 100644
--- a/common/gtk-2.0/gtkrc-dark
+++ b/common/gtk-2.0/gtkrc-dark
@@ -1,4 +1,4 @@
-gtk-color-scheme = "base_color:#383C45\nfg_color:#D3DAE3\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#5294E2\nselected_fg_color:#FFFFFF\ntext_color:#D3DAE3\nbg_color:#444852\ninsensitive_bg_color:#3a3e48\ninsensitive_fg_color:#7c818c\nnotebook_bg:#373B44\ntooltip_bg_color:#3A4451\nlink_color:#5294E2"
+gtk-color-scheme = "base_color:#383C45\nfg_color:#D3DAE3\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#5294E2\nselected_fg_color:#FFFFFF\ntext_color:#D3DAE3\nbg_color:#444852\ninsensitive_bg_color:#3a3e48\ninsensitive_fg_color:#7c818c\nnotebook_bg:#373B44\ndark_sidebar_bg:#454a54\ntooltip_bg_color:#3A4451\nlink_color:#5294E2"
 
 gtk-icon-sizes = "gtk-button=16,16" # This makes button icons smaller.
 gtk-auto-mnemonics = 1
diff --git a/common/gtk-2.0/gtkrc-light b/common/gtk-2.0/gtkrc-darker
index d975e60..80128b2 100644
--- a/common/gtk-2.0/gtkrc-light
+++ b/common/gtk-2.0/gtkrc-darker
@@ -1,4 +1,4 @@
-gtk-color-scheme = "base_color:#FFFFFF\nfg_color:#5c616c\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#5294E2\nselected_fg_color:#FFFFFF\ntext_color:#5c616c\nbg_color:#F5F6F7\ninsensitive_bg_color:#fbfcfc\ninsensitive_fg_color:#a9acb2\nnotebook_bg:#FEFEFE\ntooltip_bg_color:#3A4451\nlink_color:#5294E2"
+gtk-color-scheme = "base_color:#FFFFFF\nfg_color:#5c616c\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#5294E2\nselected_fg_color:#FFFFFF\ntext_color:#5c616c\nbg_color:#F5F6F7\ninsensitive_bg_color:#fbfcfc\ninsensitive_fg_color:#a9acb2\nnotebook_bg:#FEFEFE\ndark_sidebar_bg:#3c4049\ntooltip_bg_color:#3A4451\nlink_color:#5294E2"
 
 gtk-icon-sizes = "gtk-button=16,16" # This makes button icons smaller.
 gtk-auto-mnemonics = 1
@@ -7,4 +7,4 @@ gtk-primary-button-warps-slider = 1
 include "main.rc"
 include "apps.rc"
 include "panel.rc"
-include "menubar-toolbar/menubar-toolbar.rc"
+include "menubar-toolbar/menubar-toolbar-dark.rc"
diff --git a/common/gtk-2.0/main.rc b/common/gtk-2.0/main.rc
index b798394..187a28e 100644
--- a/common/gtk-2.0/main.rc
+++ b/common/gtk-2.0/main.rc
@@ -1650,40 +1650,40 @@ style "standalone_entry" {
   engine "pixmap" {
 
     image {
-    function = FLAT_BOX
-    detail = "entry_bg"
-    state = NORMAL
-    file = "assets/entry-border-fill.png"
-    stretch = TRUE
-    border = { 0, 0, 0, 0 }
+      function = FLAT_BOX
+      detail = "entry_bg"
+      state = NORMAL
+      file = "assets/entry-border-fill.png"
+      stretch = TRUE
+      border = { 0, 0, 0, 0 }
     }
 
     image {
-    function = FLAT_BOX
-    detail = "entry_bg"
-    state = ACTIVE
-    file = "assets/entry-border-fill.png"
-    stretch = TRUE
-    border = { 0, 0, 0, 0 }
+      function = FLAT_BOX
+      detail = "entry_bg"
+      state = ACTIVE
+      file = "assets/entry-border-fill.png"
+      stretch = TRUE
+      border = { 0, 0, 0, 0 }
     }
 
     image {
-    function = SHADOW
-    detail = "entry"
-    state = NORMAL
-    shadow = IN
-    file = "assets/entry-border-bg-solid.png"
-    border = { 12, 12, 12, 12 }
-    stretch = TRUE
+      function = SHADOW
+      detail = "entry"
+      state = NORMAL
+      shadow = IN
+      file = "assets/entry-border-bg-solid.png"
+      border = { 12, 12, 12, 12 }
+      stretch = TRUE
     }
 
     image {
-    function = SHADOW
-    detail = "entry"
-    state = ACTIVE
-    file = "assets/entry-border-active-bg-solid.png"
-    border = { 12, 12, 12, 12 }
-    stretch = TRUE
+      function = SHADOW
+      detail = "entry"
+      state = ACTIVE
+      file = "assets/entry-border-active-bg-solid.png"
+      border = { 12, 12, 12, 12 }
+      stretch = TRUE
     }
   }
 }
diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
index 956d674..79ba282 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
+++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
@@ -1,6 +1,6 @@
 style "menubar" {
 
-  bg[NORMAL] = "#2e333b"
+  bg[NORMAL] = "#2f343b"
   fg[NORMAL] = "#afb8c5"
   fg[SELECTED] = @selected_fg_color
   fg[INSENSITIVE] = shade(0.7, "#afb8c5")
@@ -21,7 +21,7 @@ style "menubar" {
 
 style "menubar-borderless" {
 
-  bg[NORMAL] = "#2e333b"
+  bg[NORMAL] = "#2f343b"
   fg[NORMAL] = "#afb8c5"
   fg[SELECTED] = @selected_fg_color
   fg[INSENSITIVE] = shade(0.7, "#afb8c5")
@@ -71,6 +71,11 @@ style "menubar-text" {
 style "toolbar_entry" {
   xthickness = 6
 
+  base[NORMAL] = "#272b31"
+  base[INSENSITIVE] = "#292e35"
+
+  text[NORMAL] = "#afb8c5"
+
   engine "pixmap" {
 
     image {
@@ -125,8 +130,8 @@ style "toolbar_entry" {
 #Chromium
 style "chrome-gtk-frame" {
 
-  ChromeGtkFrame::frame-color = "#2e333b"
-  ChromeGtkFrame::inactive-frame-color = "#2e333b"
+  ChromeGtkFrame::frame-color = "#2f343b"
+  ChromeGtkFrame::inactive-frame-color = "#2f343b"
 
   ChromeGtkFrame::frame-gradient-size = 0
   ChromeGtkFrame::frame-gradient-color = shade(0.5, @bg_color)
diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
index 269a2a6..4826415 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
+++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
@@ -71,6 +71,11 @@ style "menubar-text" {
 style "toolbar_entry" {
   xthickness = 6
 
+  base[NORMAL] = "#fdfdfd"
+  base[INSENSITIVE] = "#f4f5f6"
+
+  text[NORMAL] = "#70788d"
+
   engine "pixmap" {
 
     image {
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png
index 2882909..3849377 100644
--- a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png
+++ b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png
index 1267825..227548c 100644
--- a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png
+++ b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png