From 0708069cc2c545fdd534a27f40ede36c02643fef Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Sun, 3 Apr 2016 23:31:09 +1100 Subject: [PATCH] New design for vertical scrollbars (horizontal pending) --- data/gui/macros/_initial.cfg | 12 +- data/gui/macros/vertical_scrollbar.cfg | 7 +- data/gui/widget/repeating_button_default.cfg | 17 -- .../gui/widget/repeating_button_scrollbar.cfg | 190 ++++++++++++++++++ .../gui/widget/vertical_scrollbar_default.cfg | 66 ++---- .../scrollbars/scrollbottom-active.png | Bin 101 -> 154 bytes .../scrollbottom-minimal-active.png | Bin 167 -> 0 bytes .../scrollbottom-minimal-pressed.png | Bin 167 -> 0 bytes .../scrollbars/scrollbottom-minimal.png | Bin 172 -> 0 bytes .../scrollbars/scrollbottom-pressed.png | Bin 102 -> 154 bytes images/buttons/scrollbars/scrollbottom.png | Bin 103 -> 155 bytes .../buttons/scrollbars/scrollmid-active.png | Bin 207 -> 232 bytes .../scrollbars/scrollmid-minimal-active.png | Bin 242 -> 0 bytes .../scrollbars/scrollmid-minimal-pressed.png | Bin 243 -> 0 bytes .../buttons/scrollbars/scrollmid-minimal.png | Bin 247 -> 0 bytes .../buttons/scrollbars/scrollmid-pressed.png | Bin 213 -> 231 bytes images/buttons/scrollbars/scrollmid.png | Bin 199 -> 235 bytes .../buttons/scrollbars/scrolltop-active.png | Bin 118 -> 168 bytes .../scrollbars/scrolltop-minimal-active.png | Bin 179 -> 0 bytes .../scrollbars/scrolltop-minimal-pressed.png | Bin 179 -> 0 bytes .../buttons/scrollbars/scrolltop-minimal.png | Bin 169 -> 0 bytes .../buttons/scrollbars/scrolltop-pressed.png | Bin 121 -> 169 bytes images/buttons/scrollbars/scrolltop.png | Bin 104 -> 158 bytes 23 files changed, 217 insertions(+), 75 deletions(-) create mode 100644 data/gui/widget/repeating_button_scrollbar.cfg delete mode 100644 images/buttons/scrollbars/scrollbottom-minimal-active.png delete mode 100644 images/buttons/scrollbars/scrollbottom-minimal-pressed.png delete mode 100644 images/buttons/scrollbars/scrollbottom-minimal.png delete mode 100644 images/buttons/scrollbars/scrollmid-minimal-active.png delete mode 100644 images/buttons/scrollbars/scrollmid-minimal-pressed.png delete mode 100644 images/buttons/scrollbars/scrollmid-minimal.png delete mode 100644 images/buttons/scrollbars/scrolltop-minimal-active.png delete mode 100644 images/buttons/scrollbars/scrolltop-minimal-pressed.png delete mode 100644 images/buttons/scrollbars/scrolltop-minimal.png diff --git a/data/gui/macros/_initial.cfg b/data/gui/macros/_initial.cfg index 9bf9f6d738d7..5f93746827f4 100644 --- a/data/gui/macros/_initial.cfg +++ b/data/gui/macros/_initial.cfg @@ -29,7 +29,7 @@ # If the text is too high it returns the top side. # Rounding happens to the bottom side. #define GUI__TEXT_VERTICALLY_CENTRED - "(if(text_height < height, (height - text_height + 1) / 2, 0))" + "(if(text_height < height, (height - text_height - 2) / 2, 0))" #enddef #define GUI__CENTERED_TEXT FONT_SIZE FONT_STYLE FONT_COLOR @@ -291,21 +291,21 @@ #enddef #define GUI_NORMAL__FONT_SIZE__TINY - 10 + 13 #enddef #define GUI_NORMAL__FONT_SIZE__SMALL - 12 + 15 #enddef #define GUI_NORMAL__FONT_SIZE__DEFAULT - 14 + 17 #enddef #define GUI_NORMAL__FONT_SIZE__LARGE - 18 + 20 #enddef #define GUI_NORMAL__FONT_SIZE__TITLE - 20 + 24 #enddef diff --git a/data/gui/macros/vertical_scrollbar.cfg b/data/gui/macros/vertical_scrollbar.cfg index 704c8234f08b..cb0d44cfd445 100644 --- a/data/gui/macros/vertical_scrollbar.cfg +++ b/data/gui/macros/vertical_scrollbar.cfg @@ -13,7 +13,7 @@ vertical_grow = "true" # note we want a special button definition for this later. [repeating_button] id = "_half_page_up" - definition = "up_arrow" + definition = "scrollbar_up_arrow" [/repeating_button] [/column] @@ -22,7 +22,8 @@ vertical_grow = "true" [row] - grow_factor = 1 + grow_factor = 1 + [column] vertical_grow = "true" @@ -42,7 +43,7 @@ vertical_grow = "true" # note we want a special button definition for this later. [repeating_button] id = "_half_page_down" - definition = "down_arrow" + definition = "scrollbar_down_arrow" [/repeating_button] [/column] diff --git a/data/gui/widget/repeating_button_default.cfg b/data/gui/widget/repeating_button_default.cfg index 004ca20ab15c..4025ad0a7f27 100644 --- a/data/gui/widget/repeating_button_default.cfg +++ b/data/gui/widget/repeating_button_default.cfg @@ -157,22 +157,6 @@ # Transparent arrow buttons -{_GUI_DEFINITION - "down_arrow_transparent" - "Down arrow button for a transparent scrollbar." - "buttons/button_square/button_square_25" - "icons/arrows/arrows_ornate_down_25" - "~O(65%)" -} - -{_GUI_DEFINITION - "up_arrow_transparent" - "Up arrow button for a transparent scrollbar." - "buttons/button_square/button_square_25" - "icons/arrows/arrows_ornate_up_25" - "~O(65%)" -} - {_GUI_DEFINITION "left_arrow_transparent" "Left arrow button for a transparent scrollbar." @@ -191,4 +175,3 @@ #undef _GUI_DEFINITION #undef _GUI_RESOLUTION - diff --git a/data/gui/widget/repeating_button_scrollbar.cfg b/data/gui/widget/repeating_button_scrollbar.cfg new file mode 100644 index 000000000000..838f1636509b --- /dev/null +++ b/data/gui/widget/repeating_button_scrollbar.cfg @@ -0,0 +1,190 @@ +#textdomain wesnoth-lib +### +### Definition of repeating buttons for scrollbar arrows +### + +#define _GUI_RESOLUTION RESOLUTION SIZE IMAGE_OVERLAY IPF ALPHA + [resolution] + + {RESOLUTION} + + min_width = {SIZE} + min_height = {SIZE} + + default_width = {SIZE} + default_height = {SIZE} + + max_width = {SIZE} + max_height = {SIZE} + + [state_enabled] + + [draw] + + [rectangle] + x = 0 + y = 0 + w = "(width)" + h = "(height)" + fill_color = "4, 4, 4, {ALPHA}" + [/rectangle] + + [image] + w = {SIZE} + h = {SIZE} + name = {IMAGE_OVERLAY} + ".png{IPF}" + [/image] + + [/draw] + + [/state_enabled] + + [state_disabled] + + [draw] + + [rectangle] + x = 0 + y = 0 + w = "(width)" + h = "(height)" + fill_color = "4, 4, 4, {ALPHA}" + [/rectangle] + + [image] + w = {SIZE} + h = {SIZE} + name = {IMAGE_OVERLAY} + ".png~GS(){IPF}" + [/image] + + [/draw] + + [/state_disabled] + + [state_pressed] + + [draw] + + [rectangle] + x = 0 + y = 0 + w = "(width)" + h = "(height)" + fill_color = "4, 4, 4, {ALPHA}" + [/rectangle] + + [image] + w = {SIZE} + h = {SIZE} + name = {IMAGE_OVERLAY} + "-pressed.png{IPF}" + [/image] + + [/draw] + + [/state_pressed] + + [state_focused] + + [draw] + + [rectangle] + x = 0 + y = 0 + w = "(width)" + h = "(height)" + fill_color = "4, 4, 4, {ALPHA}" + [/rectangle] + + [image] + w = {SIZE} + h = {SIZE} + name = {IMAGE_OVERLAY} + "-active.png{IPF}" + [/image] + + [/draw] + + [/state_focused] + + [/resolution] +#enddef + +#define _GUI_DEFINITION ID DESCRIPTION IMAGE_OVERLAY IPF ALPHA +[repeating_button_definition] + id = {ID} + description = {DESCRIPTION} + + {_GUI_RESOLUTION () 15 ({IMAGE_OVERLAY}) ({IPF}) ({ALPHA})} + +[/repeating_button_definition] +#enddef + +{_GUI_DEFINITION + "scrollbar_up_arrow" + "Up arrow button for a scrollbar." + "icons/arrows/short_arrow_right_25" + ("~CROP(4,4,17,17)~ROTATE(-90)") + "255" +} + +{_GUI_DEFINITION + "scrollbar_down_arrow" + "Down arrow button for a scrollbar." + "icons/arrows/short_arrow_right_25" + ("~CROP(4,4,17,17)~ROTATE(90)") + "255" +} + +{_GUI_DEFINITION + "scrollbar_left_arrow" + "Up arrow button for a scrollbar." + "icons/arrows/short_arrow_right_25" + ("~CROP(4,4,17,17)~ROTATE(180)") + "255" +} + +{_GUI_DEFINITION + "scrollbar_right_arrow" + "Down arrow button for a scrollbar." + "icons/arrows/short_arrow_right_25" + ("~CROP(4,4,17,17)") + "255" +} + +# +# Transparent versions +# + +{_GUI_DEFINITION + "scrollbar_up_arrow_transparent" + "Up arrow button for a scrollbar." + "icons/arrows/short_arrow_right_25" + ("~CROP(4,4,17,17)~ROTATE(-90)~O(65%)") + "165" +} + +{_GUI_DEFINITION + "scrollbar_down_arrow_transparent" + "Down arrow button for a scrollbar." + "icons/arrows/short_arrow_right_25" + ("~CROP(4,4,17,17)~ROTATE(90)~O(65%)") + "165" +} + +{_GUI_DEFINITION + "scrollbar_left_arrow_transparent" + "Up arrow button for a scrollbar." + "icons/arrows/short_arrow_right_25" + ("~CROP(4,4,17,17)~ROTATE(180)~O(65%)") + "165" +} + +{_GUI_DEFINITION + "scrollbar_right_arrow_transparent" + "Down arrow button for a scrollbar." + "icons/arrows/short_arrow_right_25" + ("~CROP(4,4,17,17)~O(65%)") + "165" +} + +#undef _GUI_DEFINITION +#undef _GUI_RESOLUTION diff --git a/data/gui/widget/vertical_scrollbar_default.cfg b/data/gui/widget/vertical_scrollbar_default.cfg index 0d95664e2927..98c2b2e2fbf1 100644 --- a/data/gui/widget/vertical_scrollbar_default.cfg +++ b/data/gui/widget/vertical_scrollbar_default.cfg @@ -3,35 +3,20 @@ ### Definition of a vertical scrollbar. ### -#define _GUI_STATE GROOVE_TOP GROOVE_BOTTOM POSITIONER_TOP POSITIONER_BOTTOM IMAGE_SUFFIX IPF +#define _GUI_STATE POSITIONER_TOP IMAGE_SUFFIX IPF [draw] # # Groove # - [image] - # 4 pixels high + [rectangle] x = 0 y = 0 - name = "buttons/scrollbars/scrollgroove-top.png{IPF}" - [/image] - - [image] - x = 0 - y = {GROOVE_TOP} - h = "(if(height - {GROOVE_TOP} - {GROOVE_BOTTOM} < 0 - , 0, height - {GROOVE_TOP} - {GROOVE_BOTTOM}))" - resize_mode = "stretch" - name = "buttons/scrollbars/scrollgroove-mid.png{IPF}" - [/image] - - [image] - # 5 pixels high - x = 0 - y = "(height - {GROOVE_BOTTOM})" - name = "buttons/scrollbars/scrollgroove-bottom.png{IPF}" - [/image] + w = "(width)" + h = "(height)" + fill_color = "4, 4, 4, 255" + [/rectangle] # # Positioner @@ -48,8 +33,8 @@ x = 0 y = "(positioner_offset + {POSITIONER_TOP})" h = "( -if(positioner_length - {POSITIONER_TOP} - {POSITIONER_BOTTOM} < 0 - , 0, positioner_length - {POSITIONER_TOP} - {POSITIONER_BOTTOM}))" +if(positioner_length - {POSITIONER_TOP} < 0 + , 0, positioner_length - {POSITIONER_TOP}))" resize_mode = "stretch" name = "buttons/scrollbars/scrollmid{IMAGE_SUFFIX}{IPF}" [/image] @@ -57,14 +42,14 @@ if(positioner_length - {POSITIONER_TOP} - {POSITIONER_BOTTOM} < 0 [image] # 5 pixels high x = 0 - y = "(positioner_offset + positioner_length - {POSITIONER_BOTTOM})" + y = "(positioner_offset + positioner_length)" name = "buttons/scrollbars/scrollbottom{IMAGE_SUFFIX}{IPF}" [/image] [/draw] #enddef -#define _GUI_RESOLUTION RESOLUTION WIDTH HEIGHT POSITIONER_LENGHT GROOVE_TOP GROOVE_BOTTOM POSITIONER_TOP POSITIONER_BOTTOM IPF +#define _GUI_RESOLUTION RESOLUTION WIDTH HEIGHT POSITIONER_LENGHT POSITIONER_TOP IPF [resolution] {RESOLUTION} @@ -72,7 +57,7 @@ if(positioner_length - {POSITIONER_TOP} - {POSITIONER_BOTTOM} < 0 min_width = {WIDTH} min_height = {HEIGHT} - default_width = {WIDTH} + default_width = 15 default_height = {HEIGHT} max_width = {WIDTH} @@ -84,19 +69,19 @@ if(positioner_length - {POSITIONER_TOP} - {POSITIONER_BOTTOM} < 0 bottom_offset = 0 [state_enabled] - {_GUI_STATE ({GROOVE_TOP}) ({GROOVE_BOTTOM}) ({POSITIONER_TOP}) ({POSITIONER_BOTTOM}) ".png" ({IPF}) } + {_GUI_STATE ({POSITIONER_TOP}) ".png" ({IPF}) } [/state_enabled] [state_disabled] - {_GUI_STATE ({GROOVE_TOP}) ({GROOVE_BOTTOM}) ({POSITIONER_TOP}) ({POSITIONER_BOTTOM}) ".png~GS()" ({IPF}) } + {_GUI_STATE ({POSITIONER_TOP}) ".png~GS()" ({IPF}) } [/state_disabled] [state_pressed] - {_GUI_STATE ({GROOVE_TOP}) ({GROOVE_BOTTOM}) ({POSITIONER_TOP}) ({POSITIONER_BOTTOM}) "-pressed.png" ({IPF}) } + {_GUI_STATE ({POSITIONER_TOP}) "-pressed.png" ({IPF}) } [/state_pressed] [state_focused] - {_GUI_STATE ({GROOVE_TOP}) ({GROOVE_BOTTOM}) ({POSITIONER_TOP}) ({POSITIONER_BOTTOM}) "-active.png" ({IPF}) } + {_GUI_STATE ({POSITIONER_TOP}) "-active.png" ({IPF}) } [/state_focused] [/resolution] #enddef @@ -108,27 +93,10 @@ if(positioner_length - {POSITIONER_TOP} - {POSITIONER_BOTTOM} < 0 # Note a scrollbar is normally sized by the item that "masters" it # that's why the default height is rather low. - {_GUI_RESOLUTION () 25 20 11 4 5 5 5 ()} + {_GUI_RESOLUTION () 25 20 11 2 ()} [/vertical_scrollbar_definition] -# -# This is meant to be used for a minimal scrollbar definition, removing the -# up/down toggle buttons and reducing the width of the bar by 8 px. -# However, since the toggle buttons on a scrollbar panel aren't definition- -# dependent, this is commented out for now. -# -#[vertical_scrollbar_definition] -# id = "minimal" -# description = "a minimal vertical scrollbar" -# -# # Note a scrollbar is normally sized by the item that "masters" it -# # that's why the default height is rather low. - -# {_GUI_RESOLUTION () 17 20 11 4 5 4 4 ()} -# -#[/vertical_scrollbar_definition] - [vertical_scrollbar_definition] id = "transparent" description = "a transparent vertical scrollbar" @@ -136,7 +104,7 @@ if(positioner_length - {POSITIONER_TOP} - {POSITIONER_BOTTOM} < 0 # Note a scrollbar is normally sized by the item that "masters" it # that's why the default height is rather low. - {_GUI_RESOLUTION () 25 20 11 4 5 5 5 "~O(65%)"} + {_GUI_RESOLUTION () 25 20 11 5 "~O(65%)"} [/vertical_scrollbar_definition] diff --git a/images/buttons/scrollbars/scrollbottom-active.png b/images/buttons/scrollbars/scrollbottom-active.png index 77ba8520324d0537bddddc04c6dee305c5d6869a..cba00efbdbd16dfc681d993c54589404882c0cf3 100644 GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^{6Nga!3HGTJ=&%KDYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>Fdh=fLWeLh5hp##wehWx~Gd{2*>s0l!S*r&M%NZ>mc;w rXGbFleEk3aKTpq^IsYX+*n1chOxWw2+e5bkwJ>^zQaYY4jv*3LlYjjGZ_mtQyrJMv zx`E#^nb$j-4DZCGcs~#eWH)}WrA4gbM+6hY{U)OgVrGlHf%+IcUHx3vIVCg!090Kc AJpcdz diff --git a/images/buttons/scrollbars/scrollbottom-minimal-active.png b/images/buttons/scrollbars/scrollbottom-minimal-active.png deleted file mode 100644 index 291ee7112b7b47e04817ff560fd16488c4096b4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^fgTe~DWM4f D4euyd diff --git a/images/buttons/scrollbars/scrollbottom-minimal-pressed.png b/images/buttons/scrollbars/scrollbottom-minimal-pressed.png deleted file mode 100644 index 876582b2a2a5b0daad96e0575b04b7746707073a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^fF{1rycjtjsGq^p)z4*}Q$iB} DeWe-SYtoS$euShDcoAdS)RngMtY2#nlcI z76iW7|KBF#n+6jbgU~$7tEbGoZcgFqNY)K=pZ<-rVW&F7P5s;aYES)mZ5q$+J^?g@ N!PC{xWt~$(699KaF3bP` diff --git a/images/buttons/scrollbars/scrollbottom-pressed.png b/images/buttons/scrollbars/scrollbottom-pressed.png index e766e3a1015bed1b35b5206b55cfabe4d7e840b2..626e6a760a7c154a8fc578d7e8233d62848822c4 100644 GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^{6Nga!3HGTJ=&%KDYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>Fdh=fLWeLg;$vKg$qzf-P6S}gyVX0O2WgR=M&-&ISBnI r>}~{skN^Mw=jmCq=f9)}dk=##JNxorp3|R!S{OWC{an^LB{Ts571k`! literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^l0eML!3HEZ{B>^zQo5cljv*3LlYjjGZ_mtQyy3&2 z^n$zvGSTjhhIe98ydQ`KGA^Fcna8R7;loB2h85o|jlQm9{0r2`;OXk;vd$@?2>_2q BArJrn diff --git a/images/buttons/scrollbars/scrollbottom.png b/images/buttons/scrollbars/scrollbottom.png index 1ad530bd4b0821dc7ee3650d67be34a7c74c7ed3..4a16708602766002028e97803896337e6142ba21 100644 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^{6Nga!3HGTJ=&%KDYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>Fdh=fLWeLg;8q%l6;_$hNp{T2*>rQ2Nw!5DDbds_#?ZB vsn==q|F%?CkED><+#hq~1r{&(dz$siKc@N(*K=)vdKf%i{an^LB{Ts5*%K>3 literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^l0eML!3HEZ{B>^zQhJ^)jv*3LlYjjGZ_mtQyrJMv zy1)eHq{>qp`m`kupLN~Lk|bDaz#QhC(c0dx%3%9Y(BNm`e22WQ%mvv4FO#oio B9y|a5 diff --git a/images/buttons/scrollbars/scrollmid-active.png b/images/buttons/scrollbars/scrollmid-active.png index 000f4f9659ea514781cc323e34f275ca5761525b..0920f4505b1f99454f4ecb10432fbc65e17d8436 100644 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^{6Ngk!3HF+w~DI+DYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWNq^HEw*OmPNvpkQ6Y8NN}CZJHMr;B5V#O2xv7kLjE@VMN+>Xsy} zvMqtlEm>e$B2(LrI+H-%%SH10j(pthB3NmZmm X+%DO0F8{I=&;bmdu6{1-oD!M<3Q|#v literal 207 zcmV;=05JcFP)P000LF1^@s6{Wa!@0001%NklFE_Q>aoT$XOL+G)|2B>ITn{Rhh)-S5iT3SOw%D+Y5x6@XhYWaFzAHU< zWVO*yGA?oCo#Lh#GMP)`QNpfu|4VDV0zUeV8&5^t6 zec&tGdGjQgQu&X%Q~loCIDtvPVfK# diff --git a/images/buttons/scrollbars/scrollmid-minimal-pressed.png b/images/buttons/scrollbars/scrollmid-minimal-pressed.png deleted file mode 100644 index 1d563b16eee4c61127ed7d1ba33ab32f7fb03a51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^f21sKVXz(l(xPscY+Tn)Zppj7$R}Gb;3p7Lk>L7^EF?} zOMf^l=izfn*UGUyQLZh4|8rq@Ms;SVi0U-`KK)I-kCNn+_rzZ)6?i_2v3AP7{-*SI zb_a@^Ui+$VOPsz+QvJ?!or_%_uM>Z^FOB-Cd?;zA(DYk7yj|bS%91l*)b6(=<&t%K kP}$_Ybszh$3Vmk$^+@iKfWT~Cpj#L`UHx3vIVCg!0GW7HcmMzZ diff --git a/images/buttons/scrollbars/scrollmid-minimal.png b/images/buttons/scrollbars/scrollmid-minimal.png deleted file mode 100644 index 3acb14116af7672dd9372158004cb7f7d0f8edc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^f3&zn(BASvyDoLohSQ;U-aTLxOt`&4`y0c3g_;Qd8}c8j4n5EH z6K7Pj&_1E2(EU(X&Wqjuzj@5k<$M!^?z&B$7Qbx@>)T1JVO6=emS#M-H1XeYcRn3n nE&Z^#bDg^SUzhkc@&9DH&!ACwSLd}g&^-*Eu6{1-oD!M<+M`lE diff --git a/images/buttons/scrollbars/scrollmid-pressed.png b/images/buttons/scrollbars/scrollmid-pressed.png index 42414e2030518b4c93bd3545e48648156f4160b6..a62272bf0a7c14429408d2eab3408b5939f6606a 100644 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^{6Ngk!3HF+w~DI+DYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWNq^HEw*OmPNvpkQ6a&p$HcA!v+r;B5V#O2Znr+HfpcwFu?JaqBY z&Q&dOWEI)`HAnD^p^Q-7!OoPMk1x)45j>o-k2|OSMYV_XN|xkPpJ!~c+jE|0|J1(U z8;h?mWPWe5GT|lX$?4O)mNOP}hi~2d`JC literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^l0eMP!3HG%nm+3QQgb|A978nDPn~#>*U6B_IsVcV z>E8v(ylja~WsRN^4T=$uugln7SmE^O`tlWJIY&)BYZ6NJ`_e1y6qvjmNtCJ>@ zr_-EI1x#-fzPi3K@t)Kp@Bi#ed)I&OXPCXp`-0be_u!?gzAWC>BHrMs$<{GnNge1; N22WQ%mvv4FO#mMRQtyV4dp-)i=e1E_%1N1*&;Nn(;Y`~Hn-70K@KPY*5ohBX z4)t@1s~`BS`lY|>=!Pr5rlp+ywP;__Je94&TIU^3R$JZA+oD!rnYz{N?!xuAXNSp8 a|G{Wtr&yW2Ufu@i1_n=8KbLh*2~7aj2~*er literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^l0eMP!3HG%nm+3QQhlB-jv*DdruI8>IT`Y}+~2Y* zAf}pe`@Q;yrYzh4tI1B>_UF<+C0P#7whwJ5%tEc=&%EVZt}URzB~sKHFWwUIXNE0{ zVbiO%4?ecMZN9HR(Nmb!C?Ws%o1`7C9479)p90IvWA|QZS>M9p;j=_7^6tK0o)!(u z`&9eyXMYvm*?zUs?~6)`*7Zvq8&Bo@d&yn2OpWtl)B7@@%NRUe{an^LB{Ts52$4|b diff --git a/images/buttons/scrollbars/scrolltop-active.png b/images/buttons/scrollbars/scrolltop-active.png index 961297f7cc10a1f3d39b020fc3797c04043d49a7..a63d647c1dbb5fcc7e392ab93d967d4a9cb487a6 100644 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^{6Nga!3HGTJ=&%KDYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>Fdh=fLWeLSvOrR&KoFX>gnPb!f`$M&;S4S%!}9Eu4lW% zsI1J)eY~EHxtxtHIX^_xPmkm5ksg8MwoR?7k`mKQ3>g@j`PrW+&a&GHG=Ra=)z4*} HQ$iB}zIQ9q literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^l0eML!3HEZ{B>^zQnsEhjv*44lYjjGZ_m8e@bHJN zEsn>(+D|no^OlIP_-8!h$NzMX`K_|)=Ug8&sS3nwk!kb}cPu!bxWUz+n9(ZMDgK-M R5o4f144$rjF6*2UngCQVC{h3b diff --git a/images/buttons/scrollbars/scrolltop-minimal-active.png b/images/buttons/scrollbars/scrolltop-minimal-active.png deleted file mode 100644 index b0ae561f37e716f6fd59a4da7cb612c9d49cb122..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^fmdKI;Vst0D!PGJOBUy diff --git a/images/buttons/scrollbars/scrolltop-minimal-pressed.png b/images/buttons/scrollbars/scrolltop-minimal-pressed.png deleted file mode 100644 index 43fb3828ce5ff083b57e81550bdac19ba3376756..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^f!}?-P*8Ndp3PO)jbYYaPD^Q_C=s9u44$rj JF6*2UngCB-EoA@z diff --git a/images/buttons/scrollbars/scrolltop-pressed.png b/images/buttons/scrollbars/scrolltop-pressed.png index f6ecfa487b027385448fb0bfcc4c850e16c4088e..3c50f2385fbc2752236d8c3a8c7195d3435299a2 100644 GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^{6Nga!3HGTJ=&%KDYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>Fdh=fLWeLSw-&Gv-dzDGfx-C5RU7~fByfsXI||4rJn5) zqp~tH_xXCZb`3VR+Z=3cX=OgDd;V~kadWp!3rR?L;hV(3uy7}b&Vh`-yMQJzc)I$z JtaD0e0sw%!FHisg literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^l0eML!3HEZ{B>^zQVyOjjv*44lYjjGZ_m8e@bHJN zEeEY$*_#^pc}ql8{4?IMFdh=fLWeLS;p)~Tp>_M+tbA{gyVYhpa1{unHR6SUC(xj xQCXRp`*=MYb2%HEC+nlFohJ^zQu>}Qjv*44lYjjGZ_m8e@bHJN zEsn>(+D|no^OlIP_-8!h$N%&XXP5J+e{a%ln#s-JXJhj_ec!C(K&=d(u6{1-oD!M< DM$IHo