Correct a 6-in-the-morning breaking typos.
parent
47a251048c
commit
24a59d8f58
|
@ -40,7 +40,7 @@ module StreamEntriesHelper
|
||||||
roles << content_tag(:div, t('accounts.roles.bot'), class: 'account-role bot') if account.bot?
|
roles << content_tag(:div, t('accounts.roles.bot'), class: 'account-role bot') if account.bot?
|
||||||
roles << content_tag(:div, t('accounts.roles.adults_only'), class: 'account-role adults-only') if account.adults_only?
|
roles << content_tag(:div, t('accounts.roles.adults_only'), class: 'account-role adults-only') if account.adults_only?
|
||||||
roles << content_tag(:div, t('accounts.roles.gentlies_kobolds'), class: 'account-role gentlies') if account.user_gentlies_kobolds?
|
roles << content_tag(:div, t('accounts.roles.gentlies_kobolds'), class: 'account-role gentlies') if account.user_gentlies_kobolds?
|
||||||
roles << content_tag(:div, t('accounts.roles.kobold'), class: 'account-role kobold') if account.user_is_kobold?
|
roles << content_tag(:div, t('accounts.roles.kobold'), class: 'account-role kobold') if account.user_is_a_kobold?
|
||||||
|
|
||||||
if (Setting.show_staff_badge && account.user_staff?) || all
|
if (Setting.show_staff_badge && account.user_staff?) || all
|
||||||
if all && !account.user_staff?
|
if all && !account.user_staff?
|
||||||
|
|
|
@ -153,7 +153,7 @@ class Account < ApplicationRecord
|
||||||
:hides_filtered_gap?,
|
:hides_filtered_gap?,
|
||||||
:hides_mascot?,
|
:hides_mascot?,
|
||||||
:hides_color_formatting?,
|
:hides_color_formatting?,
|
||||||
:hides_captions,
|
:hides_captions?,
|
||||||
|
|
||||||
to: :user,
|
to: :user,
|
||||||
prefix: true,
|
prefix: true,
|
||||||
|
|
|
@ -318,7 +318,7 @@ class User < ApplicationRecord
|
||||||
end
|
end
|
||||||
|
|
||||||
def default_language
|
def default_language
|
||||||
@_default_language ||= (setting.default_language || 'en')
|
@_default_language ||= (settings.default_language || 'en')
|
||||||
end
|
end
|
||||||
|
|
||||||
def setting_default_privacy
|
def setting_default_privacy
|
||||||
|
|
|
@ -184,7 +184,7 @@ class PostStatusService < BaseService
|
||||||
visibility: @visibility,
|
visibility: @visibility,
|
||||||
local_only: @local_only,
|
local_only: @local_only,
|
||||||
sharekey: @sharekey,
|
sharekey: @sharekey,
|
||||||
language: language_from_option(@options[:language]) || @account.default_language&.presence || 'en',
|
language: language_from_option(@options[:language]) || @account.user_default_language&.presence || 'en',
|
||||||
application: @options[:application],
|
application: @options[:application],
|
||||||
content_type: @options[:content_type] || @account.user&.setting_default_content_type,
|
content_type: @options[:content_type] || @account.user&.setting_default_content_type,
|
||||||
}.compact
|
}.compact
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
- if Setting.custom_css.present?
|
- if Setting.custom_css.present?
|
||||||
= stylesheet_link_tag custom_css_path, media: 'all'
|
= stylesheet_link_tag custom_css_path, media: 'all'
|
||||||
|
|
||||||
- if current_account.user_hides_color_formatting?
|
- if current_account&.user_hides_color_formatting?
|
||||||
:css
|
:css
|
||||||
.status__content p > span,
|
.status__content p > span,
|
||||||
.reply-indicator__content p > span,
|
.reply-indicator__content p > span,
|
||||||
|
@ -46,20 +46,20 @@
|
||||||
.account__header__fields p > span
|
.account__header__fields p > span
|
||||||
{ color: inherit !important }
|
{ color: inherit !important }
|
||||||
|
|
||||||
- if current_account.user_hides_captions?
|
- if current_account&.user_hides_captions?
|
||||||
:css
|
:css
|
||||||
div .media-caption,
|
div .media-caption,
|
||||||
span .caption
|
span .caption
|
||||||
{ display: none }
|
{ display: none }
|
||||||
|
|
||||||
- if current_account.user_wants_larger_menus?
|
- if current_account&.user_wants_larger_menus?
|
||||||
:css
|
:css
|
||||||
.dropdown-menu__item a
|
.dropdown-menu__item a
|
||||||
{ padding: 14px 14px !important; font-size: 14px !important }
|
{ padding: 14px 14px !important; font-size: 14px !important }
|
||||||
.dropdown--active .dropdown__content > ul > li > a
|
.dropdown--active .dropdown__content > ul > li > a
|
||||||
{ padding: 14px 0 !important; font-size: 14px !important }
|
{ padding: 14px 0 !important; font-size: 14px !important }
|
||||||
|
|
||||||
- if current_account.user_wants_larger_buttons?
|
- if current_account&.user_wants_larger_buttons?
|
||||||
:css
|
:css
|
||||||
.drawer { min-width: 350px !important }
|
.drawer { min-width: 350px !important }
|
||||||
.status__action-bar .icon-button,
|
.status__action-bar .icon-button,
|
||||||
|
@ -73,15 +73,15 @@
|
||||||
margin-right: 24px;
|
margin-right: 24px;
|
||||||
}
|
}
|
||||||
|
|
||||||
- if current_account.user_wants_larger_drawer?
|
- if current_account&.user_wants_larger_drawer?
|
||||||
:css
|
:css
|
||||||
.drawer { min-width: 400px !important }
|
.drawer { min-width: 400px !important }
|
||||||
|
|
||||||
- if current_account.user_hides_filtered_gap?
|
- if current_account&.user_hides_filtered_gap?
|
||||||
:css
|
:css
|
||||||
.status__wrapper--filtered { display: none !important; }
|
.status__wrapper--filtered { display: none !important; }
|
||||||
|
|
||||||
- if current_account.user_hides_mascot?
|
- if current_account&.user_hides_mascot?
|
||||||
:css
|
:css
|
||||||
.drawer__inner__mastodon>img { display: none !important }
|
.drawer__inner__mastodon>img { display: none !important }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue