diff --git a/app/controllers/custom_css_controller.rb b/app/controllers/custom_css_controller.rb deleted file mode 100644 index 31e50160..00000000 --- a/app/controllers/custom_css_controller.rb +++ /dev/null @@ -1,10 +0,0 @@ -# frozen_string_literal: true - -class CustomCssController < ApplicationController - before_action :set_cache_headers - - def show - skip_session! - render plain: Setting.custom_css || '', content_type: 'text/css' - end -end diff --git a/app/javascript/styles/gabsocial/forms.scss b/app/javascript/styles/gabsocial/forms.scss index d4931cc5..614f897d 100644 --- a/app/javascript/styles/gabsocial/forms.scss +++ b/app/javascript/styles/gabsocial/forms.scss @@ -778,7 +778,6 @@ code { .form_admin_settings_site_description, .form_admin_settings_site_extended_description, .form_admin_settings_site_terms, -.form_admin_settings_custom_css, .form_admin_settings_closed_registrations_message { textarea { font-family: $font-monospace, monospace; diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index 86a86ec6..e044c562 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -23,7 +23,6 @@ class Form::AdminSettings peers_api_enabled show_known_fediverse_at_about_page preview_sensitive_media - custom_css profile_directory thumbnail hero diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml index 4178729f..912b9c61 100644 --- a/app/views/admin/settings/edit.html.haml +++ b/app/views/admin/settings/edit.html.haml @@ -73,7 +73,6 @@ = f.input :closed_registrations_message, as: :text, wrapper: :with_block_label, label: t('admin.settings.registrations.closed_message.title'), hint: t('admin.settings.registrations.closed_message.desc_html'), input_html: { rows: 8 } = f.input :site_extended_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_description_extended.title'), hint: t('admin.settings.site_description_extended.desc_html'), input_html: { rows: 8 } = f.input :site_terms, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_terms.title'), hint: t('admin.settings.site_terms.desc_html'), input_html: { rows: 8 } - = f.input :custom_css, wrapper: :with_block_label, as: :text, input_html: { rows: 8 }, label: t('admin.settings.custom_css.title'), hint: t('admin.settings.custom_css.desc_html') .actions = f.button :button, t('generic.save_changes'), type: :submit diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 4523d6d6..8fda8150 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -49,9 +49,6 @@ = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous' = csrf_meta_tags - - if Setting.custom_css.present? - = stylesheet_link_tag custom_css_path, media: 'all' - = yield :header_tags %body{ class: body_classes } diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 5a0be3c8..0915c471 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -391,9 +391,6 @@ ar: contact_information: email: البريد الإلكتروني المهني username: الإتصال بالمستخدِم - custom_css: - desc_html: يقوم بتغيير المظهر بواسطة سي أس أس يُحمَّل على كافة الصفحات - title: سي أس أس مخصص hero: desc_html: معروض على الصفحة الأولى. لا يقل عن 600 × 100 بكسل. عند عدم التعيين ، تعود الصورة إلى النسخة المصغرة على سبيل المثال title: الصورة الرأسية diff --git a/config/locales/ca.yml b/config/locales/ca.yml index b4b41876..8a25af7a 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -394,9 +394,6 @@ ca: contact_information: email: Introdueix una adreça de correu electrònic pública username: Nom d'usuari del contacte - custom_css: - desc_html: Modifica l'aspecte amb CSS carregat a cada pàgina - title: CSS personalitzat hero: desc_html: Es mostra en pàgina frontal. Recomanat al menys 600x100px. Si no es configura es mostrarà el del servidor title: Imatge d’heroi diff --git a/config/locales/co.yml b/config/locales/co.yml index 57f70dc5..bf7f3e0a 100644 --- a/config/locales/co.yml +++ b/config/locales/co.yml @@ -394,9 +394,6 @@ co: contact_information: email: E-mail prufissiunale username: Identificatore di cuntattu - custom_css: - desc_html: Mudificà l'apparenza cù CSS caricatu nant'à ogni pagina - title: CSS persunalizatu hero: desc_html: Affissatu nant’a pagina d’accolta. Ricumandemu almenu 600x100px. S’ellu ùn hè micca definiti, a vignetta di u servore sarà usata title: Ritrattu di cuprendula diff --git a/config/locales/cs.yml b/config/locales/cs.yml index ce56ccba..4beec5bf 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -400,9 +400,6 @@ cs: contact_information: email: Pracovní e-mail username: Uživatelské jméno pro kontaktování - custom_css: - desc_html: Pozměnit vzhled pomocí šablony CSS načtené na každé stránce - title: Vlastní CSS hero: desc_html: Zobrazuje se na hlavní stránce. Doporučuje se rozlišení alespoň 600x100 px. Pokud toto není nastaveno, bude zobrazena miniatura serveru title: Hlavní obrázek diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 85a490ca..63fef0b4 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -396,9 +396,6 @@ cy: contact_information: email: E-bost busnes username: Enw defnyddiwr cyswllt - custom_css: - desc_html: Addasu gwedd gyda CSS wedi lwytho ar bob tudalen - title: CSS wedi'i addasu hero: desc_html: Yn cael ei arddangos ar y dudadlen flaen. Awgrymir 600x100px oleia. Pan nad yw wedi ei osod, mae'n ymddangos fel mân-lun yr achos title: Delwedd arwr diff --git a/config/locales/da.yml b/config/locales/da.yml index 14096402..9478d587 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -339,9 +339,6 @@ da: contact_information: email: Forretnings email username: Kontakt brugernavn - custom_css: - desc_html: Ændre udseendet med CSS indlæst på hver side - title: Brugerdefineret CSS hero: desc_html: Vist på forsiden. Mindst 600x100px anbefales. Hvis ikke sat, vil dette falde tilbage til billedet fra serveren title: Billede af helt diff --git a/config/locales/de.yml b/config/locales/de.yml index a18f8093..4b1eb5a9 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -394,9 +394,6 @@ de: contact_information: email: Öffentliche E-Mail-Adresse username: Profilname für die Kontaktaufnahme - custom_css: - desc_html: Verändere das Aussehen mit CSS, dass auf jeder Seite geladen wird - title: Benutzerdefiniertes CSS hero: desc_html: Wird auf der Startseite angezeigt. Mindestens 600x100px sind empfohlen. Wenn es nicht gesetzt wurde, wird das Server-Thumbnail dafür verwendet title: Bild für Startseite diff --git a/config/locales/el.yml b/config/locales/el.yml index 7e2c820b..ff3aba4e 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -387,9 +387,6 @@ el: contact_information: email: Επαγγελματικό email username: Όνομα χρήστη επικοινωνίας - custom_css: - desc_html: Τροποποίηση της εμφάνισης μέσω CSS που φορτώνεται σε κάθε σελίδα - title: Προσαρμοσμένο CSS hero: desc_html: Εμφανίζεται στην μπροστινή σελίδα. Συνίσταται τουλάχιστον 600x100px. Όταν λείπει, χρησιμοποιείται η μικρογραφία του κόμβου title: Εικόνα ήρωα diff --git a/config/locales/en.yml b/config/locales/en.yml index 2ff1d089..2eb03736 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -417,9 +417,6 @@ en: contact_information: email: Business e-mail username: Contact username - custom_css: - desc_html: Modify the look with CSS loaded on every page - title: Custom CSS hero: desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to server thumbnail title: Hero image diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index ccad6f07..51574363 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -387,9 +387,6 @@ en_GB: contact_information: email: Business e-mail username: Contact username - custom_css: - desc_html: Modify the look with CSS loaded on every page - title: Custom CSS hero: desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to server thumbnail title: Hero image diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 047d6deb..b615ef4e 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -388,9 +388,6 @@ eo: contact_information: email: Publika retadreso username: Kontakta uzantnomo - custom_css: - desc_html: Ŝanĝi la aspekton per CSS ŝargita en ĉiu pago - title: Propra CSS hero: desc_html: Montrata en la ĉefpaĝo. Almenaŭ 600x100px rekomendita. Kiam ne agordita, la bildeto de la servilo estos uzata title: Kapbildo diff --git a/config/locales/es.yml b/config/locales/es.yml index 2249780e..13198521 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -344,9 +344,6 @@ es: contact_information: email: Correo de trabajo username: Nombre de usuario - custom_css: - desc_html: Modificar el aspecto con CSS cargado en cada página - title: CSS personalizado hero: desc_html: Mostrado en la página principal. Recomendable al menos 600x100px. Por defecto se establece a la miniatura de la instancia title: Imagen de portada diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 85bee588..8cd1ddca 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -371,9 +371,6 @@ eu: contact_information: email: Laneko e-mail helbidea username: Kontaktuaren erabiltzaile-izena - custom_css: - desc_html: Aldatu itxura orri bakoitzean kargatutako CSS bidez - title: CSS pertsonala hero: desc_html: Azaleko orrian bistaratua. Gutxienez 600x100px aholkatzen da. Ezartzen ez bada, zerbitzariaren irudia hartuko du title: Azaleko irudia diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 15886b6b..719c4cd9 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -387,9 +387,6 @@ fa: contact_information: email: ایمیل کاری username: نام کاربری - custom_css: - desc_html: ظاهر ماستدون را با CSS-ای که در همهٔ صفحه‌ها جاسازی می‌شود تغییر دهید - title: سبک CSS سفارشی hero: desc_html: در صفحهٔ آغازین نمایش می‌یابد. دست‌کم ۶۰۰×۱۰۰ پیکسل توصیه می‌شود. اگر تعیین نشود، با تصویر بندانگشتی سرور جایگزین خواهد شد title: تصویر سربرگ diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 4afe8e96..10d42ad1 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -372,9 +372,6 @@ fr: contact_information: email: Entrez une adresse courriel publique username: Entrez un nom d’utilisateur⋅ice - custom_css: - desc_html: Modifier l'apparence avec une CSS chargée sur chaque page - title: CSS personnalisé hero: desc_html: Affichée sur la page d’accueil. Au moins 600x100px recommandé. Lorsqu’elle n’est pas définie, se rabat sur la vignette du serveur title: Image d’en-tête diff --git a/config/locales/gl.yml b/config/locales/gl.yml index cd74b812..de45c07d 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -387,9 +387,6 @@ gl: contact_information: email: e-mail de traballo username: Nome de usuaria de contacto - custom_css: - desc_html: Modificar o aspecto con CSS cargado en cada páxina - title: CSS persoalizado hero: desc_html: Mostrado na portada. Recoméndase 600x100px como mínimo. Se non se establece, mostrará a imaxe por omisión do servidor title: Imáxe Heróe diff --git a/config/locales/it.yml b/config/locales/it.yml index 2bbccab1..cc874c1c 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -366,9 +366,6 @@ it: title: Seguiti predefiniti per i nuovi utenti contact_information: username: Nome utente del contatto - custom_css: - desc_html: Modifica l'aspetto con il CSS caricato in ogni pagina - title: CSS personalizzato hero: desc_html: Mostrata nella pagina iniziale. Almeno 600x100 px consigliati. Se non impostata, sarà usato il thumbnail del server title: Immagine dell'eroe diff --git a/config/locales/ja.yml b/config/locales/ja.yml index fa4c2bdd..a966b2c7 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -394,9 +394,6 @@ ja: contact_information: email: ビジネスメールアドレス username: 連絡先ユーザー名 - custom_css: - desc_html: 全ページに適用されるCSSの編集 - title: カスタムCSS hero: desc_html: フロントページに表示されます。サイズは600x100px以上推奨です。未設定の場合、標準のサムネイルが使用されます title: ヒーローイメージ diff --git a/config/locales/kk.yml b/config/locales/kk.yml index 69118a4e..46af9095 100644 --- a/config/locales/kk.yml +++ b/config/locales/kk.yml @@ -372,9 +372,6 @@ kk: contact_information: email: Бизнес e-mail username: Қолданушымен байланыс - custom_css: - desc_html: Әр беттегі өзгерістерді CSS жаңаруымен қарау - title: Жеке CSS hero: desc_html: Бастапқы бетінде көрсетіледі. Кем дегенде 600x100px ұсынылады. Орнатылмаған кезде, сервердің нобайына оралады title: Қаһарман суреті diff --git a/config/locales/ko.yml b/config/locales/ko.yml index c81474b4..4d3468ac 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -396,9 +396,6 @@ ko: contact_information: email: 공개할 메일 주소를 입력 username: 연락 받을 관리자 유저네임 - custom_css: - desc_html: 모든 페이지에 적용할 CSS - title: 커스텀 CSS hero: desc_html: 프론트페이지에 표시 됩니다. 최소 600x100픽셀을 권장합니다. 만약 설정되지 않았다면, 서버의 썸네일이 사용 됩니다 title: 히어로 이미지 diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 44f8d30d..77e0035f 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -380,9 +380,6 @@ lt: contact_information: email: Verslo el paštas username: Kontaktinis slapyvardis - custom_css: - desc_html: Pakeisk išvaizdą su CSS užkraunamu kiekviename puslapyje - title: Asmeninis CSS hero: desc_html: Rodomas pagrindiniame puslapyje. Bent 600x100px rekomenduojama. Kai nenustatyta, renkamasi numatytą serverio nuotrauką title: Herojaus nuotrauka diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 7ec91572..9bcd841c 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -394,9 +394,6 @@ nl: contact_information: email: Vul een openbaar gebruikt e-mailadres in username: Vul een gebruikersnaam in - custom_css: - desc_html: Het uiterlijk van deze server met CSS aanpassen - title: Aangepaste CSS hero: desc_html: Wordt op de voorpagina getoond. Tenminste 600x100px aanbevolen. Wanneer dit niet is ingesteld wordt de thumbnail van de Gab Socialserver getoond title: Hero-afbeelding diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 83fc065b..7c72d7e5 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -384,9 +384,6 @@ oc: contact_information: email: Picatz una adreça de corrièl username: Picatz un nom d’utilizaire - custom_css: - desc_html: Modificar l’estil amb una fuèlha CSS cargada sus cada pagina - title: CSS personalizada hero: desc_html: Mostrat en primièra pagina. Almens 600x100px recomandat. S’es pas configurat l’imatge del servidor serà mostrat title: Imatge de l’eròi diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 71542831..1bf0770a 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -400,9 +400,6 @@ pl: contact_information: email: Służbowy adres e-mail username: Nazwa użytkownika do kontaktu - custom_css: - desc_html: Modyfikuj wygląd pliku CSS ładowanego na każdej stronie - title: Niestandardowy CSS hero: desc_html: Wyświetlany na stronie głównej. Zalecany jest rozmiar przynajmniej 600x100 pikseli. Jeżeli nie ustawiony, zostanie użyta miniatura serwera title: Obraz bohatera diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index d7d3fe2e..8015e913 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -394,9 +394,6 @@ pt-BR: contact_information: email: E-mail username: Usuário de contato - custom_css: - desc_html: Modificar o visual com CSS que é carregado em todas as páginas - title: CSS customizado hero: desc_html: Aparece na página inicial. Ao menos 600x100px é recomendado. Se não estiver definido, o thumbnail da instância é usado no lugar title: Imagem de capa diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 0a989898..08f35dea 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -372,9 +372,6 @@ pt: contact_information: email: Inserir um endereço de email para tornar público username: Insira um nome de utilizador - custom_css: - desc_html: Modificar a aparência com CSS carregado em cada página - title: CSS personalizado hero: desc_html: Apresentado na primeira página. Pelo menos 600x100px recomendados. Quando não é definido, é apresentado o thumbnail do servidor title: Imagem Hero diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 3738a7f7..7d18b7ab 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -406,9 +406,6 @@ ru: contact_information: email: Введите публичный e-mail username: Введите имя пользователя - custom_css: - desc_html: Измените внешний вид с CSS, загружаемым на каждой странице - title: Особый CSS hero: desc_html: Отображается на главной странице. Рекомендуется разрешение не менее 600х100px. Если не установлено, используется изображение узла title: Баннер узла diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 9a7b44ec..1a967a6c 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -397,9 +397,6 @@ sk: contact_information: email: Pracovný email username: Kontaktné užívateľské meno - custom_css: - desc_html: Uprav vzhľad pomocou CSS, ktoré je načítané na každej stránke - title: Vlastné CSS hero: desc_html: Zobrazuje sa na hlavnej stránke. Doporučuje sa rozlišenie aspoň 600x100px Pokiaľ nič nieje dodané, bude nastavený základný orázok serveru title: Obrázok hrdinu diff --git a/config/locales/sl.yml b/config/locales/sl.yml index d11033f8..cf430b15 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -383,9 +383,6 @@ sl: contact_information: email: Poslovna e-pošta username: Uporabniško ime stika - custom_css: - desc_html: Spremeni videz z naloženim CSS na vsaki strani - title: CSS po meri statuses: pin_errors: ownership: Trob nekoga drugega ne more biti pripet diff --git a/config/locales/sq.yml b/config/locales/sq.yml index cbfd8970..3ea289f6 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -369,9 +369,6 @@ sq: contact_information: email: Email biznesi username: Emër përdoruesi kontakti - custom_css: - desc_html: Modifikojeni pamjen me CSS të nagrkuar në çdo faqe - title: CSS Vetjake hero: desc_html: E shfaqur në faqen ballore. Këshillohet të paktën 600x100px. Kur nuk caktohet gjë, përdoret miniaturë e shërbyesit title: Figurë heroi diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 343ac5e1..2a060918 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -382,9 +382,6 @@ sr: contact_information: email: Пословна е-пошта username: Контакт корисничко име - custom_css: - desc_html: Промени изглед на свакој страни када се CSS учита - title: Произвољни CSS hero: desc_html: Приказано на почетној страни. Препоручено је бар 600х100рх. Када се не одреди, враћа се на иконицу инстанце title: Лого слика diff --git a/config/locales/th.yml b/config/locales/th.yml index 1bbdd944..abbfce3a 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -282,8 +282,6 @@ th: contact_information: email: อีเมลธุรกิจ username: ชื่อผู้ใช้ในการติดต่อ - custom_css: - title: CSS ที่กำหนดเอง profile_directory: title: เปิดใช้งานไดเรกทอรีโปรไฟล์ registrations: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 6339531f..eb620add 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -324,9 +324,6 @@ zh-CN: contact_information: email: 用于联系的公开电子邮件地址 username: 用于联系的公开用户名 - custom_css: - desc_html: 通过 CSS 代码调整所有页面的显示效果 - title: 自定义 CSS hero: desc_html: 用于在首页展示。推荐分辨率 600×100px 以上。未指定的情况下将默认使用本站缩略图 title: 主题图片 diff --git a/config/routes.rb b/config/routes.rb index 6870425d..f07027da 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -29,7 +29,6 @@ Rails.application.routes.draw do get 'manifest', to: 'manifests#show', defaults: { format: 'json' } get 'intent', to: 'intents#show' - get 'custom.css', to: 'custom_css#show', as: :custom_css devise_scope :user do get '/invite/:invite_code', to: 'auth/registrations#new', as: :public_invite