Allow user theme font selection #562

dev/Settings/User/Themes.js

@@ -22,6 +22,25 @@ addObservablesTo(themeBackground, {
 
 export class UserSettingsThemes /*extends AbstractViewSettings*/ {
 	constructor() {
+		this.fontSansSerif = ThemeStore.fontSansSerif;
+		this.fontSerif = ThemeStore.fontSerif;
+		this.fontMono = ThemeStore.fontMono;
+		ThemeStore.fontSansSerif.subscribe(value => {
+			Remote.saveSettings(null, {
+				fontSansSerif: value
+			});
+		});
+		ThemeStore.fontSerif.subscribe(value => {
+			Remote.saveSettings(null, {
+				fontSerif: value
+			});
+		});
+		ThemeStore.fontMono.subscribe(value => {
+			Remote.saveSettings(null, {
+				fontMono: value
+			});
+		});
+
 		this.theme = ThemeStore.theme;
 		this.themes = ThemeStore.themes;
 		this.themesObjects = ko.observableArray();

dev/Stores/Theme.js

@@ -1,5 +1,5 @@
 import ko from 'ko';
-import { doc, $htmlCL, leftPanelDisabled, Settings, SettingsGet } from 'Common/Globals';
+import { doc, $htmlCL, elementById, leftPanelDisabled, Settings, SettingsGet } from 'Common/Globals';
 import { isArray } from 'Common/Utils';
 import { serverRequestRaw } from 'Common/Links';
 
@@ -8,6 +8,9 @@ export const ThemeStore = {
 	themes: ko.observableArray(),
 	userBackgroundName: ko.observable(''),
 	userBackgroundHash: ko.observable(''),
+	fontSansSerif: ko.observable(''),
+	fontSerif: ko.observable(''),
+	fontMono: ko.observable(''),
 	isMobile: ko.observable($htmlCL.contains('rl-mobile')),
 
 	populate: () => {
@@ -19,6 +22,9 @@ export const ThemeStore = {
 			ThemeStore.userBackgroundName(SettingsGet('UserBackgroundName'));
 			ThemeStore.userBackgroundHash(SettingsGet('UserBackgroundHash'));
 		}
+		ThemeStore.fontSansSerif(SettingsGet('fontSansSerif'));
+		ThemeStore.fontSerif(SettingsGet('fontSerif'));
+		ThemeStore.fontMono(SettingsGet('fontMono'));
 
 		leftPanelDisabled(ThemeStore.isMobile());
 	}
@@ -26,6 +32,40 @@ export const ThemeStore = {
 
 ThemeStore.isMobile.subscribe(value => $htmlCL.toggle('rl-mobile', value));
 
+ThemeStore.fontSansSerif.subscribe(value => {
+	if (null != value) {
+		let cl = elementById('rl-app').classList;
+		cl.forEach(name => {
+			if ('font' === name.slice(0,4) && !/font(Serif|Mono)/.test(name)) {
+				cl.remove(name);
+			}
+		});
+		value && cl.add('font'+value);
+	}
+});
+ThemeStore.fontSerif.subscribe(value => {
+	if (null != value) {
+		let cl = elementById('rl-app').classList;
+		cl.forEach(name => {
+			if ('fontSerif' === name.slice(0,9)) {
+				cl.remove(name);
+			}
+		});
+		value && cl.add('fontSerif'+value);
+	}
+});
+ThemeStore.fontMono.subscribe(value => {
+	if (null != value) {
+		let cl = elementById('rl-app').classList;
+		cl.forEach(name => {
+			if ('fontMono' === name.slice(0,9)) {
+				cl.remove(name);
+			}
+		});
+		value && cl.add('fontMono'+value);
+	}
+});
+
 ThemeStore.userBackgroundHash.subscribe(value => {
 	if (value) {
 		$htmlCL.add('UserBackground');

dev/Styles/@Boot.css

@@ -4,6 +4,37 @@
 	--fontMono: "Liberation Mono", Monaco, Menlo, Consolas, "Courier New", FreeMono, Courier, monospace;
 }
 
+#rl-app.fontArial {
+	--fontSans: "Nimbus Sans L", "Liberation sans", "Arial Unicode MS", Arial, Helvetica, Garuda, Utkal, FreeSans, sans-serif;
+}
+#rl-app.fontTahoma {
+	--fontSans: "Luxi Sans", Tahoma, Loma, Geneva, Meera, sans-serif;
+}
+#rl-app.fontTrebuchet {
+	--fontSans: "DejaVu Sans Condensed", Trebuchet, "Trebuchet MS", sans-serif;
+}
+#rl-app.fontLucida {
+	--fontSans: "Lucida Sans Unicode", "Lucida Sans", "DejaVu Sans", "Bitstream Vera Sans", "DejaVu LGC Sans", sans-serif;
+}
+#rl-app.fontVerdana {
+	--fontSans: "DejaVu Sans", Verdana, Geneva, "Bitstream Vera Sans", "DejaVu LGC Sans", sans-serif;
+}
+#rl-app.fontMonoCourier {
+	--fontMono: "Liberation Mono", "Courier New", FreeMono, Courier, monospace;
+}
+#rl-app.fontMonoLucida {
+	--fontMono: "DejaVu Sans Mono", "DejaVu LGC Sans Mono", "Bitstream Vera Sans Mono", "Lucida Console", Monaco, monospace;
+}
+#rl-app.fontSerifTimes {
+	--fontSerif: "Nimbus Roman No9 L", "Times New Roman", Times, FreeSerif, serif;
+}
+#rl-app.fontSerifPalatino {
+	--fontSerif: "Bitstream Charter", "Palatino Linotype", Palatino, Palladio, "URW Palladio L", "Book Antiqua", Times, serif;
+}
+#rl-app.fontSerifGeorgia {
+	--fontSerif: "URW Palladio L", Georgia, Times, serif;
+}
+
 html, body {
 	margin: 0;
 	padding: 0;

snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php

@@ -805,6 +805,10 @@ class Actions
 					$aResult['Resizer5Width'] = (int)$oSettings->GetConf('Resizer5Width', 0);
 					$aResult['Resizer5Height'] = (int)$oSettings->GetConf('Resizer5Height', 0);
 
+					$aResult['fontSansSerif'] = $oSettings->GetConf('fontSansSerif', '');
+					$aResult['fontSerif'] = $oSettings->GetConf('fontSerif', '');
+					$aResult['fontMono'] = $oSettings->GetConf('fontMono', '');
+
 					if (!$this->GetCapa(Enumerations\Capa::AUTOLOGOUT)) {
 						$aResult['AutoLogout'] = 0;
 					}

snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php

@@ -303,7 +303,7 @@ trait User
 		}
 		else
 		{
-			$oSettings->SetConf('Language', $this->ValidateLanguage($oConfig->Get('webmail', 'language', 'en')));
+//			$oSettings->SetConf('Language', $this->ValidateLanguage($oConfig->Get('webmail', 'language', 'en')));
 		}
 
 		if ($this->GetCapa(Capa::THEMES))
