Merge pull request #421 from h3poteto/iss-382

closes #382 Use Lato font in textarea because backtic is broken in Noto
h3poteto · Jul 2, 2018 · d8a25df · d8a25df
2 parents f04748b + 6a05b39
commit d8a25df
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 2 deletions.
diff --git a/src/renderer/assets/fonts/Lato-Black.ttf b/src/renderer/assets/fonts/Lato-Black.ttf
diff --git a/src/renderer/assets/fonts/Lato-BlackItalic.ttf b/src/renderer/assets/fonts/Lato-BlackItalic.ttf
diff --git a/src/renderer/assets/fonts/Lato-Bold.ttf b/src/renderer/assets/fonts/Lato-Bold.ttf
diff --git a/src/renderer/assets/fonts/Lato-BoldItalic.ttf b/src/renderer/assets/fonts/Lato-BoldItalic.ttf
diff --git a/src/renderer/assets/fonts/Lato-Hairline.ttf b/src/renderer/assets/fonts/Lato-Hairline.ttf
diff --git a/src/renderer/assets/fonts/Lato-HairlineItalic.ttf b/src/renderer/assets/fonts/Lato-HairlineItalic.ttf
diff --git a/src/renderer/assets/fonts/Lato-Italic.ttf b/src/renderer/assets/fonts/Lato-Italic.ttf
diff --git a/src/renderer/assets/fonts/Lato-Light.ttf b/src/renderer/assets/fonts/Lato-Light.ttf
diff --git a/src/renderer/assets/fonts/Lato-LightItalic.ttf b/src/renderer/assets/fonts/Lato-LightItalic.ttf
diff --git a/src/renderer/assets/fonts/Lato-Regular.ttf b/src/renderer/assets/fonts/Lato-Regular.ttf
diff --git a/src/renderer/assets/fonts/fonts.css b/src/renderer/assets/fonts/fonts.css
@@ -8,3 +8,14 @@
 		local("NotoSans-Regular"),
 		url("./NotoSans-Regular.ttf") format("truetype");
 }
+
+/* === Lato - regular */
+@font-face {
+	font-family: 'Lato';
+	font-style: normal;
+	font-weight: 400;
+	src: url("./Lato-Regular.ttf");
+	src: local("Lato Regular"),
+		local("Lato-Regular"),
+		url("./Lato-Regular.ttf") format("truetype");
+}
diff --git a/src/renderer/components/TimelineSpace/Modals/NewToot.vue b/src/renderer/components/TimelineSpace/Modals/NewToot.vue
@@ -279,7 +279,7 @@ export default {
 
       input {
         border-radius: 0;
-        font-family: 'Noto Sans', sans-serif;
+        font-family: 'Lato', sans-serif;
 
         &::placeholder {
           color: #c0c4cc;
@@ -302,7 +302,7 @@ export default {
         resize: none;
         height: 120px;
         transition: border-color .2s cubic-bezier(.645,.045,.355,1);
-        font-family: 'Noto Sans', sans-serif;
+        font-family: 'Lato', sans-serif;
 
         &::placeholder {
           color: #c0c4cc;