From 249827a6dedb3b87e3ddc55a1b8a8f82f1139e7a Mon Sep 17 00:00:00 2001
From: Konstantin Nikiforov <konstantin.nikiforov@cbca.ru>
Date: Wed, 6 Sep 2017 13:33:24 +0300
Subject: [PATCH] fontFamily(): allow string value for font-family attribute

---
 .../main/scala/scalacss/internal/Attrs.scala  |  3 +-
 .../test/scala/scalacss/full/InlineTest.scala | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/core/shared/src/main/scala/scalacss/internal/Attrs.scala b/core/shared/src/main/scala/scalacss/internal/Attrs.scala
index 0ccda48b..85b33374 100644
--- a/core/shared/src/main/scala/scalacss/internal/Attrs.scala
+++ b/core/shared/src/main/scala/scalacss/internal/Attrs.scala
@@ -1011,7 +1011,8 @@ object Attrs {
    */
   object fontFamily extends TypedAttrBase {
     override val attr = Attr.real("font-family")
-    def apply(a: FontFace[String]): AV = av(a.fontFamily)
+    def apply(a: FontFace[String]): AV = apply(a.fontFamily)
+    def apply(familyName: String): AV = av(familyName)
   }
 
   /**
diff --git a/core/shared/src/test/scala/scalacss/full/InlineTest.scala b/core/shared/src/test/scala/scalacss/full/InlineTest.scala
index d7bfb517..222aa339 100644
--- a/core/shared/src/test/scala/scalacss/full/InlineTest.scala
+++ b/core/shared/src/test/scala/scalacss/full/InlineTest.scala
@@ -267,6 +267,18 @@ object MyInlineWithFontFace extends StyleSheet.Inline {
   val myFontText3 = style(fontFamily(ff6))
 }
 
+object MyInlineWithRawFontFamily extends StyleSheet.Inline {
+  import dsl._
+
+  val myFont1 = style( fontFamily("verdana") )
+  val myFont2 = style( fontFamily("comic-sans") )
+  val myFont3 = style(
+    fontFamily("times-new-roman"),
+    backgroundColor( Color("#ffff00") )
+  )
+}
+
+
 object InlineTest extends utest.TestSuite {
   import utest._
   import scalacss.test.TestUtil._
@@ -678,5 +690,22 @@ object InlineTest extends utest.TestSuite {
          |  font-family: MyInlineWithFontFace-0002;
          |}
        """.stripMargin))
+
+    'fontFamilies - assertMultiline( norm(MyInlineWithRawFontFamily.render), norm(
+      """
+        |.MyInlineWithRawFontFamily-myFont1 {
+        |  font-family: verdana;
+        |}
+        |
+        |.MyInlineWithRawFontFamily-myFont2 {
+        |  font-family: comic-sans;
+        |}
+        |
+        |.MyInlineWithRawFontFamily-myFont3 {
+        |  font-family: times-new-roman;
+        |  background-color: #ffff00;
+        |}
+      """.stripMargin))
+
   }
 }