@@ -311,10 +311,13 @@ trait User
 			$this->setSettingsFromParams($oSettingsLocal, 'Theme', 'string', function ($sTheme) use ($self) {
 				return $self->ValidateTheme($sTheme);
 			});
+			$this->setSettingsFromParams($oSettings, 'fontSansSerif', 'string');
+			$this->setSettingsFromParams($oSettings, 'fontSerif', 'string');
+			$this->setSettingsFromParams($oSettings, 'fontMono', 'string');
 		}
 		else
 		{
-			$oSettingsLocal->SetConf('Theme', $this->ValidateTheme($oConfig->Get('webmail', 'theme', 'Default')));
+//			$oSettingsLocal->SetConf('Theme', $this->ValidateTheme($oConfig->Get('webmail', 'theme', 'Default')));
 		}
 
 		$this->setSettingsFromParams($oSettings, 'MessagesPerPage', 'int', function ($iValue) {

snappymail/v/0.0.0/app/localization/ar-SA/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "المظاهر العامة",
-		"LEGEND_THEMES_CUSTOM": "تجهيز المظهر المخصص",
-		"LABEL_CUSTOM_TYPE": "النوع",
-		"LABEL_CUSTOM_TYPE_LIGHT": "فاتح",
-		"LABEL_CUSTOM_TYPE_DARK": "غامق",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "الخلفية",
+		"LABEL_BACKGROUND": "الخلفية",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "(JPG, PNG)حمل صورة الخلفية",
 		"ERROR_FILE_IS_TOO_BIG": "حجم الملف كبير جداً",
 		"ERROR_FILE_TYPE_ERROR": "مسموحة فقط(JPG,PNG)نوع الملف خطأ",

snappymail/v/0.0.0/app/localization/bg-BG/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Теми",
-		"LEGEND_THEMES_CUSTOM": "Специфична настройка на темата",
-		"LABEL_CUSTOM_TYPE": "Тип",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Светла",
-		"LABEL_CUSTOM_TYPE_DARK": "Тъмна",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Фон",
+		"LABEL_BACKGROUND": "Фон",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Качи снимка за фон (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Файла е прекалено голям",
 		"ERROR_FILE_TYPE_ERROR": "Невалиден тип (Само JPG или PNG)",

snappymail/v/0.0.0/app/localization/cs-CZ/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Motivy",
-		"LEGEND_THEMES_CUSTOM": "Správa vlastního motivu",
-		"LABEL_CUSTOM_TYPE": "Typ",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Světlý",
-		"LABEL_CUSTOM_TYPE_DARK": "Tmavý",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Pozadí",
+		"LABEL_BACKGROUND": "Pozadí",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Nahrát obrázek pozadí (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Soubor je příliš velký",
 		"ERROR_FILE_TYPE_ERROR": "Nesprávný typ souboru (povolené jsou pouze JPG a PNG)",

snappymail/v/0.0.0/app/localization/da-DK/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Temaer",
-		"LEGEND_THEMES_CUSTOM": "Brugerdefineret temakonfiguration",
-		"LABEL_CUSTOM_TYPE": "Type",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Lys",
-		"LABEL_CUSTOM_TYPE_DARK": "Mørk",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Baggrund",
+		"LABEL_BACKGROUND": "Baggrund",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Upload baggrundsbillede (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Fil for stor",
 		"ERROR_FILE_TYPE_ERROR": "Forkert filtype (kun JPG og PNG )",

snappymail/v/0.0.0/app/localization/de-DE/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Themen",
-		"LEGEND_THEMES_CUSTOM": "Konfiguration der selbsterstellten Themen",
-		"LABEL_CUSTOM_TYPE": "Typ",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Hell",
-		"LABEL_CUSTOM_TYPE_DARK": "Dunkel",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Hintergrund",
+		"LABEL_BACKGROUND": "Hintergrund",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Hintergrundbild hochladen (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Datei ist zu groß",
 		"ERROR_FILE_TYPE_ERROR": "Ungültiger Dateityp (nur JPG und PNG)",

snappymail/v/0.0.0/app/localization/el-GR/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Θέματα",
-		"LEGEND_THEMES_CUSTOM": "Διαμόρφωση προσαρμοσμένου θέματος",
-		"LABEL_CUSTOM_TYPE": "Τύπος",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Ανοικτόχρωμο",
-		"LABEL_CUSTOM_TYPE_DARK": "Σκουρόχρωμο",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Υπόβαθρο",
+		"LABEL_BACKGROUND": "Υπόβαθρο",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Μεταφόρτωση εικόνας υποβάθρου (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Το αρχείο είναι πολύ μεγάλο",
 		"ERROR_FILE_TYPE_ERROR": "Άκυρος τύπος αρχείου (μόνο JPG και PNG)",

snappymail/v/0.0.0/app/localization/en-GB/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Themes",
-		"LEGEND_THEMES_CUSTOM": "Custom Theme Configuration",
-		"LABEL_CUSTOM_TYPE": "Type",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Light",
-		"LABEL_CUSTOM_TYPE_DARK": "Dark",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Background",
+		"LABEL_BACKGROUND": "Background",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Upload background image (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "File is too big",
 		"ERROR_FILE_TYPE_ERROR": "Invalid file type (JPG and PNG only)",

snappymail/v/0.0.0/app/localization/en/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Themes",
-		"LEGEND_THEMES_CUSTOM": "Custom Theme Configuration",
-		"LABEL_CUSTOM_TYPE": "Type",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Light",
-		"LABEL_CUSTOM_TYPE_DARK": "Dark",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Background",
+		"LABEL_BACKGROUND": "Background",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Upload background image (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "File is too big",
 		"ERROR_FILE_TYPE_ERROR": "Invalid file type (JPG and PNG only)",

snappymail/v/0.0.0/app/localization/es-ES/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Temas",
-		"LEGEND_THEMES_CUSTOM": "Configuración de tema personalizado",
-		"LABEL_CUSTOM_TYPE": "Tipo",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Claro",
-		"LABEL_CUSTOM_TYPE_DARK": "Oscuro",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Fondo",
+		"LABEL_BACKGROUND": "Fondo",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Suba una imagen de fondo (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "La imagen es muy grande",
 		"ERROR_FILE_TYPE_ERROR": "Tipo de archivo inválido (Solo permitido: JPG y PNG)",

snappymail/v/0.0.0/app/localization/et-EE/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Teemad",
-		"LEGEND_THEMES_CUSTOM": "Teema kohandamine",
-		"LABEL_CUSTOM_TYPE": "Tüüp",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Hele",
-		"LABEL_CUSTOM_TYPE_DARK": "Tume",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Taust",
+		"LABEL_BACKGROUND": "Taust",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Laadi üles taustapilt (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Fail on liiga suur",
 		"ERROR_FILE_TYPE_ERROR": "Faili tüüp ei sobi (lubatud on ainult JPG ja PNG)",

snappymail/v/0.0.0/app/localization/fa-IR/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "پوسته‌ها",
-		"LEGEND_THEMES_CUSTOM": "پیکربندی سفارشی پوسته",
-		"LABEL_CUSTOM_TYPE": "نوع",
-		"LABEL_CUSTOM_TYPE_LIGHT": "روشن",
-		"LABEL_CUSTOM_TYPE_DARK": "تیره",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "پشت زمینه",
+		"LABEL_BACKGROUND": "پشت زمینه",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "بارگذاری تصاویر پشت زمینه (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "اندازه فایل بیش از حد بزرگ است",
 		"ERROR_FILE_TYPE_ERROR": "نوع فایل نامعتبر (فقط PNG و JPG)",

snappymail/v/0.0.0/app/localization/fi-FI/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Teemat",
-		"LEGEND_THEMES_CUSTOM": "Muokatun teeman asetukset",
-		"LABEL_CUSTOM_TYPE": "Tyyppi",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Vaalea",
-		"LABEL_CUSTOM_TYPE_DARK": "Tumma",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Tausta",
+		"LABEL_BACKGROUND": "Tausta",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Lataa taustakuva (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Tiedosto on liian iso",
 		"ERROR_FILE_TYPE_ERROR": "Väärä tiedostotyyppi (ainoastaan JPG ja PNG)",

snappymail/v/0.0.0/app/localization/fr-FR/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Thèmes",
-		"LEGEND_THEMES_CUSTOM": "Configuration du thème personnel",
-		"LABEL_CUSTOM_TYPE": "Type",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Lumineux",
-		"LABEL_CUSTOM_TYPE_DARK": "Sombre",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Image de fond",
+		"LABEL_BACKGROUND": "Image de fond",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Envoyer une image de fond (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Fichier trop volumineux",
 		"ERROR_FILE_TYPE_ERROR": "Type de fichier invalide (JPG et PNG seulement)",

snappymail/v/0.0.0/app/localization/hu-HU/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Témák",
-		"LEGEND_THEMES_CUSTOM": "Saját téma beállítások",
-		"LABEL_CUSTOM_TYPE": "Típus",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Világos",
-		"LABEL_CUSTOM_TYPE_DARK": "Sötét",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Háttér",
+		"LABEL_BACKGROUND": "Háttér",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Háttérkép feltöltés (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "A fájl túl nagy",
 		"ERROR_FILE_TYPE_ERROR": "Érvénytelen fájl típus (csak JPG és PNG lehet)",

snappymail/v/0.0.0/app/localization/id-ID/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Tema",
-		"LEGEND_THEMES_CUSTOM": "Konfigurasi tema khusus",
-		"LABEL_CUSTOM_TYPE": "Tipe",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Terang",
-		"LABEL_CUSTOM_TYPE_DARK": "Gelap",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Latar",
+		"LABEL_BACKGROUND": "Latar",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Unggah gambar latar (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "File terlalu besar",
 		"ERROR_FILE_TYPE_ERROR": "Tipe file tidak sah (JPG dan PNG saja)",

snappymail/v/0.0.0/app/localization/is-IS/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Þemu",
-		"LEGEND_THEMES_CUSTOM": "Sérsniðin þemastilling",
-		"LABEL_CUSTOM_TYPE": "Tegund",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Ljóst",
-		"LABEL_CUSTOM_TYPE_DARK": "Dökkt",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Bakgrunnur",
+		"LABEL_BACKGROUND": "Bakgrunnur",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Senda inn bakgrunnsmynd (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Skrá er of stór",
 		"ERROR_FILE_TYPE_ERROR": "Röng skráartegund (aðeins JPG and PNG)",

snappymail/v/0.0.0/app/localization/it-IT/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Temi",
-		"LEGEND_THEMES_CUSTOM": "Configurazione del tema personalizzato",
-		"LABEL_CUSTOM_TYPE": "Tipo",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Chiaro",
-		"LABEL_CUSTOM_TYPE_DARK": "Scuro",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Sfondo",
+		"LABEL_BACKGROUND": "Sfondo",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Carica immagine di sfondo (.jpg o .png)",
 		"ERROR_FILE_IS_TOO_BIG": "Il file è più grande di 1MB",
 		"ERROR_FILE_TYPE_ERROR": "Tipo di file invalido (solo .jpg o .png)",

snappymail/v/0.0.0/app/localization/ja-JP/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "テーマ",
-		"LEGEND_THEMES_CUSTOM": "カスタムテーマ設定",
-		"LABEL_CUSTOM_TYPE": "種類",
-		"LABEL_CUSTOM_TYPE_LIGHT": "ライト",
-		"LABEL_CUSTOM_TYPE_DARK": "ダーク",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "背景",
+		"LABEL_BACKGROUND": "背景",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "背景画像をアップロード(JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "ファイルが大きすぎます",
 		"ERROR_FILE_TYPE_ERROR": "無効なファイル種類(JPG\/PNG のみ)",

snappymail/v/0.0.0/app/localization/ko-KR/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "테마",
-		"LEGEND_THEMES_CUSTOM": "사용자 지정 테마 설정",
-		"LABEL_CUSTOM_TYPE": "유형",
-		"LABEL_CUSTOM_TYPE_LIGHT": "밝음",
-		"LABEL_CUSTOM_TYPE_DARK": "어두움",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "배경",
+		"LABEL_BACKGROUND": "배경",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "배경 이미지 업로드 (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "파일이 너무 큽니다",
 		"ERROR_FILE_TYPE_ERROR": "유효하지 않은 파일 형식 (JPG 또는 PNG만 가능)",

snappymail/v/0.0.0/app/localization/lt-LT/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Temos",
-		"LEGEND_THEMES_CUSTOM": "Individualizuotos temos konfigūravimas",
-		"LABEL_CUSTOM_TYPE": "Tipas",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Šviesi",
-		"LABEL_CUSTOM_TYPE_DARK": "Tamsi",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Fonas",
+		"LABEL_BACKGROUND": "Fonas",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Įkelti fono paveiksliuką (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Per didelis failas",
 		"ERROR_FILE_TYPE_ERROR": "Netinkamas failo tipas (tik JPG ir PNG)",

snappymail/v/0.0.0/app/localization/lv-LV/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Tēmas",
-		"LEGEND_THEMES_CUSTOM": "Tēmas konfigurācija",
-		"LABEL_CUSTOM_TYPE": "Tips",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Gaišs",
-		"LABEL_CUSTOM_TYPE_DARK": "Tumšs",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Fons",
+		"LABEL_BACKGROUND": "Fons",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Ielādēt fona attēlu (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Fails ir par lielu",
 		"ERROR_FILE_TYPE_ERROR": "Nepareizs faila tips (Tikai JPG un PNG)",

snappymail/v/0.0.0/app/localization/nb-NO/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Tema",
-		"LEGEND_THEMES_CUSTOM": "Selvvalgt tema",
-		"LABEL_CUSTOM_TYPE": "Type",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Lys",
-		"LABEL_CUSTOM_TYPE_DARK": "Mørk",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Bakgrunn",
+		"LABEL_BACKGROUND": "Bakgrunn",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Last opp bakgrunnsbilde (.jpg eller .png)",
 		"ERROR_FILE_IS_TOO_BIG": "Fila er for stor (1mb +)",
 		"ERROR_FILE_TYPE_ERROR": "Ugyldig filtype (bruk .jpg eller .png)",

snappymail/v/0.0.0/app/localization/nl-NL/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Thema's",
-		"LEGEND_THEMES_CUSTOM": "Aangepaste thema configuratie",
-		"LABEL_CUSTOM_TYPE": "Soort",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Licht",
-		"LABEL_CUSTOM_TYPE_DARK": "Donker",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Achtergrond",
+		"LABEL_BACKGROUND": "Achtergrond",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Upload achtergrond afbeelding (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Bestand is te groot",
 		"ERROR_FILE_TYPE_ERROR": "Onjuist bestandstype (alleen JPG and PNG)",

snappymail/v/0.0.0/app/localization/pl-PL/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Motywy",
-		"LEGEND_THEMES_CUSTOM": "Konfiguracja własnego motywu",
-		"LABEL_CUSTOM_TYPE": "Typ",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Jasny",
-		"LABEL_CUSTOM_TYPE_DARK": "Ciemny",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Tło",
+		"LABEL_BACKGROUND": "Tło",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Prześlij własne tło (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Plik jest za duży",
 		"ERROR_FILE_TYPE_ERROR": "Nieprawidłowy format pliku (obsługiwane są wyłącznie pliki JPG i PNG)",

snappymail/v/0.0.0/app/localization/pt-BR/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Temas",
-		"LEGEND_THEMES_CUSTOM": "Configurar tema personalizado",
-		"LABEL_CUSTOM_TYPE": "Tipo",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Claro",
-		"LABEL_CUSTOM_TYPE_DARK": "Escuro",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Plano de fundo",
+		"LABEL_BACKGROUND": "Plano de fundo",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Enviar imagem de plano de fundo(JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Arquivo muito grande",
 		"ERROR_FILE_TYPE_ERROR": "Tipo de arquivo inválido (somente JPG e PNG)",

snappymail/v/0.0.0/app/localization/pt-PT/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Temas",
-		"LEGEND_THEMES_CUSTOM": "Configuração de tema personalizado",
-		"LABEL_CUSTOM_TYPE": "Tipo",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Claro",
-		"LABEL_CUSTOM_TYPE_DARK": "Escuro",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Imagem de fundo",
+		"LABEL_BACKGROUND": "Imagem de fundo",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Carregar imagem de fundo (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Ficheiro muito grande",
 		"ERROR_FILE_TYPE_ERROR": "Tipo de ficheiro inválido (apenas JPG e PNG)",

snappymail/v/0.0.0/app/localization/pt/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Temas",
-		"LEGEND_THEMES_CUSTOM": "Configuração de tema personalizado",
-		"LABEL_CUSTOM_TYPE": "Tipo",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Claro",
-		"LABEL_CUSTOM_TYPE_DARK": "Escuro",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Imagem de fundo",
+		"LABEL_BACKGROUND": "Imagem de fundo",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Carregar imagem de fundo (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Ficheiro muito grande",
 		"ERROR_FILE_TYPE_ERROR": "Tipo de ficheiro inválido (apenas JPG e PNG)",

snappymail/v/0.0.0/app/localization/ro-RO/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Tematică",
-		"LEGEND_THEMES_CUSTOM": "Setați o temă particularizată",
-		"LABEL_CUSTOM_TYPE": "Tip Teme",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Lumina",
-		"LABEL_CUSTOM_TYPE_DARK": "Umbră",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Imaginea de pe fundal",
+		"LABEL_BACKGROUND": "Imaginea de pe fundal",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Încărcați o imagine de fundal (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Fișier prea mare",
 		"ERROR_FILE_TYPE_ERROR": "Tip de fișier invalid (numai JPG sau PNG)",

snappymail/v/0.0.0/app/localization/ru-RU/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Темы Оформления",
-		"LEGEND_THEMES_CUSTOM": "Настройка Пользовательской Темы",
-		"LABEL_CUSTOM_TYPE": "Тип Темы",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Светлая",
-		"LABEL_CUSTOM_TYPE_DARK": "Темная",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Картинка на фоне",
+		"LABEL_BACKGROUND": "Картинка на фоне",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Загрузить фоновую картинку (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Файл слишком большой",
 		"ERROR_FILE_TYPE_ERROR": "Неверный тип файла (только JPG и PNG)",

snappymail/v/0.0.0/app/localization/sk-SK/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Motívy",
-		"LEGEND_THEMES_CUSTOM": "Správa vlastného motívu",
-		"LABEL_CUSTOM_TYPE": "Typ",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Svetlý",
-		"LABEL_CUSTOM_TYPE_DARK": "Tmavý",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Pozadie",
+		"LABEL_BACKGROUND": "Pozadie",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Nahrať obrázok pozadia (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Súbor je príliš veľký",
 		"ERROR_FILE_TYPE_ERROR": "Nesprávny typ súboru (JPG and PNG only)",

snappymail/v/0.0.0/app/localization/sl-SI/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Teme",
-		"LEGEND_THEMES_CUSTOM": "Prilagojena konfiguracija teme",
-		"LABEL_CUSTOM_TYPE": "Tip",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Svetla",
-		"LABEL_CUSTOM_TYPE_DARK": "Temna",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Ozadje",
+		"LABEL_BACKGROUND": "Ozadje",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Naloži sliko ozadja (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Prevelika datoteka",
 		"ERROR_FILE_TYPE_ERROR": "Neveljaven tip datoteke (samo JPG in PNG)",

snappymail/v/0.0.0/app/localization/sv-SE/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Teman",
-		"LEGEND_THEMES_CUSTOM": "Anpassad temakonfiguration",
-		"LABEL_CUSTOM_TYPE": "Typ",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Ljus",
-		"LABEL_CUSTOM_TYPE_DARK": "Mörk",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Bakgrund",
+		"LABEL_BACKGROUND": "Bakgrund",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Ladda upp bakgrundsbild (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Filen är för stor",
 		"ERROR_FILE_TYPE_ERROR": "Ogiltig fil typ (endast JPG och PNG)",

snappymail/v/0.0.0/app/localization/tr-TR/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Temalar",
-		"LEGEND_THEMES_CUSTOM": "Özel Tema Yapılandırması",
-		"LABEL_CUSTOM_TYPE": "Tip",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Aydınlık",
-		"LABEL_CUSTOM_TYPE_DARK": "Koyu",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Arka Plan",
+		"LABEL_BACKGROUND": "Arka Plan",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Arka Plan Resmi Yükleyin(JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Dosya çok büyük (1MB+)",
 		"ERROR_FILE_TYPE_ERROR": "Geçersiz dosya tipi (sadece JPG ve PNG kabul edilir)",

snappymail/v/0.0.0/app/localization/uk-UA/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Теми Оформлення",
-		"LEGEND_THEMES_CUSTOM": "Налаштування Користувацької Теми",
-		"LABEL_CUSTOM_TYPE": "Тип Теми",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Світла",
-		"LABEL_CUSTOM_TYPE_DARK": "Темна",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Картинка на фоні",
+		"LABEL_BACKGROUND": "Картинка на фоні",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Завантажити фонову картинку (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Файл надто великий",
 		"ERROR_FILE_TYPE_ERROR": "Невірний тип файлу (тільки JPG и PNG)",

snappymail/v/0.0.0/app/localization/vi-VN/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Phông nền",
-		"LEGEND_THEMES_CUSTOM": "Tùy chỉnh phông nền",
-		"LABEL_CUSTOM_TYPE": "Kiểu",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Nền sáng",
-		"LABEL_CUSTOM_TYPE_DARK": "Nền tối",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Hình nền",
+		"LABEL_BACKGROUND": "Hình nền",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Tải hình nền lên (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Tập tin hình ảnh quá lớn",
 		"ERROR_FILE_TYPE_ERROR": "Định dạng tập tin hình ảnh không hợp lệ (chỉ tải lên được JPG và PNG)",

snappymail/v/0.0.0/app/localization/zh-CN/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "主题",
-		"LEGEND_THEMES_CUSTOM": "自定义主题设置",
-		"LABEL_CUSTOM_TYPE": "类型",
-		"LABEL_CUSTOM_TYPE_LIGHT": "明亮",
-		"LABEL_CUSTOM_TYPE_DARK": "暗沉",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "背景",
+		"LABEL_BACKGROUND": "背景",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "上传背景 (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "文件过大",
 		"ERROR_FILE_TYPE_ERROR": "无效类型 (仅支持JPG和PNG)",

snappymail/v/0.0.0/app/localization/zh-TW/user.json

@@ -423,11 +423,8 @@
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "主題",
-		"LEGEND_THEMES_CUSTOM": "自訂主題設置",
-		"LABEL_CUSTOM_TYPE": "類型",
-		"LABEL_CUSTOM_TYPE_LIGHT": "明亮",
-		"LABEL_CUSTOM_TYPE_DARK": "暗沉",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "背景",
+		"LABEL_BACKGROUND": "背景",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "上傳背景 (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "文件太大",
 		"ERROR_FILE_TYPE_ERROR": "無效類型 (只支援JPG和PNG)",

snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html

@@ -10,8 +10,41 @@
 </div>
 <br>
 <br>
+<div class="form-horizontal">
+	<div class="legend" data-i18n="SETTINGS_THEMES/LABEL_FONTS"></div>
+	<div class="control-group">
+		<label>Sans-serif</label>
+		<select data-bind="value: fontSansSerif">
+			<option value=""></option>
+			<option value="Arial">Arial</option>
+			<option value="Lucida">Lucida</option>
+			<option value="Tahoma">Tahoma</option>
+			<option value="Trebuchet">Trebuchet</option>
+			<option value="Verdana">Verdana</option>
+		</select>
+	</div>
+	<div class="control-group">
+		<label>Serif</label>
+		<select data-bind="value: fontSerif">
+			<option value=""></option>
+			<option value="Times">Times</option>
+			<option value="Palatino">Palatino</option>
+			<option value="Georgia">Georgia</option>
+		</select>
+	</div>
+	<div class="control-group">
+		<label>Mono</label>
+		<select data-bind="value: fontMono">
+			<option value=""></option>
+			<option value="Courier">Courier</option>
+			<option value="Lucida">Lucida</option>
+		</select>
+	</div>
+</div>
+<br>
+<br>
 <div class="form-horizontal" data-bind="visible: background.enabled">
-	<div class="legend" data-i18n="SETTINGS_THEMES/LEGEND_THEMES_CUSTOM"></div>
+	<div class="legend" data-i18n="SETTINGS_THEMES/LABEL_BACKGROUND"></div>
 	<div class="control-group g-ui-user-select-none">
 		<div class="row" data-bind="visible: '' !== background.error()" style="margin-left: 0; margin-bottom: 10px;">
 			<div class="alert alert-error span6" data-bind="text: background.error" style="margin-left: 0"></div>