update theme

app/javascript/skins/glitch/metulayf/variables.scss

@@ -10,9 +10,9 @@ $red-bookmark: $warning-red;
 
 // Kafuka Theme Unique Colors. Color names may come later.
 $classic-base-color: #0c0c0c;
-$classic-primary-color: #ee7487;
+$classic-primary-color: #a81717; //ee7487;
 $classic-secondary-color: #edfcf5;
-$classic-highlight-color: #e31837;
+$classic-highlight-color: #df1717; //e31837;
 
 // Variables for defaults in UI
 $base-shadow-color: $black !default;

config/locales/en.yml

@@ -1,13 +1,8 @@
 ---
 en:
   about:
-<<<<<<< HEAD
-    about_hashtag_html: These are public toots tagged with <strong>#%{hashtag}</strong>. You can interact with them if you have an account anywhere in the fediverse.
-    about_mastodon_html: 'The social network of the future: No ads, no corporate surveillance, ethical design, and decentralization! Own your data with metu.life!'
-=======
     about_hashtag_html: These are public posts tagged with <strong>#%{hashtag}</strong>. You can interact with them if you have an account anywhere in the fediverse.
     about_mastodon_html: 'The social network of the future: No ads, no corporate surveillance, ethical design, and decentralization! Own your data with Mastodon!'
->>>>>>> glitch_origin/main
     about_this: About
     active_count_after: active
     active_footnote: Monthly Active Users (MAU)
@@ -37,17 +32,11 @@ en:
     server_stats: 'Server stats:'
     source_code: Source code
     status_count_after:
-<<<<<<< HEAD
-      one: status
-      other: statuses
-    status_count_before: Who authored
-    tagline: Follow hocams and discover new ones
-=======
       one: post
       other: posts
     status_count_before: Who published
-    tagline: Follow friends and discover new ones
->>>>>>> glitch_origin/main
+    status_count_before: Who authored
+    tagline: Follow hocams and discover new ones
     terms: Terms of service
     unavailable_content: Moderated servers
     unavailable_content_description:
@@ -668,12 +657,9 @@ en:
         desc_html: You can write your own privacy policy, terms of service or other legalese. You can use HTML tags
         title: Custom terms of service
       site_title: Server name
-<<<<<<< HEAD
       spam_check_enabled:
         desc_html: metu.life can auto-report accounts that send repeated unsolicited messages. There may be false positives.
         title: Anti-spam automation
-=======
->>>>>>> glitch_origin/main
       thumbnail:
         desc_html: Used for previews via OpenGraph and API. 1200x630px recommended
         title: Server thumbnail

config/locales/simple_form.en.yml

@@ -35,13 +35,8 @@ en:
         current_password: For security purposes please enter the password of the current account
         current_username: To confirm, please enter the username of the current account
         digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
-<<<<<<< HEAD
-        discoverable: The profile directory is another way by which your account can reach a wider audience
         email: You will be sent a confirmation e-mail. Only <strong>metu-mails</strong> are accepted.
-=======
         discoverable: Allow your account to be discovered by strangers through recommendations and other features
-        email: You will be sent a confirmation e-mail
->>>>>>> glitch_origin/main
         fields: You can have up to 4 items displayed as a table on your profile
         header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
         inbox_url: Copy the URL from the frontpage of the relay you want to use

config/locales/simple_form.tr.yml

@@ -123,10 +123,10 @@ tr:
         avatar: Profil resmi
         bot: Bu bir bot hesabı
         chosen_languages: Dilleri filtrele
-        confirm_new_password: Yeni şifreyi onayla
-        confirm_password: Şifreyi onayla
+        confirm_new_password: Yeni parolayı onayla
+        confirm_password: Parolayı onayla
         context: İçeriği filtrele
-        current_password: Geçerli şifre
+        current_password: Geçerli parola
         data: Veri
         discoverable: Bu hesabı dizinde listele
         display_name: Görünen isim
@@ -140,10 +140,10 @@ tr:
         locale: Arayüz dili
         locked: Hesabı kilitle
         max_uses: Maksimum kullanım sayısı
-        new_password: Yeni şifre
+        new_password: Yeni parola
         note: Kişisel bilgiler
         otp_attempt: İki adımlı doğrulama kodu
-        password: Şifre
+        password: Parola
         phrase: Anahtar kelime veya kelime öbeği
         setting_advanced_layout: Gelişmiş web arayüzünü etkinleştir
         setting_aggregate_reblogs: Zaman çizelgesinde grup boostları

config/locales/tr.yml

@@ -656,12 +656,9 @@ tr:
         desc_html: Kendi gizlilik politikanızı, hizmet şartlarınızı ya da diğer hukuki metinlerinizi yazabilirsiniz. HTML etiketleri kullanabilirsiniz
         title: Özel hizmet şartları
       site_title: Site başlığı
-<<<<<<< HEAD
       spam_check_enabled:
-        desc_html: metu.life, tekrar eden istenmeyen mesajlar gönderen hesapları otomatik olarak susturabilir ve şikayet edebilir. Yanlışlar olabilir.
+        desc_html: metu.life, tekrar eden istenmeyen mesajlar gönderen hesapları otomatik olarak susturabilir ve şikayet edebilir.
         title: Anti-spam otomasyonu
-=======
->>>>>>> glitch_origin/main
       thumbnail:
         desc_html: OpenGraph ve API ile ön izlemeler için kullanılır. 1200x630px tavsiye edilir
         title: Sunucu küçük resmi