From a40d9ecfff72c7af3a75f335319a3c31ac327ae8 Mon Sep 17 00:00:00 2001 From: Fornax Date: Sat, 5 Mar 2022 10:48:14 +0100 Subject: [PATCH] Update branding to show support for Ukraine --- .../background_patterns/checker_ukraine.png | Bin 0 -> 7833 bytes .../checker_ukraine_light.png | Bin 0 -> 383 bytes .../img/background_patterns/create_dark.sh | 1 + res/include/style/layout.css | 2 +- svelte/src/file_viewer/FileViewer.svelte | 17 ++++--- svelte/src/file_viewer/UkrainePopup.svelte | 45 ++++++++++++++++++ webcontroller/user_style.go | 3 +- 7 files changed, 57 insertions(+), 11 deletions(-) create mode 100644 res/include/img/background_patterns/checker_ukraine.png create mode 100644 res/include/img/background_patterns/checker_ukraine_light.png create mode 100644 svelte/src/file_viewer/UkrainePopup.svelte diff --git a/res/include/img/background_patterns/checker_ukraine.png b/res/include/img/background_patterns/checker_ukraine.png new file mode 100644 index 0000000000000000000000000000000000000000..b61ad6dda8954e8a02253aadcff518e24bad78a1 GIT binary patch literal 7833 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 literal 0 HcmV?d00001 diff --git a/res/include/img/background_patterns/checker_ukraine_light.png b/res/include/img/background_patterns/checker_ukraine_light.png new file mode 100644 index 0000000000000000000000000000000000000000..a77ead420e53aca28e91f10c2cf3af1b43399a3b GIT binary patch literal 383 zcmeAS@N?(olHy`uVBq!ia0vp^d_XM4#0(^VCAOXiQY`6?zK#qG8~eHcB(ehe3dtTp zz6=aiY77hwEkIR3p@tU>45bDP46hOx7_4S6Fo+k-*%fF5l;8>Q332`Z{mhxC|IeH` z^Z)<<4O5;!28uH#dAqwX3-b7U0&>_(Jbhi+pD{CXvI!n|_qh-#RN(327{YO#_pBmc zi-CZ{MSo$QEMB>@npG`=vM!>#mam9wJ-9~7!z06gXY#)4pFB$$bi)sAmb`B)8JoH= zv&B8qLb%QA!;zN`k*zMmDkX}3`{gtgA#3n# zx;?v@Qqba=PcwjatCqM%l%ynwV0|P4q lgY!#Hf&vJkAvZrIGp!Q0hJ8N^i-8&#JYD@<);T3K0RXr4dd2_% literal 0 HcmV?d00001 diff --git a/res/include/img/background_patterns/create_dark.sh b/res/include/img/background_patterns/create_dark.sh index 8152d9b..4083399 100755 --- a/res/include/img/background_patterns/create_dark.sh +++ b/res/include/img/background_patterns/create_dark.sh @@ -7,5 +7,6 @@ convert checker_dwarf.png -brightness-contrast 80x0 checker_dwarf_light.png convert checker_developers.png -brightness-contrast 80x0 checker_developers_light.png convert checker_halloween.png -brightness-contrast 80x0 checker_halloween_light.png convert checker_christmas.png -brightness-contrast 80x0 checker_christmas_light.png +convert checker_ukraine.png -brightness-contrast 80x0 checker_ukraine_light.png optipng *.png diff --git a/res/include/style/layout.css b/res/include/style/layout.css index 4002139..8c99933 100644 --- a/res/include/style/layout.css +++ b/res/include/style/layout.css @@ -63,7 +63,7 @@ header, footer, .checkers { background-image: url("{{.BackgroundPattern}}"); background-color: var(--layer_1_color); background-repeat: repeat; - background-blend-mode: luminosity; + /* background-blend-mode: luminosity; */ } header, footer { box-shadow: inset 1px 1px 8px 0 var(--shadow_color); diff --git a/svelte/src/file_viewer/FileViewer.svelte b/svelte/src/file_viewer/FileViewer.svelte index 2ef6d58..4f26572 100644 --- a/svelte/src/file_viewer/FileViewer.svelte +++ b/svelte/src/file_viewer/FileViewer.svelte @@ -20,6 +20,7 @@ import GalleryView from "./GalleryView.svelte"; import Spinner from "../util/Spinner.svelte"; import Downloader from "./Downloader.svelte"; import CustomBanner from "./CustomBanner.svelte"; +import UkrainePopup from "./UkrainePopup.svelte"; let loading = true let embedded = false @@ -400,6 +401,10 @@ const keyboard_event = evt => { {/if} + {#if ads_enabled} + + {/if} + {#if is_list && view === "file"} { {:else if custom_footer} - {:else if !window.viewer_data.user_ads_enabled && !embedded} -
- Thank you for supporting pixeldrain! -
- {:else if !ads_enabled && !embedded} -
- The uploader of this file disabled advertisements. You can do the same for only €2 per month! -
{/if} {details_visible = e.detail}} title="File details" width="1200px"> @@ -621,7 +618,9 @@ const keyboard_event = evt => { - + {#if ads_enabled} + + {/if} diff --git a/svelte/src/file_viewer/UkrainePopup.svelte b/svelte/src/file_viewer/UkrainePopup.svelte new file mode 100644 index 0000000..3b19c74 --- /dev/null +++ b/svelte/src/file_viewer/UkrainePopup.svelte @@ -0,0 +1,45 @@ + + +{#if visible} +
+
+ πŸ‡ΊπŸ‡¦ Russia has invaded Ukraine and is murdering its citizens! πŸ‡ΊπŸ‡¦
+ There are a number of ways you can help: + Click here for more information. +
+ +
+{/if} + + diff --git a/webcontroller/user_style.go b/webcontroller/user_style.go index e9527bc..4255238 100644 --- a/webcontroller/user_style.go +++ b/webcontroller/user_style.go @@ -180,7 +180,8 @@ func (s pixeldrainStyleSheet) Background(tpl *template.Template) template.URL { } else if month == time.December && (day == 25 || day == 26 || day == 27) { file = "checker_christmas" } else { - file = fmt.Sprintf("checker%d", now.UnixNano()%18) + file = "checker_ukraine" + // file = fmt.Sprintf("checker%d", now.UnixNano()%18) } if s.Light {