Преглед изворни кода

Merge branch 'fun-stuff' into 'cunnyborea'

pleromatan and wotnot

See merge request yano_pettanko/pleroma-fe!2
Erika Yano пре 1 месец
родитељ
комит
a4c3547334

+ 1 - 1
config/index.js

@@ -33,7 +33,7 @@ module.exports = {
   },
   dev: {
     env: require('./dev.env'),
-    port: 8080,
+    port: 8082,
     settings,
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',

+ 10 - 9
index.html

@@ -51,6 +51,7 @@
        height: calc(10em * var(--scale));
        object-fit: contain;
        object-position: bottom;
+       margin-left: -1.5em;
        transform: translateZ(-2em);
      }
 
@@ -62,14 +63,14 @@
        z-index: 2;
        grid-template-rows: repeat(8, 1fr);
        grid-template-columns: repeat(5, 1fr);
-       grid-template-areas: "P P . L L"
-                            "P P . L L"
-                            "P P . L L"
-                            "P P . L L"
-                            "P P . . ."
-                            "P P . . ."
-                            "P P . E E"
-                            "P P . E E";
+       grid-template-areas: "P P L L L L"
+                            "P P L L L L"
+                            "P P . . . ."
+                            "P P . . . ."
+                            "P P . . . ."
+                            "P P . . . ."
+                            "P P E E E E"
+                            "P P E E E E";
      }
 
      .chunk {
@@ -131,7 +132,7 @@
         <div id="status" class="css-ok">
           <!-- (。>﹏<) -->
           <!-- it's a pseudographic, don't want screenreader read out nonsense -->
-          <span aria-hidden="true" class="initial-text">(。&gt;﹏&lt;)</span>
+          <span aria-hidden="true" class="initial-text">(╥‸╥)</span>
         </div>
       </div>
     </div>

BIN
src/assets/pleromatan_apology.png


BIN
src/assets/pleromatan_apology_fox.png


BIN
src/assets/pleromatan_apology_fox_mask.png


BIN
src/assets/pleromatan_apology_mask.png


+ 7 - 7
src/i18n/en.json

@@ -289,7 +289,7 @@
     },
     "content_type_selection": "Post format",
     "content_warning": "Subject (optional)",
-    "default": "Just landed in L.A.",
+    "default": "Just landed in Cunnyborea",
     "direct_warning_to_all": "This post will be visible to all the mentioned users.",
     "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
     "edit_remote_warning": "Other remote instances may not support editing and unable to receive the latest version of your post.",
@@ -1417,12 +1417,12 @@
     "theme": "Applying theme, please wait warmly...",
     "instance": "Getting instance info...",
     "settings": "Applying settings...",
-    "almost": "Reticulating splines...",
-    "fun_1": "Drink more water",
-    "fun_2": "Take it easy!",
-    "fun_3": "Suya...",
-    "fun_4": "My Pleroma machine is full power!",
-    "error": "Something went wrong"
+    "almost": "Remember to backup your drives...",
+    "fun_1": "Drink more cunny juice",
+    "fun_2": "PLAP! PLAP! PLAP!!! 💢💢💢",
+    "fun_3": "GET PREGNANT! GET PREGNANT! GET PREGNANT!",
+    "fun_4": "Uoooohhh!! Correction needed!!! 😭 💢",
+    "error": "Oy gevalt! We're fucked!"
   },
   "bookmark_folders": {
     "select_folder": "Select bookmark folder",

BIN
static/pleromatan_apology.png


BIN
static/pleromatan_apology_fox.png


BIN
static/pleromatan_apology_fox_mask.png


BIN
static/pleromatan_apology_mask.png