From 30777fc7a82df1d7c4fbeaba153744c31ecb4c5e Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 8 Jul 2015 21:30:55 +0200 Subject: [PATCH] gtk2 tweaks --- common/gtk-2.0/apps.rc | 8 +-- common/gtk-2.0/assets-dark.svg | 14 ++--- common/gtk-2.0/assets-dark/line-h.png | Bin 151 -> 151 bytes common/gtk-2.0/assets-dark/line-v.png | Bin 151 -> 151 bytes .../assets-dark/toolbar-entry-border-bg.png | Bin 696 -> 815 bytes .../toolbar-entry-border-disabled-bg.png | Bin 580 -> 693 bytes common/gtk-2.0/gtkrc | 4 +- common/gtk-2.0/gtkrc-dark | 2 +- common/gtk-2.0/{gtkrc-light => gtkrc-darker} | 4 +- common/gtk-2.0/main.rc | 50 +++++++++--------- .../menubar-toolbar/menubar-toolbar-dark.rc | 13 +++-- .../menubar-toolbar/menubar-toolbar.rc | 5 ++ .../toolbar-entry-border-bg-dark.png | Bin 696 -> 815 bytes .../toolbar-entry-border-disabled-bg-dark.png | Bin 580 -> 693 bytes 14 files changed, 55 insertions(+), 45 deletions(-) rename common/gtk-2.0/{gtkrc-light => gtkrc-darker} (78%) 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" /> + 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" /> + 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" /> `@-3Yq`_ diff --git a/common/gtk-2.0/assets-dark/line-v.png b/common/gtk-2.0/assets-dark/line-v.png index ddd17cd13096a5c416b18417749a5a7d1e644645..51b37c8b1ad98b6b93697da23c4a4f6aca412f91 100644 GIT binary patch delta 40 tcmbQvIGu4qnWBN=_TT3Z0KpLkRtAYVjH?$qFxN5wfv2mV%Q~loCICt_4z>UQ delta 40 tcmbQvIGu4qnc@XggWu;50KpLkRt9lf#;F==V&V)y;OXk;vd$@?2>>}N4R-(l 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 28829095c68a96755aa50456bf0bab18ca3b90ca..3849377ce52f9457cccba43a5b3ae90b6e05a32f 100644 GIT binary patch delta 717 zcmV;;0y6!$1+NB>Zhx#vL_t(YiLKUMOBF#F2k`&S?Ci|CdyaN366o@^{f}jbbb$>2|v&}hwDTK3v6kl31 zCyCPO*yx!sXbwx|TE1Tecz(xN$3BgY5QbqY9Ch!a z2mtJCtuF~F?|+BEAsHQ=4P``V9_;6?QVY9{jn#`HMRpq-t4g^G&4c~CxHuh95H#UP z`F3Y(ed)4Dk)PY^&xIr32SKwFA|e>AGlx0zS4D~lPs|w|NZL7650|3T2pv-vLP>O8AV!RD;ZX-|PM`c5>vT2*!ZAeOmJj-UvcG84q zq*A9KrH~}?aJ@d!UluYnIy#UfW=Kl64ROvPm1`M_uUvkLP(&}3a;>62ozyztuOf-f z)Zp;=+<#S(!P?k-9GeGTrF!!11Y(?_+S_Mo9V}k2-MW2Qq*l8*sZIE_(tFL~tli!_ z`jJ#FJio#dqd(Pdj9s|E4i1mZ9hvx}=U2FDU4kNATe)!52jSVXjkUGCZots!=m15u z6vyV_f4A}?$B&akXnm9mAsaU1ufW*5Jn8ui07jNLx&vg>X-bci#MG2@Ex%F)JLffY zE_52yIzns=h*D6ic5%+ZxeZ53DAjZB>!-*cTdg$BC=S*900000NkvXXu0mjfREk|d delta 597 zcmV-b0;>J52Dk-~ZhtjNL_t(YiLKVpPSj8s1@LpeJDP#$6A)I)(is`4p-w{LE64^y z@ZAiFjxq8ECPsltW3U<26)e#wFor+vcU;W0P{NE3^ep->>HYQI_I|f)FLi|p5d=t( z5BHUjAPE>ja8fg9j28qcha4hsNaH)uc98Mw@J@9gUxBo$41WtSk_;H<@!B3q@H`i3 zI{~(qrn|o;J#9OV=X9!`TwR)xX8(qy9B|KN;pMme{_9D=)wC9$twH$~%oX`(% zXY>$FivYkuy4R!ZDcp0pkAX(Rm4lmuK|h@qDKZ%JQ_wc$E?gR`5|SJwKmACP-c6Ar z2WkHe4ZHHZ3V#WLT+SvpZi^I|xr22{DyGD+M-pH-9Q6A?>w=ObIVN$W%aB~4uw55Y zM8<8%FCahw>_goU#gE1JP!64+&wj5P^0V2r`i>@-sT(KU|I;X%9t|DQXr8p{hWy;y z8ug-tJkOrj4MAMts7nT5Sn7e*+9AhkQS(MyLc&5jj(_LsGNLG&m;6CV002SINS*4| z<)_GLW^c``To21yM+V5f+ggm*Z;L$YbT=d|(?WUeqIwgc1wy{nZpVu^MOv-p4n2Ft z(5OtB%6ddIz$}RV<#A_u>H^zZiq{d8z$}o}$$9NkE_cXtk+wH;S8GX<98UtGD4IXZ zLeHg`!A?m2$5MWw0rDI!myt(;y+`oRI=QzG0Brt#f}AS^Uby@rX*8Sm=cED(k^uSe jxVRAj$k8v?c%aB%&+H8C;(lFc00000NkvXXu0mjfr-&fz 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 1267825a34f26c3db3db42bb2f14048d5b72464f..227548c7698e356386328154802da013db13ec51 100644 GIT binary patch delta 595 zcmV-Z0<8VS1hoZ_ZGQqXNkl=gb<$>;hxD_a3~15R#MWDSbcU;r@nJ8^+q5Z+5Plb0o*e`Q?vKOSUoE za(?lX6azV@w?(a0ybqk7U7(~oSh7M%#p&4v-g{cxwevej~QQO*UHH7Nn4P^1)( zE-ED=mzgX9l-Bq#Ke}i>_b9D5B4ac$hIMfrgH|gk1%He&8<7war8LjO)6qo3@QBiC zJ)hQD*Ez?0{&JL9r5JeebL>_VSc`-ZIOlk{zoC3118XTfJlx_shuoUBJ9VVB!Pt(w zn=4WZ2TM})+}>Sbx(;o2r|hcex-{C(aW00000NkvXXu0mjf0F&*h 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 similarity index 78% rename from common/gtk-2.0/gtkrc-light rename to 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 28829095c68a96755aa50456bf0bab18ca3b90ca..3849377ce52f9457cccba43a5b3ae90b6e05a32f 100644 GIT binary patch delta 717 zcmV;;0y6!$1+NB>Zhx#vL_t(YiLKUMOBF#F2k`&S?Ci|CdyaN366o@^{f}jbbb$>2|v&}hwDTK3v6kl31 zCyCPO*yx!sXbwx|TE1Tecz(xN$3BgY5QbqY9Ch!a z2mtJCtuF~F?|+BEAsHQ=4P``V9_;6?QVY9{jn#`HMRpq-t4g^G&4c~CxHuh95H#UP z`F3Y(ed)4Dk)PY^&xIr32SKwFA|e>AGlx0zS4D~lPs|w|NZL7650|3T2pv-vLP>O8AV!RD;ZX-|PM`c5>vT2*!ZAeOmJj-UvcG84q zq*A9KrH~}?aJ@d!UluYnIy#UfW=Kl64ROvPm1`M_uUvkLP(&}3a;>62ozyztuOf-f z)Zp;=+<#S(!P?k-9GeGTrF!!11Y(?_+S_Mo9V}k2-MW2Qq*l8*sZIE_(tFL~tli!_ z`jJ#FJio#dqd(Pdj9s|E4i1mZ9hvx}=U2FDU4kNATe)!52jSVXjkUGCZots!=m15u z6vyV_f4A}?$B&akXnm9mAsaU1ufW*5Jn8ui07jNLx&vg>X-bci#MG2@Ex%F)JLffY zE_52yIzns=h*D6ic5%+ZxeZ53DAjZB>!-*cTdg$BC=S*900000NkvXXu0mjfREk|d delta 597 zcmV-b0;>J52Dk-~ZhtjNL_t(YiLKVpPSj8s1@LpeJDP#$6A)I)(is`4p-w{LE64^y z@ZAiFjxq8ECPsltW3U<26)e#wFor+vcU;W0P{NE3^ep->>HYQI_I|f)FLi|p5d=t( z5BHUjAPE>ja8fg9j28qcha4hsNaH)uc98Mw@J@9gUxBo$41WtSk_;H<@!B3q@H`i3 zI{~(qrn|o;J#9OV=X9!`TwR)xX8(qy9B|KN;pMme{_9D=)wC9$twH$~%oX`(% zXY>$FivYkuy4R!ZDcp0pkAX(Rm4lmuK|h@qDKZ%JQ_wc$E?gR`5|SJwKmACP-c6Ar z2WkHe4ZHHZ3V#WLT+SvpZi^I|xr22{DyGD+M-pH-9Q6A?>w=ObIVN$W%aB~4uw55Y zM8<8%FCahw>_goU#gE1JP!64+&wj5P^0V2r`i>@-sT(KU|I;X%9t|DQXr8p{hWy;y z8ug-tJkOrj4MAMts7nT5Sn7e*+9AhkQS(MyLc&5jj(_LsGNLG&m;6CV002SINS*4| z<)_GLW^c``To21yM+V5f+ggm*Z;L$YbT=d|(?WUeqIwgc1wy{nZpVu^MOv-p4n2Ft z(5OtB%6ddIz$}RV<#A_u>H^zZiq{d8z$}o}$$9NkE_cXtk+wH;S8GX<98UtGD4IXZ zLeHg`!A?m2$5MWw0rDI!myt(;y+`oRI=QzG0Brt#f}AS^Uby@rX*8Sm=cED(k^uSe jxVRAj$k8v?c%aB%&+H8C;(lFc00000NkvXXu0mjfr-&fz 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 1267825a34f26c3db3db42bb2f14048d5b72464f..227548c7698e356386328154802da013db13ec51 100644 GIT binary patch delta 595 zcmV-Z0<8VS1hoZ_ZGQqXNkl=gb<$>;hxD_a3~15R#MWDSbcU;r@nJ8^+q5Z+5Plb0o*e`Q?vKOSUoE za(?lX6azV@w?(a0ybqk7U7(~oSh7M%#p&4v-g{cxwevej~QQO*UHH7Nn4P^1)( zE-ED=mzgX9l-Bq#Ke}i>_b9D5B4ac$hIMfrgH|gk1%He&8<7war8LjO)6qo3@QBiC zJ)hQD*Ez?0{&JL9r5JeebL>_VSc`-ZIOlk{zoC3118XTfJlx_shuoUBJ9VVB!Pt(w zn=4WZ2TM})+}>Sbx(;o2r|hcex-{C(aW00000NkvXXu0mjf0F&*h