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 0000000..b61ad6d Binary files /dev/null and b/res/include/img/background_patterns/checker_ukraine.png differ 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 0000000..a77ead4 Binary files /dev/null and b/res/include/img/background_patterns/checker_ukraine_light.png differ 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. + + + close + + +{/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 {