Commit 0f90d2e8 authored by Originate's avatar Originate
Browse files

Update settings page with new styling, formatting

parent d5d621f7
......@@ -187,27 +187,6 @@ class Settings extends React.Component {
return (
<div className="Settings">
<div className="row">
<div className="small-12 medium-6 large-4 columns">
<label>
{tt('g.choose_language')}
<select
defaultValue={user_preferences.locale}
onChange={this.handleLanguageChange}
>
<option value="en">English</option>
<option value="es">Spanish Español</option>
<option value="ru">Russian русский</option>
<option value="fr">French français</option>
<option value="it">Italian italiano</option>
<option value="ko">Korean 한국어</option>
<option value="pl">Polish</option>
<option value="zh">Chinese 简体中文</option>
</select>
</label>
</div>
</div>
<br />
<div className="row">
<form
onSubmit={this.handleSubmitForm}
......@@ -320,15 +299,48 @@ class Settings extends React.Component {
<div className="small-12 medium-6 large-4 columns">
<br />
<br />
<h4>
{tt(
'settings_jsx.private_post_display_settings'
)}
</h4>
<h4>{tt('settings_jsx.preferences')}</h4>
<div className="row">
<div className="small-12 medium-6 large-12 columns">
<label>
{tt('g.choose_language')}
<select
defaultValue={
user_preferences.locale
}
onChange={this.handleLanguageChange}
>
<option value="en">English</option>
<option value="es">
Spanish Español
</option>
<option value="ru">
Russian русский
</option>
<option value="fr">
French français
</option>
<option value="it">
Italian italiano
</option>
<option value="ko">
Korean 한국어
</option>
<option value="pl">Polish</option>
<option value="zh">
Chinese 简体中文
</option>
</select>
</label>
</div>
</div>
<br />
<div>
{tt(
'settings_jsx.not_safe_for_work_nsfw_content'
)}
<label>
{tt(
'settings_jsx.not_safe_for_work_nsfw_content'
)}
</label>
</div>
<select
value={user_preferences.nsfwPref}
......
......@@ -6,24 +6,24 @@
transition: 0.2s all ease-in-out;
text-transform: capitalize;
border-radius: 0;
@include font-size(18px);
@include font-size(18px);
@include themify($themes) {
background-color: themed('buttonBackground');
box-shadow: 0px 0px 0px 0 rgba(0,0,0,0), 5px 5px 0 0 themed('buttonBoxShadow');
background-color: themed('buttonBackground');
box-shadow: 0px 0px 0px 0 rgba(0,0,0,0), 5px 5px 0 0 themed('buttonBoxShadow');
color: themed('buttonText');
}
&:hover, &:focus {
@include themify($themes) {
background-color: themed('buttonBackgroundHover');
box-shadow: 2px 2px 2px 0 rgba(0,0,0,0.1), 7px 7px 0 0 themed('buttonBoxShadowHover');
background-color: themed('buttonBackgroundHover');
box-shadow: 2px 2px 2px 0 rgba(0,0,0,0.1), 7px 7px 0 0 themed('buttonBoxShadowHover');
color: themed('buttonTextHover');
}
}
&:visited, &:active {
@include themify($themes) {
color: themed('ButtonText');
}
}
color: themed('ButtonText');
}
}
}
.button.disabled, .button[disabled] {
opacity: 0.25;
......@@ -31,21 +31,21 @@
box-shadow: 0px 0px 0px 0 rgba(0,0,0,0);
&:hover {
@include themify($themes) {
background-color: themed('buttonBackground');
background-color: themed('buttonBackground');
box-shadow: 0px 0px 0px 0 rgba(0,0,0,0);
color: themed('buttonText');
}
}
}
}
.success, .error {
text-transform: capitalize;
padding-left: 8px;
padding-left: 8px;
}
.success {
@include themify($themes) {
color: themed('textColorAccent');
}
}
}
}
p.error {
position: relative;
top: 4px;
......@@ -54,4 +54,12 @@
div.error {
padding-left: 0;
}
}
\ No newline at end of file
label {
text-transform: none!important;
}
h4 {
font-weight: bold;
font-family: $font-primary;
font-size: 1.125rem!important;
}
}
......@@ -697,7 +697,7 @@
"location_is_too_long": "Location is too long",
"website_url_is_too_long": "Website URL is too long",
"public_profile_settings": "Public Profile Settings",
"private_post_display_settings": "Private Post Display Settings",
"preferences": "Preferences",
"not_safe_for_work_nsfw_content": "Not safe for work (NSFW) content",
"always_hide": "Always hide",
"always_warn": "Always warn",
......
......@@ -695,8 +695,7 @@
"location_is_too_long": "Localización es demasiado largo",
"website_url_is_too_long": "La URL de la página web es muy larga",
"public_profile_settings": "Herramientas para el perfil público",
"private_post_display_settings":
"Herramientas privadas para la visualización del post",
"preferences": "Herramientas privadas para la visualización del post",
"not_safe_for_work_nsfw_content": "(NSFW) contenido para adultos",
"always_hide": "Ocultar siempre",
"always_warn": "Advertir siempre",
......
......@@ -705,8 +705,7 @@
"location_is_too_long": "Le lieu est trop long",
"website_url_is_too_long": "L'URL du site web est trop longue",
"public_profile_settings": "Paramètres du profil public",
"private_post_display_settings":
"Paramètres de l'affichage des messages privés",
"preferences": "Paramètres de l'affichage des messages privés",
"not_safe_for_work_nsfw_content":
"Peu approprié pour le travail (NSFW)",
"always_hide": "Toujours masquer",
......
......@@ -697,8 +697,7 @@
"location_is_too_long": "Luogo è troppo lungo",
"website_url_is_too_long": "L'url del sito è troppo lunga ",
"public_profile_settings": "Impostazioni profilo pubblico",
"private_post_display_settings":
"Impostazioni di Visualizzazione del Post Privato",
"preferences": "Impostazioni di Visualizzazione del Post Privato",
"not_safe_for_work_nsfw_content":
"Contenuto inappropriato da visualizzare da un luogo di lavoro (NSFW)",
"always_hide": "Nascondi sempre",
......
......@@ -689,7 +689,7 @@
"location_is_too_long": "너무 긴 지역명입니다",
"website_url_is_too_long": "너무 긴 웹사이트 URL입니다",
"public_profile_settings": "공개 프로파일 설정",
"private_post_display_settings": "컨텐츠 표시 설정",
"preferences": "컨텐츠 표시 설정",
"not_safe_for_work_nsfw_content": "선정적이거나 폭력적인 컨텐츠",
"always_hide": "항상 숨기기",
"always_warn": "항상 경고하기",
......
......@@ -676,8 +676,7 @@
"location_is_too_long": "Lokalizacja jest za długa",
"website_url_is_too_long": "Strona www jest za długa",
"public_profile_settings": "Ustawienia profilu publicznego",
"private_post_display_settings":
"Prywatne ustawienia wyświetlania postów",
"preferences": "Prywatne ustawienia wyświetlania postów",
"not_safe_for_work_nsfw_content": "Treści niestosowne w pracy (NSFW)",
"always_hide": "Zawsze ukrywaj",
"always_warn": "Zawsze ostrzegaj",
......
......@@ -714,8 +714,7 @@
"location_is_too_long": "Местоположение слишком длинное",
"website_url_is_too_long": "URL-адрес веб-сайта слишком длинный",
"public_profile_settings": "Настройки Публичного Профиля",
"private_post_display_settings":
"Настройки отображения приватных постов",
"preferences": "Настройки отображения приватных постов",
"not_safe_for_work_nsfw_content":
"Небезопасный для работы (NSFW) контент",
"always_hide": "Всегда скрывать",
......
......@@ -635,7 +635,7 @@
"location_is_too_long": "位置字段的字符过多",
"website_url_is_too_long": "网站URL太长",
"public_profile_settings": "公开主页设置",
"private_post_display_settings": "显示私人文章设置",
"preferences": "显示私人文章设置",
"not_safe_for_work_nsfw_content": "不适合在工作时显示的(NSFW)内容",
"always_hide": "总是隐藏",
"always_warn": "总是警告",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment