aboutsummaryrefslogtreecommitdiff
path: root/common/gtk-2.0
diff options
context:
space:
mode:
Diffstat (limited to 'common/gtk-2.0')
-rw-r--r--common/gtk-2.0/assets-dark.svg16
-rw-r--r--common/gtk-2.0/assets-dark/menu_line_h.pngbin147 -> 0 bytes
-rw-r--r--common/gtk-2.0/assets.svg18
-rw-r--r--common/gtk-2.0/assets.txt1
-rw-r--r--common/gtk-2.0/assets/menu_line_h.pngbin147 -> 0 bytes
-rw-r--r--common/gtk-2.0/gtkrc2
-rw-r--r--common/gtk-2.0/gtkrc-dark2
-rw-r--r--common/gtk-2.0/gtkrc-light2
-rw-r--r--common/gtk-2.0/main.rc41
-rw-r--r--common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc50
-rw-r--r--common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc32
11 files changed, 88 insertions, 76 deletions
diff --git a/common/gtk-2.0/assets-dark.svg b/common/gtk-2.0/assets-dark.svg
index 23d7cb5..0a29e78 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="16"
- inkscape:cx="286.02742"
- inkscape:cy="308.98019"
+ inkscape:zoom="8"
+ inkscape:cx="273.6259"
+ inkscape:cy="304.97069"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -5216,15 +5216,5 @@
id="focus-line"
style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.14492753"
inkscape:label="#rect6176-4-2" />
- <image
- y="-179.63782"
- x="275"
- id="menu_line_h"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsRAAALEQF/ZF+RAAAAB3RJTUUH3AcEFBQdwu2NkwAAABpJREFUCNdjfP369X8GBgYGFgYG BkYGBgYGADpPA8ceLzbjAAAAAElFTkSuQmCC "
- style="display:inline;image-rendering:optimizeSpeed"
- preserveAspectRatio="none"
- height="2"
- width="2"
- inkscape:label="#image5761" />
</g>
</svg>
diff --git a/common/gtk-2.0/assets-dark/menu_line_h.png b/common/gtk-2.0/assets-dark/menu_line_h.png
deleted file mode 100644
index 4473190..0000000
--- a/common/gtk-2.0/assets-dark/menu_line_h.png
+++ /dev/null
Binary files differ
diff --git a/common/gtk-2.0/assets.svg b/common/gtk-2.0/assets.svg
index c8c243f..6db0551 100644
--- a/common/gtk-2.0/assets.svg
+++ b/common/gtk-2.0/assets.svg
@@ -565,11 +565,11 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="2"
- inkscape:cx="241.34513"
- inkscape:cy="260.6699"
+ inkscape:zoom="16"
+ inkscape:cx="293.34974"
+ inkscape:cy="302.58131"
inkscape:document-units="px"
- inkscape:current-layer="layer3"
+ inkscape:current-layer="layer1"
showgrid="false"
showborder="false"
inkscape:window-width="1366"
@@ -4287,16 +4287,6 @@
height="2"
width="2"
inkscape:label="#image5750" />
- <image
- y="-179.63782"
- x="279.00043"
- id="menu_line_h"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsRAAALEQF/ZF+RAAAAB3RJTUUH3AcEFBQdwu2NkwAAABpJREFUCNdjfP369X8GBgYGFgYG BkYGBgYGADpPA8ceLzbjAAAAAElFTkSuQmCC "
- style="image-rendering:optimizeSpeed"
- preserveAspectRatio="none"
- height="2"
- width="2"
- inkscape:label="#image5761" />
<g
id="menuitem"
transform="translate(-7,1.9999974)"
diff --git a/common/gtk-2.0/assets.txt b/common/gtk-2.0/assets.txt
index 9dd86d9..f1b7a1c 100644
--- a/common/gtk-2.0/assets.txt
+++ b/common/gtk-2.0/assets.txt
@@ -82,7 +82,6 @@ handle-h
handle-v
line-h
line-v
-menu_line_h
menuitem
menubar_button
null
diff --git a/common/gtk-2.0/assets/menu_line_h.png b/common/gtk-2.0/assets/menu_line_h.png
deleted file mode 100644
index 4473190..0000000
--- a/common/gtk-2.0/assets/menu_line_h.png
+++ /dev/null
Binary files differ
diff --git a/common/gtk-2.0/gtkrc b/common/gtk-2.0/gtkrc
index 41d9dea..bed8aa4 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\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\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-dark b/common/gtk-2.0/gtkrc-dark
index 41d9dea..ffc084f 100644
--- a/common/gtk-2.0/gtkrc-dark
+++ b/common/gtk-2.0/gtkrc-dark
@@ -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\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\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-light
index 802be17..d975e60 100644
--- a/common/gtk-2.0/gtkrc-light
+++ b/common/gtk-2.0/gtkrc-light
@@ -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\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\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/main.rc b/common/gtk-2.0/main.rc
index 66d8a49..b798394 100644
--- a/common/gtk-2.0/main.rc
+++ b/common/gtk-2.0/main.rc
@@ -81,13 +81,13 @@ style "default" {
fg[NORMAL] = @text_color
fg[PRELIGHT] = @fg_color
fg[SELECTED] = @selected_fg_color
- fg[INSENSITIVE] = darker (@bg_color)
+ fg[INSENSITIVE] = @insensitive_fg_color
fg[ACTIVE] = @fg_color
text[NORMAL] = @text_color
text[PRELIGHT] = @text_color
text[SELECTED] = @selected_fg_color
- text[INSENSITIVE] = darker (@bg_color)
+ text[INSENSITIVE] = @insensitive_fg_color
text[ACTIVE] = @selected_fg_color
base[NORMAL] = @base_color
@@ -683,7 +683,7 @@ style "menu" {
GtkMenuItem::arrow-scaling = 0.4
- bg[NORMAL] = shade (1.08, @bg_color)
+ bg[NORMAL] = @base_color
bg[INSENSITIVE] = @base_color
bg[PRELIGHT] = @base_color
@@ -691,7 +691,7 @@ style "menu" {
image {
function = HLINE
- file = "assets/menu_line_h.png"
+ file = "assets/null.png"
border = { 0, 0, 0, 0 }
stretch = TRUE
}
@@ -2224,7 +2224,7 @@ style "inline_toolbar" {
style "notebook_viewport" {
- bg[NORMAL] = "#fcfcfc"
+ bg[NORMAL] = @notebook_bg
}
style "tooltips" {
@@ -2297,25 +2297,6 @@ style "xfwm-tabwin-button" {
}
# Chromium
-style "chrome-gtk-frame" {
-
- ChromeGtkFrame::frame-color = "#e7e8eb"
- ChromeGtkFrame::inactive-frame-color = "#e7e8eb"
-
- ChromeGtkFrame::frame-gradient-size = 0
- ChromeGtkFrame::frame-gradient-color = shade(0.5, @bg_color)
-
- ChromeGtkFrame::incognito-frame-color = shade(0.85, @bg_color)
- ChromeGtkFrame::incognito-inactive-frame-color = @bg_color
-
- ChromeGtkFrame::incognito-frame-gradient-color = @bg_color
-
- ChromeGtkFrame::scrollbar-trough-color = shade(0.912, @bg_color)
- ChromeGtkFrame::scrollbar-slider-prelight-color = shade(1.04, @bg_color)
- ChromeGtkFrame::scrollbar-slider-normal-color = @bg_color
-
-}
-
style "chrome_menu_item" {
bg[SELECTED] = @selected_bg_color
@@ -2327,16 +2308,6 @@ style "text" {
engine "murrine" { textstyle = 0 }
}
-# Text Style Menubar
-style "menubar-text" {
-
- engine "murrine" {
- text_shade = 0.0
- textstyle = 2
- }
-}
-
-
style "null" {
engine "pixmap" {
@@ -2405,7 +2376,6 @@ widget "*xchat-inputbox" style "entry
widget_class "*<GimpToolbox>*<GtkFrame>" style "gimp_toolbox_frame"
# Chrome/Chromium
-class "ChromeGtkFrame" style "chrome-gtk-frame"
widget_class "*Chrom*Button*" style "button"
widget_class "*<GtkCustomMenu>*<GtkCustomMenuItem>*" style "chrome_menu_item"
@@ -2433,6 +2403,5 @@ widget "xfwm4-tabwin*GtkButton*" style "xfwm-
# Fixes ugly text shadows for insensitive text
widget_class "*<GtkLabel>" style "text"
widget_class "*<GtkComboBox>*<GtkCellLayout>" style "text"
-widget_class "*<GtkMenuBar>*<GtkMenuItem>*<GtkAccelLabel>" style "menubar-text"
widget_class "*<GtkNotebook>*<GtkLabel>" style "text"
widget_class "*<GtkNotebook>*<GtkCellLayout>" style "text"
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 e1ae2d9..956d674 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
+++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
@@ -1,9 +1,9 @@
style "menubar" {
- bg[NORMAL] = "#e7e8eb"
- fg[NORMAL] = "#70788d"
- fg[SELECTED] = @fg_color
- fg[INSENSITIVE] = shade(1.3, "#70788d")
+ bg[NORMAL] = "#2e333b"
+ fg[NORMAL] = "#afb8c5"
+ fg[SELECTED] = @selected_fg_color
+ fg[INSENSITIVE] = shade(0.7, "#afb8c5")
xthickness = 0
ythickness = 0
@@ -21,10 +21,10 @@ style "menubar" {
style "menubar-borderless" {
- bg[NORMAL] = "#e7e8eb"
- fg[NORMAL] = "#70788d"
- fg[SELECTED] = @fg_color
- fg[INSENSITIVE] = shade(1.3, "#70788d")
+ bg[NORMAL] = "#2e333b"
+ fg[NORMAL] = "#afb8c5"
+ fg[SELECTED] = @selected_fg_color
+ fg[INSENSITIVE] = shade(0.7, "#afb8c5")
xthickness = 0
ythickness = 0
@@ -45,7 +45,7 @@ style "menubar_item" {
xthickness = 2
ythickness = 4
- fg[PRELIGHT] = @fg_color
+ fg[PRELIGHT] = @selected_fg_color
engine "pixmap" {
@@ -59,6 +59,15 @@ style "menubar_item" {
}
}
+# Text Style Menubar
+style "menubar-text" {
+
+ engine "murrine" {
+ text_shade = 0.0
+ textstyle = 0
+ }
+}
+
style "toolbar_entry" {
xthickness = 6
@@ -113,12 +122,35 @@ style "toolbar_entry" {
}
}
+#Chromium
+style "chrome-gtk-frame" {
+
+ ChromeGtkFrame::frame-color = "#2e333b"
+ ChromeGtkFrame::inactive-frame-color = "#2e333b"
+
+ ChromeGtkFrame::frame-gradient-size = 0
+ ChromeGtkFrame::frame-gradient-color = shade(0.5, @bg_color)
+
+ ChromeGtkFrame::incognito-frame-color = shade(0.85, @bg_color)
+ ChromeGtkFrame::incognito-inactive-frame-color = @bg_color
+
+ ChromeGtkFrame::incognito-frame-gradient-color = @bg_color
+
+ ChromeGtkFrame::scrollbar-trough-color = shade(0.912, @bg_color)
+ ChromeGtkFrame::scrollbar-slider-prelight-color = shade(1.04, @bg_color)
+ ChromeGtkFrame::scrollbar-slider-normal-color = @bg_color
+
+}
+
widget_class "*<GtkMenuBar>*" style "menubar"
widget_class "*<GtkMenuBar>.<GtkMenuItem>*" style "menubar_item"
widget_class "*ThunarWindow*<GtkToolbar>" style "menubar"
widget_class "*CajaNavigationWindow*<GtkToolbar>" style "menubar"
+class "ChromeGtkFrame" style "chrome-gtk-frame"
+
+widget_class "*<GtkMenuBar>*<GtkMenuItem>*<GtkAccelLabel>" style "menubar-text"
# Whitelist for dark toolbars
widget_class "*ThunarWindow*<GtkMenuBar>" style "menubar-borderless"
diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
index 9a4a4e7..269a2a6 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
+++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
@@ -59,6 +59,15 @@ style "menubar_item" {
}
}
+# Text Style Menubar
+style "menubar-text" {
+
+ engine "murrine" {
+ text_shade = 0.0
+ textstyle = 0
+ }
+}
+
style "toolbar_entry" {
xthickness = 6
@@ -113,12 +122,35 @@ style "toolbar_entry" {
}
}
+#Chromium
+style "chrome-gtk-frame" {
+
+ ChromeGtkFrame::frame-color = "#e7e8eb"
+ ChromeGtkFrame::inactive-frame-color = "#e7e8eb"
+
+ ChromeGtkFrame::frame-gradient-size = 0
+ ChromeGtkFrame::frame-gradient-color = shade(0.5, @bg_color)
+
+ ChromeGtkFrame::incognito-frame-color = shade(0.85, @bg_color)
+ ChromeGtkFrame::incognito-inactive-frame-color = @bg_color
+
+ ChromeGtkFrame::incognito-frame-gradient-color = @bg_color
+
+ ChromeGtkFrame::scrollbar-trough-color = shade(0.912, @bg_color)
+ ChromeGtkFrame::scrollbar-slider-prelight-color = shade(1.04, @bg_color)
+ ChromeGtkFrame::scrollbar-slider-normal-color = @bg_color
+
+}
+
widget_class "*<GtkMenuBar>*" style "menubar"
widget_class "*<GtkMenuBar>.<GtkMenuItem>*" style "menubar_item"
widget_class "*ThunarWindow*<GtkToolbar>" style "menubar"
widget_class "*CajaNavigationWindow*<GtkToolbar>" style "menubar"
+class "ChromeGtkFrame" style "chrome-gtk-frame"
+
+widget_class "*<GtkMenuBar>*<GtkMenuItem>*<GtkAccelLabel>" style "menubar-text"
# Whitelist for dark toolbars
widget_class "*ThunarWindow*<GtkMenuBar>" style "menubar-borderless"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 22:56:49 +0000