Selection colors; removed prevent-select from most of the stuff since it may be uncomfortable for the user

frontend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22.5.1-alpine AS builder
+FROM node:22.6.0-alpine AS builder
 
 WORKDIR /app
 
@@ -11,7 +11,7 @@ COPY . .
 RUN npm run build --env-file=production.env
 RUN npm prune --omit=dev
 
-FROM node:22.5.1-alpine AS deployer
+FROM node:22.6.0-alpine AS deployer
 
 WORKDIR /app
 

frontend/src/lib/components/announcement.svelte

@@ -1,9 +1,3 @@
-<!--
-    announcement.svelte
-
-    used to display a short announcement at the top of the site
--->
-
 <script>
     import { slide } from 'svelte/transition';
     export let message;
@@ -15,13 +9,16 @@
 </script>
 
 {#if visible}
-    <div transition:slide bind:this={noderef} class="announcement prevent-select" style="background-color: {color};">
+    <div transition:slide bind:this={noderef} class="announcement" style="background-color: {color};">
-        {#if link}
-            <a href={link}>{message}</a>
-        {:else}
-            {message}
-        {/if}
         
+        <span class="announcement__message">
+            {#if link}
+                <a href={link}>{message}</a>
+            {:else}
+                {message}
+            {/if}
+        </span>
+
         <input class="close-button" type="button" value="" on:click={() => visible = false}>
     </div>
 {/if}
@@ -31,22 +28,39 @@
         display: flex;
         justify-content: center;
         align-items: center;
+
         gap: 5px;
         height: 36px;
+    }
+
+    .announcement__message {
+        font-size: min(2.9vw, 18px);
+        overflow: hidden; 
+
+        white-space: nowrap;
+        text-size-adjust: auto;
+
         font-size: 18px;
         color: white;
+        /*TODO: selection color*/
+    }
+
+    .announcement__message::selection {
+        background-color: var(--col_panel);
     }
 
     .close-button {
+        height: 25px;
+        width: 25px;
+
         cursor: pointer;
         background-color: white;
+
         object-fit: contain;
         -webkit-mask-image: url('$lib/images/icons/ui/cross.svg');
         mask-image: url('$lib/images/icons/ui/cross.svg');
         mask-repeat: no-repeat;
         mask-size: contain;
-        height: 25px;
-        width: 25px;
     }
 
     a, a:visited, a:hover, a:active {

frontend/src/lib/components/footer.svelte

@@ -4,18 +4,16 @@
     import CatIcon from "$lib/images/icons/misc/cat.svg";
 	import TelegramIcon from "$lib/images/icons/social/telegram.svg";
     import MatrixIcon from "$lib/images/icons/social/matrix.svg";
-    import GiteaIcon from "$lib/images/icons/social/gitea.svg";
     import DiscordIcon from "$lib/images/icons/social/discord.svg";
 
 </script>
 
-<footer class="footer prevent-select">
+<footer class="footer">
 
-    <div class="container">
+    <div class="footer__social-notice-box">
-        <p class="social-row footer__social-notice">Me on other resources:</p>
+        <p class="social-row footer__social-notice-text">Me on other resources:</p>
     </div>
     
-    <div class="social-row footer__social-spacer"></div>
     <div class="social-row footer__social-links">
         <Icon image={TelegramIcon} size="32px"/>
         <Icon image={MatrixIcon} size="32px"/>
@@ -23,24 +21,25 @@
     </div>
 
     <div class="footer-column footer__column1">
-        <p class="footer-column-title">Мясо</p>
+        <p class="footer-column-title">WeirdCat.su</p>
         <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitrtempor invidunt ut aliquyam erat, sed diam voluptua. At vero eo</p>
 
     </div>
     <div class="footer-column footer__column2">
-        <p class="footer-column-title">Мясо</p>
+        <p class="footer-column-title">Useful links</p>
         <p>Buy a slave</p>
         <p>Hire me please</p>
         <p>Buy me a coffee</p>
         <p>Help</p>
     </div>
     <div class="footer-column footer__column3">
-        <p class="footer-column-title">Мясо</p>
+        <p class="footer-column-title">Contact</p>
-        <p>Мясо</p>
+        <p>nikolai@weirdcat.su</p>
-        <p>Мясо</p>
+        <p>+7 999 999 99 99</p>
+        <Icon image={CatIcon} size="64px"/>
     </div>
 
-    <p class="footer__copyright">(C) WeirdCat 2024</p>
+    <p class="footer__copyright">© WeirdCat 2024</p>
 
 </footer>
 
@@ -54,26 +53,65 @@
     .footer {
         display: grid;
         grid-template-columns: 1fr 1fr 1fr;
-        grid-template-areas: "social-notice spacer social-links"
+        grid-template-areas: "social-notice social-notice social-links"
                              "column1 column2 column3"
                              "copyright copyright copyright";
 
         box-shadow: 0px 5px var(--col_footer_copyright);
-
         background-color: var(--col_footer);
     }
 
     .social-row {
         padding: 20px;
+
         background-color: var(--col_panel);
     }
 
+    .footer__social-notice-box {
+        grid-area: social-notice;
+
+        height: 100%;
+        margin: 0;
+        padding: inherit 40px;
+
+        line-height: 30px;
+
+        background-color: var(--col_panel);
+    }
+
+    .footer__social-notice-text {
+        display: inline-block;
+        vertical-align: middle;
+
+        margin: 0 auto;
+        padding: inherit 40px;
+        width: 100%;
+
+        font-family: 'Source_Sans_3' sans-serif;
+        font-weight: bold;
+        font-size: 20px;
+        line-height:1fr;
+
+        color: var(--col_text_panel);
+    }
+
+    .footer__social-links {
+        display: flex;
+        justify-content: right;
+        grid-area: social-links;
+
+        gap: 20px;
+        width: auto;
+    }
+
     .footer-column {
 
         display: flex;
         flex-direction: column;
+        justify-self: center;
+
         gap: 20px;
-        padding: 30px 90px;
+        padding: 30px 20px;
 
         font-family: "Montserrat" sans-serif;
         font-size: 20px;
@@ -85,79 +123,106 @@
         margin-top: 0;
         margin-bottom: 0;
         padding: 0;
+    }
 
+    .footer__column1 {
+        grid-area: column1;
+    }
+
+    .footer__column2 {
+        grid-area: column2;
+    }
+
+    .footer__column3 {
+        grid-area: column3;
     }
 
     .footer-column-title {
-
         position: relative;
-        padding-bottom: 5px;
+        padding-bottom: 20px;
 
         font-family: "Source_Sans_3" sans-serif;
         font-weight: bold;
-
+        text-transform: uppercase;
     }
 
     .footer-column-title::after {
         content: "";
-        background-color: var(--col_text_footer);
+        
         position: absolute;
         bottom: 0;
         left: 0;
         height: 2px;
-        width: 45%;
+        width: 100px;
-    }
-
-    /*FIXME: Make another class title here*/
-    .container {
-        grid-area: social-notice;
-        color: var(--col_panel);
-        margin: 0;
-    }
-
-    .footer__social-notice {
-
-        margin: 0;
-        padding: 20px;
-        height: 32px;
-
-        font-family: 'Source_Sans_3' sans-serif;
-        font-weight: bold;
-        font-size: 20px;
-
-        color: var(--col_text_panel);
-    }
-
-    .footer__social-spacer {
-
-        grid-area: spacer;
-        width: auto;
-
-    }
-
-    .footer__social-links {
-
-        display: flex;
-        justify-content: right;
-        gap: 20px;
-        grid-area: social-links;
-        width: 1fr;
 
+        background-color: var(--col_text_footer);
     }
 
     .footer__copyright {
         grid-area: copyright;
+
         margin: auto 0 0 0;
+        padding: 10px;
         height: fit-content;
-        width: 100%;
 
         font-family: "Montserrat" sans-serif;
         font-size: 24px;
-        color: var(--col_text_copyright);
-
         text-align: center;
 
+        color: var(--col_text_copyright);
         background-color: var(--col_footer_copyright);
     }
 
+    @media screen and (max-width: 800px) {
+        .footer {
+            grid-template-areas: "social-notice social-notice social-links"
+                             "column1 column1 column1"
+                             "column2 column2 column2"
+                             "column3 column3 column3"
+                             "copyright copyright copyright";
+        }
+
+        .footer-column
+        {
+            justify-content: center;
+            justify-items: center;
+
+            padding: 30px 20px;
+            max-width: 60%;
+            width: 100%;
+
+            text-align: center;
+        }
+
+        .footer-column > :global(.icon) {
+            align-self: center;
+        }
+
+        .footer-column-title::after {
+            left: 0;
+            width: 100%;
+            max-width: 100%;
+        }
+    }
+
+    @media screen and (max-width: 543px) {
+
+        .footer {
+            grid-template-areas: "social-links social-links social-links"
+                                 "column1 column1 column1"
+                                 "column2 column2 column2"
+                                 "column3 column3 column3"
+                                 "copyright copyright copyright";
+        }
+
+        .footer__social-notice-text {
+            display: none;
+        }
+
+        .footer__social-links {
+            justify-content: center;
+            gap: 10%;
+            margin: inherit 20px;
+        }
+    }
 </style>

frontend/src/lib/components/header.svelte

@@ -5,14 +5,14 @@
     import MenuIcon from "$lib/images/icons/ui/menu.svg";
     import LanguageIcon from "$lib/images/icons/ui/language.svg";
     import DarkmodeIcon from "$lib/images/icons/ui/darkmode.svg";
-	import Spacer from "./service/spacer.svelte";
+	
 	import Searchbar from "./searchbar.svelte";
     
 </script>
 
-<header class="header prevent-select" data-sveltekit-preload-data="hover">
+<header class="header" data-sveltekit-preload-data="hover">
 
-    <div class="container">
+    <div class="container header-left">
         <Icon class="header__menu-button" image={MenuIcon} size="64px"/>
 
         <img class="header__logo" alt="WeirdCat.su" src={Logo}>
@@ -24,8 +24,8 @@
 
     <Searchbar id="searchbar"/>
 
-    <div class="container">
+    <div class="container header-right">
-        <Spacer type="left"/>
+        
         <Icon class="header__language-button" image={LanguageIcon} size="40px"/>
         <Icon class="header__darkmode-button" image={DarkmodeIcon} size="40px"/>
     </div>
@@ -39,17 +39,30 @@
         align-items: center;
 
         gap: 20px;
-        padding: 5px 20px 5px 20px;
+        padding: 5px 10px;
 
         height: 74px;
+
         background-color: var(--col_panel);
         box-shadow: 0px 6px 5px -5px rgba(0,0,0,0.3);
     }
 
+    .container {
+        display: flex;
+        align-items: inherit;
+        justify-self: right;
+
+        padding: inherit;
+        gap: inherit;
+    }
+
+    .header-left {
+        margin-right: auto;
+    }
+
     .header__logo {
         height: 64px;
         width: 64px;
-
     }
 
     :global(.header__menu-button) {
@@ -66,11 +79,8 @@
         color: var(--col_text_hint);
     }
 
-    .container {
+    .header-right {
-        display: flex;
+        justify-self: right;
-        align-items: inherit;
-        padding: inherit;
-        gap: inherit;
     }
 
     @media only screen and (max-width: 1036px) {
@@ -80,14 +90,12 @@
     }
 
     @media only screen and (max-width: 935px) {
-
         .header {
             grid-template-columns: auto auto 1fr;
         }
     }
 
     @media only screen and (max-width: 730px) {
-
         .header {
             grid-template-columns: auto auto auto;
         }
@@ -110,5 +118,4 @@
             grid-template-columns: 1fr 1fr;
         }
     }
-
 </style>

frontend/src/lib/components/icon.svelte

@@ -1,5 +1,3 @@
-<!-- FIXME: deal with this mess in style property. You can't do all that right in your HTML -->
-
 <script>
     export let image = "";
     export let onclick;
@@ -13,21 +11,23 @@
 
 </script>
 
-<!-- FIXME: You horrible son of a goose-->
+<input class="{externalClasses} {Clickablility} icon prevent-select" type="button" value="" 
-<input class="{externalClasses} {Clickablility} icon" type="button" value="" 
+style="--icon-image: url({image}); --icon-color: {color}; --icon-size: {size};" 
-style="--image: url({image}); --color: {color}; background-color: {color}; --size: {size};" 
 on:click={onclick ? onclick : null}>
 
 <style>
     :global(.icon) {
-        background-color: var(--color);
+
+        height: var(--icon-size);
+        width: var(--icon-size);
+
+        background-color: var(--icon-color);
+
         object-fit: contain;
-        -webkit-mask-image: var(--image);
+        -webkit-mask-image: var(--icon-image);
-        mask-image: var(--image);
+        mask-image: var(--icon-image);
         mask-repeat: no-repeat;
         mask-size: contain;
-        height: var(--size);
-        width: var(--size);
     }
 
     .clickable {

frontend/src/lib/components/searchbar.svelte

@@ -19,26 +19,25 @@
 
 <style>
     .searchbar {
-
         display: flex;
         align-items: center;
 
-        background-color: var(--col_panel_field);
-        border-radius: 30px;
-
-
         width: auto;
         height: 36px;
         padding: 10px;
+
+        background-color: var(--col_panel_field);
+        border-radius: 30px;
     }
 
     .searchbar__input {
-        border: none;
-        background-color: transparent;
-        color: var(--col_text_panel);
-
         max-width: 200px;
+
         font-size: 16px;
+
+        color: var(--col_text_panel);
+        background-color: transparent;
+        border: none;
     }
 
     .searchbar__input:focus {
@@ -50,7 +49,6 @@
     }
 
     @media only screen and (max-width: 935px) {
-
         .searchbar {
             margin-left: auto;
         }
@@ -63,7 +61,6 @@
     }
 
     @media only screen and (max-width: 730px) {
-
         .searchbar {
             margin-left: auto;
         }
@@ -73,11 +70,9 @@
         .compact {
             display: none;
         }
-
     }
 
     @media only screen and (max-width: 506px) {
-
         .searchbar {
             margin-left: auto;
         }
@@ -88,5 +83,4 @@
             display: flex;
         }
     }
-
 </style>

frontend/src/lib/components/service/spacer.svelte

@@ -1,31 +0,0 @@
-<script>
-    export let type = "left"; 
-
-    let rule = "";
-
-    if (type == "left") {
-        rule = "margin-left: auto";
-    }
-    if (type == "right") {
-        rule = "margin-right: auto";
-    }
-    if (type == "top") {
-        rule = "margin-top: auto";
-    }
-    if (type == "bottom") {
-        rule = "margin-bottom: auto";
-    }
-    if (type == "vertical") {
-        rule = "margin-top: auto; margin-bottom: auto";
-    }
-    if (type == "horizontal") {
-        rule = "margin-left: auto; margin-right: auto";
-    }
-
-    if (rule == "") {
-        console.error("Invalid spacer type: " + type);
-    }
-
-</script>
-
-<div class="spacer" style="{rule}"/>

frontend/src/lib/css/colors.css

@@ -9,14 +9,16 @@
     --col_accent: #5dc98e;
 
     --col_text: #000000;
+    --col_text_select: #5dc98e;
     --col_text_query: #ffffff;
     --col_text_invalid: #cc0000;
     --col_text_hint: #dedede; 
     --col_text_panel: #ffffff;
+    --col_text_panel_select: #be4286; 
     --col_text_footer: #ffffff;
+    --col_text_footer_select: #5dc98e;
     --col_text_copyright: #ffffff;
 
-    --col_text_selection: #5dc98e;
 }
 
 @media (prefers-color-scheme: dark) {
@@ -32,5 +34,5 @@ body {
 
 ::selection {
     color: var(--col_text_panel);
-    background: var(--col_text_selection);
+    background: var(--col_text_select);
 }

frontend/src/routes/+layout.svelte

@@ -15,7 +15,7 @@
     
 </script>
 
-<Announcement message="This site is yet in development" color="var(--col_accent)"/>
+<Announcement message="Lorem ipsum dolor sit ameto, consetetur sadipscing" color="var(--col_accent)"/>
 <Header/>
 <main>
     <slot class="content"></slot>
@@ -24,6 +24,6 @@
 
 <style>
     main {
-    height: 100vh;
+    height: 90vh;
     }
 </style>

frontend/vite.config.js

@@ -2,5 +2,10 @@ import { sveltekit } from '@sveltejs/kit/vite';
 import { defineConfig } from 'vite';
 
 export default defineConfig({
+	build: {
+		assetsInlineLimit: (file) => {
+			return !file.endsWith('.svg');
+		}
+	},
 	plugins: [sveltekit()]
-});
+});