From 07e6940162e09e891730af7ef8f21fce2ee30a5b Mon Sep 17 00:00:00 2001 From: Rostislav Wolny Date: Mon, 15 Jan 2024 14:08:37 +0100 Subject: [PATCH] Add the basic list of font families Add basic font families. For now, we use know-how from the current editor and we use the same list of fonts as were used in the current editor [MAILPOET-5740] --- mailpoet/lib/EmailEditor/Engine/theme.json | 117 +++++++++++++++++- .../Engine/SettingsControllerTest.php | 24 +++- 2 files changed, 133 insertions(+), 8 deletions(-) diff --git a/mailpoet/lib/EmailEditor/Engine/theme.json b/mailpoet/lib/EmailEditor/Engine/theme.json index 2f0e224e17..ca6dc02cc2 100644 --- a/mailpoet/lib/EmailEditor/Engine/theme.json +++ b/mailpoet/lib/EmailEditor/Engine/theme.json @@ -8,14 +8,119 @@ "typography": { "fontFamilies": [ { - "fontFamily": "-apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, helvetica, Cantarell, Ubuntu, roboto, noto, arial, sans-serif", - "name": "System Sans-serif", - "slug": "system-sans-serif" + "name": "Arial", + "slug": "arial", + "fontFamily": "Arial, 'Helvetica Neue', Helvetica, sans-serif" }, { - "fontFamily": "Iowan Old Style, Apple Garamond, Baskerville, Times New Roman, Droid Serif, Times, Source Serif Pro, serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol", - "name": "System Serif", - "slug": "system-Serif" + "name": "Comic Sans MS", + "slug": "comic-sans-ms", + "fontFamily": "'Comic Sans MS', 'Marker Felt-Thin', Arial, sans-serif" + }, + { + "name": "Courier New", + "slug": "courier-new", + "fontFamily": "'Courier New', Courier, 'Lucida Sans Typewriter', 'Lucida Typewriter', monospace" + }, + { + "name": "Georgia", + "slug": "georgia", + "fontFamily": "Georgia, Times, 'Times New Roman', serif" + }, + { + "name": "Lucida", + "slug": "lucida", + "fontFamily": "'Lucida Sans Unicode', 'Lucida Grande', sans-serif" + }, + { + "name": "Tahoma", + "slug": "tahoma", + "fontFamily": "'Tahoma, Verdana, Segoe, sans-serif'" + }, + { + "name": "Times New Roman", + "slug": "times-new-roman", + "fontFamily": "'Times New Roman', Times, Baskerville, Georgia, serif" + }, + { + "name": "Trebuchet MS", + "slug": "trebuchet-ms", + "fontFamily": "'Trebuchet MS', 'Lucida Grande', 'Lucida Sans Unicode', 'Lucida Sans', Tahoma, sans-serif" + }, + { + "name": "Verdana", + "slug": "verdana", + "fontFamily": "'Verdana, Geneva, sans-serif'" + }, + { + "name": "Arvo", + "slug": "arvo", + "fontFamily": "'arvo, courier, georgia, serif'" + }, + { + "name": "Lato", + "slug": "lato", + "fontFamily": "lato, 'helvetica neue', helvetica, arial, sans-serif" + }, + { + "name": "Lora", + "slug": "lora", + "fontFamily": "lora, georgia, 'times new roman', serif" + }, + { + "name": "Merriweather", + "slug": "merriweather", + "fontFamily": "merriweather, georgia, 'times new roman', serif" + }, + { + "name": "Merriweather Sans", + "slug": "merriweather-sans", + "fontFamily": "'merriweather sans', 'helvetica neue', helvetica, arial, sans-serif" + }, + { + "name": "Noticia Text", + "slug": "noticia-text", + "fontFamily": "'noticia text', georgia, 'times new roman', serif" + }, + { + "name": "Open Sans", + "slug": "open-sans", + "fontFamily": "'open sans', 'helvetica neue', helvetica, arial, sans-serif" + }, + { + "name": "Playfair Display", + "slug": "playfair-display", + "fontFamily": "'playfair display', georgia, 'times new roman', serif" + }, + { + "name": "Roboto", + "slug": "roboto", + "fontFamily": "roboto, 'helvetica neue', helvetica, arial, sans-serif" + }, + { + "name": "Source Sans Pro", + "slug": "source-sans-pro", + "fontFamily": "'source sans pro', 'helvetica neue', helvetica, arial, sans-serif" + }, + { + "name": "Oswald", + "slug": "oswald", + "fontFamily": "Oswald, 'Trebuchet MS', 'Lucida Grande', 'Lucida Sans Unicode', 'Lucida Sans', Tahoma, sans-serif" + }, + { + "name": "Raleway", + "slug": "raleway", + "fontFamily": "Raleway, 'Century Gothic', CenturyGothic, AppleGothic, sans-serif" + }, + { + "name": "Permanent Marker", + "slug": "permanent-marker", + "fontFamily": "'Permanent Marker', Tahoma, Verdana, Segoe, sans-serif" + }, + { + "name": "Pacifico", + "slug": "pacifico", + "fontFamily": "Pacifico, 'Arial Narrow', Arial, sans-serif" } ] }, diff --git a/mailpoet/tests/integration/EmailEditor/Engine/SettingsControllerTest.php b/mailpoet/tests/integration/EmailEditor/Engine/SettingsControllerTest.php index 766da5a255..7de10816b5 100644 --- a/mailpoet/tests/integration/EmailEditor/Engine/SettingsControllerTest.php +++ b/mailpoet/tests/integration/EmailEditor/Engine/SettingsControllerTest.php @@ -13,7 +13,27 @@ class SettingsControllerTest extends \MailPoetTest { public function testItGeneratesCssStylesForThemeWithFontFamilies() { $css = $this->settingsController->getStylesheetForRendering(); - verify($css)->stringContainsString('.has-system-sans-serif-font-family'); - verify($css)->stringContainsString('.has-system-Serif-font-family'); + verify($css)->stringContainsString('.has-arial-font-family'); + verify($css)->stringContainsString('.has-comic-sans-ms-font-family'); + verify($css)->stringContainsString('.has-courier-new-font-family'); + verify($css)->stringContainsString('.has-georgia-font-family'); + verify($css)->stringContainsString('.has-lucida-font-family'); + verify($css)->stringContainsString('.has-tahoma-font-family'); + verify($css)->stringContainsString('.has-times-new-roman-font-family'); + verify($css)->stringContainsString('.has-trebuchet-ms-font-family'); + verify($css)->stringContainsString('.has-verdana-font-family'); + verify($css)->stringContainsString('.has-arvo-font-family'); + verify($css)->stringContainsString('.has-lato-font-family'); + verify($css)->stringContainsString('.has-merriweather-font-family'); + verify($css)->stringContainsString('.has-merriweather-sans-font-family'); + verify($css)->stringContainsString('.has-noticia-text-font-family'); + verify($css)->stringContainsString('.has-open-sans-font-family'); + verify($css)->stringContainsString('.has-playfair-display-font-family'); + verify($css)->stringContainsString('.has-roboto-font-family'); + verify($css)->stringContainsString('.has-source-sans-pro-font-family'); + verify($css)->stringContainsString('.has-oswald-font-family'); + verify($css)->stringContainsString('.has-raleway-font-family'); + verify($css)->stringContainsString('.has-permanent-marker-font-family'); + verify($css)->stringContainsString('.has-pacifico-font-family'); } }