Merge pull request #1101 from ssbc/use-system-font

christianbundy · web-flow · commit 1f3dc35dfcf8 · 2019-06-15T18:44:58.000-07:00
Use system font
diff --git a/lib/main-window.js b/lib/main-window.js
@@ -150,7 +150,7 @@ module.exports = function (config) {
     h('style', {
       innerHTML: computed(api.settings.obs.get('patchwork.fontFamily'), family => {
         if (family) {
-          return 'body, button, input, select, textarea { font-family: ' + family + ';}'
+          return 'body, input, select { font-family: ' + family + ';}'
         }
       })
     })
diff --git a/styles/base/base.mcss b/styles/base/base.mcss
@@ -45,6 +45,9 @@ a {
 * {
   box-sizing: border-box
 }
+html, input, select {
+  font-family: system-ui, sans-serif
+}
 ::-webkit-file-upload-button {
   font-family: inherit
 }
diff --git a/styles/base/main-window.mcss b/styles/base/main-window.mcss
@@ -76,7 +76,6 @@ MainWindow {
         padding: 4px 10px
         border-radius: 3px
         font-size: 120%
-        font-weight: 200
         cursor: pointer
         margin-left: 8px
         text-decoration: none !important
@@ -121,7 +120,6 @@ MainWindow {
       text-align: center
       font-size: 20px
       letter-spacing: 1px
-      font-weight: 200
       -webkit-app-region: drag
       position: relative
       span.title {

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ module.exports = function (config) {`
`150`	`150`	`h('style', {`
`151`	`151`	`innerHTML: computed(api.settings.obs.get('patchwork.fontFamily'), family => {`
`152`	`152`	`if (family) {`
`153`		`- return 'body, button, input, select, textarea { font-family: ' + family + ';}'`
	`153`	`+ return 'body, input, select { font-family: ' + family + ';}'`
`154`	`154`	`}`
`155`	`155`	`})`
`156`	`156`	`})`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,9 @@ a {`
`45`	`45`	`* {`
`46`	`46`	`box-sizing: border-box`
`47`	`47`	`}`
	`48`	`+html, input, select {`
	`49`	`+ font-family: system-ui, sans-serif`
	`50`	`+}`
`48`	`51`	`::-webkit-file-upload-button {`
`49`	`52`	`font-family: inherit`
`50`	`53`	`}`