Merge pull request #137 from VoOoLoX/master

Fix for the #125 and #126
terkelg · Jun 7, 2017 · 86d99ff · 86d99ff
2 parents 7beef77 + 2e1c7a0
commit 86d99ff
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 8 deletions.
diff --git a/app/src/main/menus.js b/app/src/main/menus.js
@@ -115,13 +115,14 @@ const template = [{
   {
     label: 'Clear cache',
     click (item, focusedWindow) {
-      if (focusedWindow)
+      if (focusedWindow) {
         focusedWindow.webContents.session.clearCache(() => {
           dialog.showMessageBox({
             message: 'Cache cleared correctly!'
           })
           focusedWindow.reload()
         })
+      }
     }
   },
   {

diff --git a/app/src/main/tray.js b/app/src/main/tray.js
@@ -2,7 +2,6 @@ const path = require('path')
 const {
   app,
   dialog,
-  session,
   shell,
   Tray,
   Menu

diff --git a/app/src/renderer/js/index.js b/app/src/renderer/js/index.js
@@ -60,15 +60,15 @@ ipcRenderer.on('navigate-up', () => {
     post -= 1
     var title = $('#react-root > section > main > section > div > div:nth-child(1) > article:nth-child(' + post + ') > header')
     var rect = title.getBoundingClientRect()
-    window.scrollBy(0, rect.top)
+    window.scrollBy(0, rect.top - 44)
   }
 })
 
 ipcRenderer.on('navigate-down', () => {
   post += 1
   var title = $('#react-root > section > main > section > div > div:nth-child(1) > article:nth-child(' + post + ') > header')
   var rect = title.getBoundingClientRect()
-  window.scrollBy(0, rect.top)
+  window.scrollBy(0, rect.top - 44)
 })
 
 function backHomeButton (location) {

diff --git a/app/src/renderer/styles/core/_fixes.scss b/app/src/renderer/styles/core/_fixes.scss
@@ -55,7 +55,7 @@ section > footer,
 }
 
 /* Force the height of Followers and bgcolor*/
-#react-root ._q44m8{
+#react-root ._q44m8 {
   background-color: $light;
   height: 45px; /*The same as the back btn*/
   border-color: $light;

diff --git a/app/src/renderer/styles/core/_sidebar.scss b/app/src/renderer/styles/core/_sidebar.scss
@@ -1,5 +1,6 @@
 /* Make room for sidebar */
 
+/*
 .logged-in #react-root {
   ._8f735._e4u5z {
     margin-left: 80px;
@@ -13,7 +14,8 @@
     margin-left: 79px!important;
   }
 }
-
+Outdated
+*/
 
 /* Add sidebar */
 #react-root > section > nav {
@@ -29,8 +31,10 @@
 
 /* Fix main container width */
 #react-root > section > main {
-  max-width: calc(100% - 80px);
-  margin-left: 80px;
+  max-width: calc(100vw - 80px);
+  position: relative;
+  left: 80px;
+  top: 44px;
 }
 
 

diff --git a/app/src/renderer/styles/theme-dark/_fixes.scss b/app/src/renderer/styles/theme-dark/_fixes.scss
@@ -174,3 +174,17 @@ html.dark-mode {
     }
   }
 }
+
+/*Title, Heart and Comment images*/
+
+html.dark-mode .coreSpriteComment {
+  filter: invert(100%);
+}
+
+html.dark-mode .coreSpriteLikeHeartOpen {
+  filter: invert(100%);
+}
+
+html.dark-mode .coreSpriteMobileNavTypeLogo {
+  filter: invert(100%);
+}