Fixed font sizes

Author: mrgodhani

package.json

@@ -60,6 +60,7 @@
     "request": "^2.88.2",
     "rss-finder": "^2.1.4",
     "rss-parser": "^3.10.0",
+    "sass-rem": "^2.0.1",
     "splitpanes": "^2.3.6",
     "ssri": "^8.0.1",
     "uuid-by-string": "^3.0.2",

src/App.vue

@@ -12,6 +12,7 @@ export default {
 <style lang="scss">
 $primary: #579EAB;
 @import './node_modules/bootstrap/scss/bootstrap';
+@import './node_modules/sass-rem/rem';
 
 /* open-sans-300 - latin_cyrillic-ext */
 @font-face {
@@ -267,7 +268,7 @@ body {
   position: relative;
   flex-grow: 0;
   width: 260px;
-  font-size: 14px;
+  font-size: rem(16px);
   height: 100%;
   box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.1);
 }
@@ -312,7 +313,7 @@ body {
 
 .sidebar-heading {
   font-weight: 600;
-  font-size: 0.85rem;
+  font-size: rem(16px);
   text-transform: uppercase;
 }
 

src/background.js

@@ -29,7 +29,6 @@ import i18nextMainBackend from './i18nmain.config'
 import {
   parseArticle
 } from './main/article'
-const btoa = require('btoa')
 const FormData = require('form-data')
 const i18nextBackend = require('i18next-electron-fs-backend')
 
@@ -123,6 +122,15 @@ async function createWindow () {
     }
   })
 
+  win.on('close', (event) => {
+    if (app.quitting) {
+      win = null
+    } else {
+      event.preventDefault()
+      win.hide()
+    }
+  })
+
   win.on('closed', () => {
     win = null
   })

src/components/ArticleDetail.vue

@@ -185,6 +185,7 @@ export default {
 }
 </script>
 <style lang="scss">
+@import './node_modules/sass-rem/rem';
 
 .content-wrapper {
   overflow: hidden;
@@ -265,7 +266,7 @@ export default {
     font-size: 2em;
     color: var(--text-color);
     small {
-      font-size: 14px;
+      font-size: rem(14px);
       color: var(--h2-small-color);
     }
   }
@@ -306,7 +307,7 @@ export default {
   }
 
   h3 {
-    font-size: 22px;
+    font-size: rem(22px);
     margin-top: 15px;
     line-height: 29px;
     font-weight: 700;

src/components/ArticleList.vue

@@ -214,6 +214,8 @@ export default {
 }
 </script>
 <style lang="scss">
+@import './node_modules/sass-rem/rem';
+
 .articles-inner {
   position: absolute;
   top: 0;
@@ -280,7 +282,7 @@ export default {
 .articles-list {
   position: relative;
   flex-grow: 0;
-  font-size: 14px;
+  font-size: rem(16px);
   width: 350px;
   height: 100%;
   border-right: 1px solid var(--border-color);
@@ -408,7 +410,7 @@ export default {
 .statusMsg {
   line-height: 30px;
   width: 100%;
-  font-size: 12px;
+  font-size: rem(14px);
   text-align: center;
 }
 

src/components/ArticleListItem.vue

@@ -92,6 +92,7 @@ export default {
     formatDate (article) {
       let formatDate
       if (article.source === 'inoreader' || article.source === 'greader' || article.source === 'fever') {
+        console.log(article)
         formatDate = dayjs.unix(article.publishUnix).fromNow()
       } else if (article.source === 'fever') {
         formatDate = dayjs.unix(article.pubDate).fromNow()

src/services/greader.js

@@ -268,7 +268,7 @@ export default {
               : null,
             itunes: item.itunes || null,
             played: false,
-            publishUnix: dayjs(item.published).unix(),
+            publishUnix: item.published,
             feed_uuid: feed.feed_uuid,
             category: feed.categories.length > 0 ? feed.categories[0].label : null,
             source: 'greader',

src/services/inoreader.js

@@ -288,7 +288,7 @@ export default {
               : null,
             itunes: item.itunes || null,
             played: false,
-            publishUnix: dayjs(item.published).unix(),
+            publishUnix: item.published,
             feed_uuid: feed.feed_uuid,
             category: feed.categories.length > 0 ? feed.categories[0].label : null,
             source: 'inoreader',

yarn.lock

@@ -10651,6 +10651,11 @@ sass-loader@^10.0.5:
     schema-utils "^3.0.0"
     semver "^7.3.2"
 
+sass-rem@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/sass-rem/-/sass-rem-2.0.1.tgz#dd863ec9ca5e0597eae5dd239f1f00a6c0f729b0"
+  integrity sha512-Fuf7i1Wr7n1lIdCiImhCJ1/S0jEYq1OmrlqyKuJKSU2B2kHbU09HJIo5AuADvbf3DJLlRxU7b8Jm8D6m5lfqmA==
+
 sass@^1.26.5:
   version "1.34.1"
   resolved "https://registry.yarnpkg.com/sass/-/sass-1.34.1.tgz#30f45c606c483d47b634f1e7371e13ff773c96ef"