From 5487ba5af545bb0b481ebeafbb6f6811d83d5b41 Mon Sep 17 00:00:00 2001 From: EMH-Mark-I Date: Sun, 23 Feb 2020 20:01:23 -0600 Subject: [PATCH] Update for combobox arrow Fixed combobox arrows so they would appear accurately scaled (also for Libreoffice too.) Applies to GTK3.22 and GTK3.24. This does not apply for the Cinnamon desktop, but only GTK applications. Readjusted the scaling of treeview arrows so they should appear more defined and not blurry. Disabled backdrop theming for toolbar buttons since it not necessary for this theme. --- .../assets/combobox-arrow-down-disabled.png | Bin 0 -> 2439 bytes .../gtk-3.0/assets/combobox-arrow-down.png | Bin 0 -> 1306 bytes .../vcl-combobox-arrow-down-disabled.png | Bin 0 -> 1392 bytes .../assets/vcl-combobox-arrow-down.png | Bin 0 -> 1305 bytes Theme/Chicago95/gtk-3.0/gtk-widgets.css | 67 +++++++--------- .../assets/combobox-arrow-down-disabled.png | Bin 0 -> 2439 bytes .../gtk-3.24/assets/combobox-arrow-down.png | Bin 0 -> 1306 bytes .../vcl-combobox-arrow-down-disabled.png | Bin 0 -> 1392 bytes .../assets/vcl-combobox-arrow-down.png | Bin 0 -> 1305 bytes Theme/Chicago95/gtk-3.24/gtk-widgets.css | 73 ++++++++---------- 10 files changed, 62 insertions(+), 78 deletions(-) create mode 100644 Theme/Chicago95/gtk-3.0/assets/combobox-arrow-down-disabled.png create mode 100644 Theme/Chicago95/gtk-3.0/assets/combobox-arrow-down.png create mode 100644 Theme/Chicago95/gtk-3.0/assets/vcl-combobox-arrow-down-disabled.png create mode 100755 Theme/Chicago95/gtk-3.0/assets/vcl-combobox-arrow-down.png create mode 100644 Theme/Chicago95/gtk-3.24/assets/combobox-arrow-down-disabled.png create mode 100644 Theme/Chicago95/gtk-3.24/assets/combobox-arrow-down.png create mode 100644 Theme/Chicago95/gtk-3.24/assets/vcl-combobox-arrow-down-disabled.png create mode 100755 Theme/Chicago95/gtk-3.24/assets/vcl-combobox-arrow-down.png diff --git a/Theme/Chicago95/gtk-3.0/assets/combobox-arrow-down-disabled.png b/Theme/Chicago95/gtk-3.0/assets/combobox-arrow-down-disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..5b5b2c93841fd559299974df5105737fb41f7647 GIT binary patch literal 2439 zcmV;233&F2P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ccI+q&{AU%j1dtGd@!Q)Y#($@C#cVAr9QML_mC}oL1^-Cp+hvCS1&9P;MlmNqojCD>VYJ zfIa&sZPLJv7gumH!5m|l-h4@C-RA3Iv5J*f!c0mqmJW|kpYVC$r=Jgo_I8=46zheP zdk-dDUvR^j^Z%FyLejo5m4j~z*C~EJoLB~fa$v65V2|T6F(kcfix1BnC17ffm*kVK z+W;WK+5%@1gMnBQODZWMU1&C7deYZ&PT zLcR-;(4koYgW;ss#Tlz$~9N1rE0CU z)!wKv(wKx+nzq_n>m7^s++nL@e#gL|!6OeDW$37*jXoitnWxM$b=KKtU$l531%y?W zuDaUlmJCv|Y+}XKsx|8yTHCzymR+{)y4&t=tff0_Kd|Aa_`|>LKlN(&3{>ukU;z@rp0^G$N(A9Klfv4Z0cUzdzp{R zzry9&0~q=Wp*JVqT(})5gq&6k#dpkV$ZEu!18HL(g1n#FM8(|>AX*rI)VmiW@v%?+QSk*5o{+gDua$T7^a$(9YtCE)XskN)2l2qHM6)7!0dZ|!c zPVjg2uyz^f?NGaV+)*~lX6hze26i_Ly-qav!PZwFrDD1cv|DAjM##AxoyQoEYp9lF zHl8gqYE?{ASIXiox%}1{U<;~4sQ?vdl-BkZYYED$h?>bZ&_M1~%Rq@h#0bXVL;(=q zSMEmD%j!hQMma$M3=+7OHq<(^^p5(`=ftDB6iCcGicL#8hlnZa<=h@N2(AqQ#2!w} zMwdh1P(d6DXfiO@$zJbp6a}OkfwJa8I9J$PkeS1f{bh(--O-gj9YSoatRuyY@YlXq zVd(0z$|!F<1|pd^nF4!M%(+mz5pUoKu^l?Px^Xbmc2rvso(=UMKBG?_M?WoR-yb^g zJdB#w38Wfiu%#fAGYGqGn&=KJJEtA>7JxmhWbHh6&n}7y z70?U?6aa$D1S^<9SKI`x4%kX|GEv%2u=tDGm*?>91UPN6Eh%$A@MuubMpzrjl}JYm z(!<8qG!w1?;BU06%RIF14CYDXJ%{;QlJ|fo&eulYYsj5o7il$>1^priuYi`zp+`pB zEcz<0zYJ@(CmDxl9S>*nr5wEZ+;}nGwGPjiCkLRH!vv!~kj%m)nAX(29V7R_?AD56 z?`uZHt$`(CxRHUD$5%p|v=BV!Db5g%gtDZgxjGtvgqUPO{X-S+7yfSMTgi~IfV-0w z$3Q{>qIlh7SKRplRRoYgzv~E(a#cBC!w}?1wc4-@=%XQgsg=u#iv8SqrC~R_)R98l zvtcXlM;oKShprVbrxl!~S>4R*1!ktb|Hc_A!QPqU|v@RZ5xgb)< zm;f&#RFD9M3B_st8U?RWgT(Vz3+ALF#=$~cmL>?kV`vDnWwTkJurVhRIVm?%n`@2);XCp_p-TSCD=(G`xC1% z-n@d;Vd@1)E}x-w_jwdwYQbkjK6(TSSje5GVt7gK)C{c)ar5AJsJ~4e&zU2vQ`-|wP4tNpz{SC5vp84!?&XPId^#2dtun~uqOpIBrCMI$~Z z95-@4AjL+K&SP!-1D;|x>wX`*Zv6xZJ_A=q(_gLuQ=g<)n_A=u=-mb`uA7>= z2VCv|{ZFQ1DV`Lh5^_1<{fxdT1N7Yj-E02b8s|8D08%uo#0_w82n^>bd%exOyISY= z@14f{egMh*a>{GXB&q-a00v@9M??Vs0RI60puMM)00009a7bBm000XU000XU0RWnu z7ytkO2XskIMF->p6a*_2j~U@q0000!Nkl0}aS^4Wqs@4b z3};ppW?GFv>;yn*U>9-sE=fuQb7UnS0mR_?s3*Djf(C>A8h7O}GPeK#002ovPDHLk FV1lvrey9Kd literal 0 HcmV?d00001 diff --git a/Theme/Chicago95/gtk-3.0/assets/combobox-arrow-down.png b/Theme/Chicago95/gtk-3.0/assets/combobox-arrow-down.png new file mode 100644 index 0000000000000000000000000000000000000000..505ff1d0888505b9873edab7c741809642683626 GIT binary patch literal 1306 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 P00000NkvXXu0mjf2>D@s literal 0 HcmV?d00001 diff --git a/Theme/Chicago95/gtk-3.0/gtk-widgets.css b/Theme/Chicago95/gtk-3.0/gtk-widgets.css index 0151f8f..0ace09d 100644 --- a/Theme/Chicago95/gtk-3.0/gtk-widgets.css +++ b/Theme/Chicago95/gtk-3.0/gtk-widgets.css @@ -12,7 +12,7 @@ -GtkTextView-error-underline-color: @error_color; -GtkToolButton-icon-spacing: 6; -GtkToolItemGroup-expander-size: 8; - -GtkTreeView-expander-size: 8; + -GtkTreeView-expander-size: 18; -GtkWindow-resize-grip-default: true; -GtkWindow-resize-grip-height: 16; -GtkWindow-resize-grip-width: 16; @@ -223,7 +223,8 @@ button { -gtk-icon-shadow: none; transition: none; -gtk-icon-effect: none; } - button.sidebar-button:backdrop label, button.sidebar-button:backdrop, + /* The commented option below can change the theme of a button in a non-active (non-focused) window. Currently leaving it as an option, but disabled.*/ + /* button.sidebar-button:backdrop label, button.sidebar-button:backdrop, button:backdrop.flat label, button:backdrop.flat, button:backdrop label, @@ -284,8 +285,7 @@ button { button:backdrop:disabled:active label, button:backdrop:disabled:checked label { color: @font_color; } - /* The commented option below can change the theme of a button in a non-active (non-focused) window. Currently leaving it as an option, but disabled.*/ - /*button.sidebar-button:backdrop, button.sidebar-button:disabled, button.sidebar-button:backdrop:disabled, + button.sidebar-button:backdrop, button.sidebar-button:disabled, button.sidebar-button:backdrop:disabled, button.flat:backdrop, button.flat:disabled, button.flat:backdrop:disabled { @@ -323,18 +323,7 @@ button { color: @font_color; } button.image-button { min-height: 16px; - min-width: 16px; - /* padding-left: 4px; - padding-right: 4px;*/ } - /* button.text-button {*/ - /* padding-left: 8px; - padding-right: 8px; }*/ - /* button.text-button.image-button {*/ - /* padding-left: 4px; - padding-right: 4px; }*/ - /* button.text-button.image-button label {*/ - /* padding-left: 4px; - padding-right: 4px; }*/ + min-width: 16px; } combobox:drop(active) button.combo, button:drop(active) { border-top-color: @border_dark; @@ -557,7 +546,7 @@ button.osd { .stack-switcher > button.needs-attention:active > image, .stack-switcher > button.needs-attention:checked > label, .stack-switcher > button.needs-attention:checked > image { background-image: none; } -.inline-toolbar button, .inline-toolbar button:backdrop, .primary-toolbar button, .primary-toolbar button:hover { +.inline-toolbar button, .primary-toolbar button, .primary-toolbar button:hover, .primary-toolbar button:hover:backdrop { margin: 1px; border-radius: 0px; border-left: 1px solid @bg_bright; @@ -571,12 +560,12 @@ button.osd { border-bottom: 1px solid @bg_bright; border-right: 1px solid @bg_bright; box-shadow: inset 1px 1px @bg_shade; } - .inline-toolbar button:disabled, .primary-toolbar button:disabled { + .inline-toolbar button:disabled, .primary-toolbar button:disabled, .primary-toolbar button:disabled:backdrop { border-left: 1px solid @bg_shade; border-top: 1px solid @bg_shade; border-bottom: 1px solid @bg_bright; border-right: 1px solid @bg_bright; } -.primary-toolbar button { +.primary-toolbar button, .inline-toolbar button:backdrop, .primary-toolbar button:backdrop { -gtk-icon-shadow: none; border-color: transparent; box-shadow: none; } @@ -1153,14 +1142,6 @@ combobox { outline: none; } combobox button.combo { margin: 2px; } - combobox button arrow { - padding: 0px; - margin: 0px; - min-width: 16px; - min-height: 16px; - border: 1px solid transparent; } - combobox button:disabled arrow { - background-image: url("assets/arrow-down-disabled.png"); } combobox entry, entry { min-width: 20px; min-height: 16px; @@ -1171,12 +1152,26 @@ combobox { box-shadow: none; } combobox cellview { padding-left: 2px; } + +/* The following is specifically for Lireoffice comboboxes. This will affect the rest of the theme too. */ combobox arrow { - -gtk-icon-source: url("assets/arrow-down_test.png"); - -gtk-icon-transform: scale(0.39); } + -gtk-icon-source: url("assets/vcl-combobox-arrow-down.png"); + min-width: 16px; + min-height: 16px; } /* 16px icons only or else Libreoffice will distort the icon. */ combobox:disabled arrow { - -gtk-icon-source: url("assets/arrow-down-disabled.png"); - -gtk-icon-transform: scale(0.5); } + -gtk-icon-source: url("assets/vcl-combobox-arrow-down-disabled.png"); + min-width: 16px; + min-height: 16px; } +/* The following should apply for the rest of the theme. This won't affect Libreoffice comboboxes. */ + combobox > box > button > box > arrow { + -gtk-icon-source: url("assets/combobox-arrow-down.png"); + min-width: 16px; + min-height: 21px; } /* 21px height seems to be the absolute minimum GTK will allow for SOME combobox arrow icons. */ + combobox:disabled > box > button > box > arrow { + -gtk-icon-source: url("assets/combobox-arrow-down-disabled.png"); + min-width: 16px; + min-height: 21px; } + combobox window menu { background-color: @bg_color; color: @text_color; @@ -1390,7 +1385,7 @@ expander arrow { min-height: 16px; } treeview.view.expander { - -gtk-icon-transform: scale(1.7); } /* NOTE: This is specific for GTK3.22! */ + -gtk-icon-transform: scale(0.55); } /* NOTE: This sets the treeview expander arrow size within the expander button area. */ /************ * iconview * @@ -1549,7 +1544,7 @@ menu separator { * Menu arrows* ************/ arrow { - background-image: url("assets/arrow-down.png"); +/* background-image: url("assets/arrow-down.png");*/ background-position: center; background-repeat: no-repeat; background-size: 10px; @@ -2601,7 +2596,7 @@ toolbar button { margin: 1px; min-width: 16px; min-height: 16px; - padding: 2px; + padding: 1px; border-color: @bg_bright @bg_dark @bg_dark @bg_bright; box-shadow: inset -1px -1px @bg_shade; } toolbar > toolbutton > button:disabled { @@ -2917,10 +2912,6 @@ grid viewport box box textview { background-color: white; } -grid viewport box { - background-color: white; -} - /* printdialog */ printdialog notebook { diff --git a/Theme/Chicago95/gtk-3.24/assets/combobox-arrow-down-disabled.png b/Theme/Chicago95/gtk-3.24/assets/combobox-arrow-down-disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..5b5b2c93841fd559299974df5105737fb41f7647 GIT binary patch literal 2439 zcmV;233&F2P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ccI+q&{AU%j1dtGd@!Q)Y#($@C#cVAr9QML_mC}oL1^-Cp+hvCS1&9P;MlmNqojCD>VYJ zfIa&sZPLJv7gumH!5m|l-h4@C-RA3Iv5J*f!c0mqmJW|kpYVC$r=Jgo_I8=46zheP zdk-dDUvR^j^Z%FyLejo5m4j~z*C~EJoLB~fa$v65V2|T6F(kcfix1BnC17ffm*kVK z+W;WK+5%@1gMnBQODZWMU1&C7deYZ&PT zLcR-;(4koYgW;ss#Tlz$~9N1rE0CU z)!wKv(wKx+nzq_n>m7^s++nL@e#gL|!6OeDW$37*jXoitnWxM$b=KKtU$l531%y?W zuDaUlmJCv|Y+}XKsx|8yTHCzymR+{)y4&t=tff0_Kd|Aa_`|>LKlN(&3{>ukU;z@rp0^G$N(A9Klfv4Z0cUzdzp{R zzry9&0~q=Wp*JVqT(})5gq&6k#dpkV$ZEu!18HL(g1n#FM8(|>AX*rI)VmiW@v%?+QSk*5o{+gDua$T7^a$(9YtCE)XskN)2l2qHM6)7!0dZ|!c zPVjg2uyz^f?NGaV+)*~lX6hze26i_Ly-qav!PZwFrDD1cv|DAjM##AxoyQoEYp9lF zHl8gqYE?{ASIXiox%}1{U<;~4sQ?vdl-BkZYYED$h?>bZ&_M1~%Rq@h#0bXVL;(=q zSMEmD%j!hQMma$M3=+7OHq<(^^p5(`=ftDB6iCcGicL#8hlnZa<=h@N2(AqQ#2!w} zMwdh1P(d6DXfiO@$zJbp6a}OkfwJa8I9J$PkeS1f{bh(--O-gj9YSoatRuyY@YlXq zVd(0z$|!F<1|pd^nF4!M%(+mz5pUoKu^l?Px^Xbmc2rvso(=UMKBG?_M?WoR-yb^g zJdB#w38Wfiu%#fAGYGqGn&=KJJEtA>7JxmhWbHh6&n}7y z70?U?6aa$D1S^<9SKI`x4%kX|GEv%2u=tDGm*?>91UPN6Eh%$A@MuubMpzrjl}JYm z(!<8qG!w1?;BU06%RIF14CYDXJ%{;QlJ|fo&eulYYsj5o7il$>1^priuYi`zp+`pB zEcz<0zYJ@(CmDxl9S>*nr5wEZ+;}nGwGPjiCkLRH!vv!~kj%m)nAX(29V7R_?AD56 z?`uZHt$`(CxRHUD$5%p|v=BV!Db5g%gtDZgxjGtvgqUPO{X-S+7yfSMTgi~IfV-0w z$3Q{>qIlh7SKRplRRoYgzv~E(a#cBC!w}?1wc4-@=%XQgsg=u#iv8SqrC~R_)R98l zvtcXlM;oKShprVbrxl!~S>4R*1!ktb|Hc_A!QPqU|v@RZ5xgb)< zm;f&#RFD9M3B_st8U?RWgT(Vz3+ALF#=$~cmL>?kV`vDnWwTkJurVhRIVm?%n`@2);XCp_p-TSCD=(G`xC1% z-n@d;Vd@1)E}x-w_jwdwYQbkjK6(TSSje5GVt7gK)C{c)ar5AJsJ~4e&zU2vQ`-|wP4tNpz{SC5vp84!?&XPId^#2dtun~uqOpIBrCMI$~Z z95-@4AjL+K&SP!-1D;|x>wX`*Zv6xZJ_A=q(_gLuQ=g<)n_A=u=-mb`uA7>= z2VCv|{ZFQ1DV`Lh5^_1<{fxdT1N7Yj-E02b8s|8D08%uo#0_w82n^>bd%exOyISY= z@14f{egMh*a>{GXB&q-a00v@9M??Vs0RI60puMM)00009a7bBm000XU000XU0RWnu z7ytkO2XskIMF->p6a*_2j~U@q0000!Nkl0}aS^4Wqs@4b z3};ppW?GFv>;yn*U>9-sE=fuQb7UnS0mR_?s3*Djf(C>A8h7O}GPeK#002ovPDHLk FV1lvrey9Kd literal 0 HcmV?d00001 diff --git a/Theme/Chicago95/gtk-3.24/assets/combobox-arrow-down.png b/Theme/Chicago95/gtk-3.24/assets/combobox-arrow-down.png new file mode 100644 index 0000000000000000000000000000000000000000..505ff1d0888505b9873edab7c741809642683626 GIT binary patch literal 1306 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 P00000NkvXXu0mjf2>D@s literal 0 HcmV?d00001 diff --git a/Theme/Chicago95/gtk-3.24/gtk-widgets.css b/Theme/Chicago95/gtk-3.24/gtk-widgets.css index 3ef6133..0ace09d 100644 --- a/Theme/Chicago95/gtk-3.24/gtk-widgets.css +++ b/Theme/Chicago95/gtk-3.24/gtk-widgets.css @@ -12,7 +12,7 @@ -GtkTextView-error-underline-color: @error_color; -GtkToolButton-icon-spacing: 6; -GtkToolItemGroup-expander-size: 8; - -GtkTreeView-expander-size: 8; + -GtkTreeView-expander-size: 18; -GtkWindow-resize-grip-default: true; -GtkWindow-resize-grip-height: 16; -GtkWindow-resize-grip-width: 16; @@ -223,7 +223,8 @@ button { -gtk-icon-shadow: none; transition: none; -gtk-icon-effect: none; } - button.sidebar-button:backdrop label, button.sidebar-button:backdrop, + /* The commented option below can change the theme of a button in a non-active (non-focused) window. Currently leaving it as an option, but disabled.*/ + /* button.sidebar-button:backdrop label, button.sidebar-button:backdrop, button:backdrop.flat label, button:backdrop.flat, button:backdrop label, @@ -284,8 +285,7 @@ button { button:backdrop:disabled:active label, button:backdrop:disabled:checked label { color: @font_color; } - /* The commented option below can change the theme of a button in a non-active (non-focused) window. Currently leaving it as an option, but disabled.*/ - /*button.sidebar-button:backdrop, button.sidebar-button:disabled, button.sidebar-button:backdrop:disabled, + button.sidebar-button:backdrop, button.sidebar-button:disabled, button.sidebar-button:backdrop:disabled, button.flat:backdrop, button.flat:disabled, button.flat:backdrop:disabled { @@ -323,18 +323,7 @@ button { color: @font_color; } button.image-button { min-height: 16px; - min-width: 16px; - /* padding-left: 4px; - padding-right: 4px;*/ } - /* button.text-button {*/ - /* padding-left: 8px; - padding-right: 8px; }*/ - /* button.text-button.image-button {*/ - /* padding-left: 4px; - padding-right: 4px; }*/ - /* button.text-button.image-button label {*/ - /* padding-left: 4px; - padding-right: 4px; }*/ + min-width: 16px; } combobox:drop(active) button.combo, button:drop(active) { border-top-color: @border_dark; @@ -557,7 +546,7 @@ button.osd { .stack-switcher > button.needs-attention:active > image, .stack-switcher > button.needs-attention:checked > label, .stack-switcher > button.needs-attention:checked > image { background-image: none; } -.inline-toolbar button, .inline-toolbar button:backdrop { +.inline-toolbar button, .primary-toolbar button, .primary-toolbar button:hover, .primary-toolbar button:hover:backdrop { margin: 1px; border-radius: 0px; border-left: 1px solid @bg_bright; @@ -565,19 +554,21 @@ button.osd { border-bottom: 1px solid @bg_shade; border-right: 1px solid @bg_shade; box-shadow: none; } - .inline-toolbar button:active { + .inline-toolbar button:active, .primary-toolbar button:active { border-left: 1px solid @bg_dark; border-top: 1px solid @bg_dark; border-bottom: 1px solid @bg_bright; border-right: 1px solid @bg_bright; box-shadow: inset 1px 1px @bg_shade; } - .inline-toolbar button:disabled { + .inline-toolbar button:disabled, .primary-toolbar button:disabled, .primary-toolbar button:disabled:backdrop { border-left: 1px solid @bg_shade; border-top: 1px solid @bg_shade; border-bottom: 1px solid @bg_bright; border-right: 1px solid @bg_bright; } -.primary-toolbar button { - -gtk-icon-shadow: none; } +.primary-toolbar button, .inline-toolbar button:backdrop, .primary-toolbar button:backdrop { + -gtk-icon-shadow: none; + border-color: transparent; + box-shadow: none; } toolbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton:backdrop > button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > @@ -1151,14 +1142,6 @@ combobox { outline: none; } combobox button.combo { margin: 2px; } - combobox button arrow { - padding: 0px; - margin: 0px; - min-width: 16px; - min-height: 16px; - border: 1px solid transparent; } - combobox button:disabled arrow { - background-image: url("assets/arrow-down-disabled.png"); } combobox entry, entry { min-width: 20px; min-height: 16px; @@ -1169,12 +1152,26 @@ combobox { box-shadow: none; } combobox cellview { padding-left: 2px; } + +/* The following is specifically for Lireoffice comboboxes. This will affect the rest of the theme too. */ combobox arrow { - -gtk-icon-source: url("assets/arrow-down_test.png"); - -gtk-icon-transform: scale(0.39); } + -gtk-icon-source: url("assets/vcl-combobox-arrow-down.png"); + min-width: 16px; + min-height: 16px; } /* 16px icons only or else Libreoffice will distort the icon. */ combobox:disabled arrow { - -gtk-icon-source: url("assets/arrow-down-disabled.png"); - -gtk-icon-transform: scale(0.5); } + -gtk-icon-source: url("assets/vcl-combobox-arrow-down-disabled.png"); + min-width: 16px; + min-height: 16px; } +/* The following should apply for the rest of the theme. This won't affect Libreoffice comboboxes. */ + combobox > box > button > box > arrow { + -gtk-icon-source: url("assets/combobox-arrow-down.png"); + min-width: 16px; + min-height: 21px; } /* 21px height seems to be the absolute minimum GTK will allow for SOME combobox arrow icons. */ + combobox:disabled > box > button > box > arrow { + -gtk-icon-source: url("assets/combobox-arrow-down-disabled.png"); + min-width: 16px; + min-height: 21px; } + combobox window menu { background-color: @bg_color; color: @text_color; @@ -1388,7 +1385,7 @@ expander arrow { min-height: 16px; } treeview.view.expander { - -gtk-icon-transform: scale(2); } /* NOTE: This is specific for GTK3.24! */ + -gtk-icon-transform: scale(0.55); } /* NOTE: This sets the treeview expander arrow size within the expander button area. */ /************ * iconview * @@ -1547,7 +1544,7 @@ menu separator { * Menu arrows* ************/ arrow { - background-image: url("assets/arrow-down.png"); +/* background-image: url("assets/arrow-down.png");*/ background-position: center; background-repeat: no-repeat; background-size: 10px; @@ -2599,7 +2596,7 @@ toolbar button { margin: 1px; min-width: 16px; min-height: 16px; - padding: 2px; + padding: 1px; border-color: @bg_bright @bg_dark @bg_dark @bg_bright; box-shadow: inset -1px -1px @bg_shade; } toolbar > toolbutton > button:disabled { @@ -2915,10 +2912,6 @@ grid viewport box box textview { background-color: white; } -grid viewport box { - background-color: white; -} - /* printdialog */ printdialog notebook {