From 70f5339e86cf26a0729e802bf3cc17e6099ce5f4 Mon Sep 17 00:00:00 2001 From: Nikan Dalvand Date: Sat, 20 Jul 2019 14:36:45 +0430 Subject: [PATCH 1/7] Sidebar box sizing should be border-box --- src/renderer/layouts/DockableSidebar.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/renderer/layouts/DockableSidebar.vue b/src/renderer/layouts/DockableSidebar.vue index 6a68aa5..68be565 100644 --- a/src/renderer/layouts/DockableSidebar.vue +++ b/src/renderer/layouts/DockableSidebar.vue @@ -15,4 +15,5 @@ section width: 100% max-width: 250px padding: 2rem 3rem + box-sizing: border-box From 7270aea59eaf9632b2d38bb7029ac9a8a5f38140 Mon Sep 17 00:00:00 2001 From: Nikan Dalvand Date: Sat, 20 Jul 2019 14:46:04 +0430 Subject: [PATCH 2/7] Added proper background-color for sidebar --- src/renderer/layouts/DockableSidebar.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/renderer/layouts/DockableSidebar.vue b/src/renderer/layouts/DockableSidebar.vue index 68be565..66b4298 100644 --- a/src/renderer/layouts/DockableSidebar.vue +++ b/src/renderer/layouts/DockableSidebar.vue @@ -16,4 +16,5 @@ section max-width: 250px padding: 2rem 3rem box-sizing: border-box + background-color: #fcfcfc From e2356c62ce395978f043a97364080596f029f414 Mon Sep 17 00:00:00 2001 From: Nikan Dalvand Date: Sat, 20 Jul 2019 14:48:02 +0430 Subject: [PATCH 3/7] Created base component for MenuGroup and MenuItem --- src/renderer/components/MenuGroup.vue | 15 +++++++++++++++ src/renderer/components/MenuItem.vue | 15 +++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 src/renderer/components/MenuGroup.vue create mode 100644 src/renderer/components/MenuItem.vue diff --git a/src/renderer/components/MenuGroup.vue b/src/renderer/components/MenuGroup.vue new file mode 100644 index 0000000..fbb0c82 --- /dev/null +++ b/src/renderer/components/MenuGroup.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/src/renderer/components/MenuItem.vue b/src/renderer/components/MenuItem.vue new file mode 100644 index 0000000..27b87da --- /dev/null +++ b/src/renderer/components/MenuItem.vue @@ -0,0 +1,15 @@ + + + + + From f761cf193f9e38805c9c595228dd738860aed7ea Mon Sep 17 00:00:00 2001 From: Nikan Dalvand Date: Sat, 20 Jul 2019 15:45:03 +0430 Subject: [PATCH 4/7] Added a baseline for MenuGroup and MenuItem --- src/renderer/components/MenuGroup.vue | 12 +++++++++--- src/renderer/components/MenuItem.vue | 14 ++++++++++---- src/renderer/layouts/DockableSidebar.vue | 15 ++++++++++++++- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/src/renderer/components/MenuGroup.vue b/src/renderer/components/MenuGroup.vue index fbb0c82..891a9d2 100644 --- a/src/renderer/components/MenuGroup.vue +++ b/src/renderer/components/MenuGroup.vue @@ -1,6 +1,11 @@ @@ -10,6 +15,7 @@ export default { } - diff --git a/src/renderer/components/MenuItem.vue b/src/renderer/components/MenuItem.vue index 27b87da..487672a 100644 --- a/src/renderer/components/MenuItem.vue +++ b/src/renderer/components/MenuItem.vue @@ -1,12 +1,18 @@ diff --git a/src/renderer/layouts/DockableSidebar.vue b/src/renderer/layouts/DockableSidebar.vue index 66b4298..c12f38f 100644 --- a/src/renderer/layouts/DockableSidebar.vue +++ b/src/renderer/layouts/DockableSidebar.vue @@ -1,12 +1,25 @@ From abeeb6638e91796d09c2c9ea68da874c1a3dc315 Mon Sep 17 00:00:00 2001 From: Nikan Dalvand Date: Sat, 20 Jul 2019 15:52:47 +0430 Subject: [PATCH 5/7] Added typeface-lato and configured Lato font --- package-lock.json | 5 +++++ package.json | 1 + src/renderer/App.vue | 2 ++ 3 files changed, 8 insertions(+) diff --git a/package-lock.json b/package-lock.json index d399c45..4f87ef9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16212,6 +16212,11 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "dev": true }, + "typeface-lato": { + "version": "0.0.75", + "resolved": "https://registry.npmjs.org/typeface-lato/-/typeface-lato-0.0.75.tgz", + "integrity": "sha512-iA5uJD4PSTyIE4BDiSOexQeXkDkiJuX4Hu3wh3saJ06EB2TvJayab1Lbbmqq2je/LQv7KCQZHZmC0k4hedd8sw==" + }, "uglify-js": { "version": "3.4.10", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz", diff --git a/package.json b/package.json index 62e33a3..e179e63 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ "dependencies": { "axios": "^0.18.0", "normalize-scss": "^7.0.1", + "typeface-lato": "0.0.75", "vue": "^2.5.16", "vue-electron": "^1.0.6", "vue-router": "^3.0.1", diff --git a/src/renderer/App.vue b/src/renderer/App.vue index 070727b..d2f9e12 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -11,6 +11,7 @@ diff --git a/src/renderer/components/MenuItem.vue b/src/renderer/components/MenuItem.vue index 487672a..6335817 100644 --- a/src/renderer/components/MenuItem.vue +++ b/src/renderer/components/MenuItem.vue @@ -1,10 +1,10 @@ @@ -12,10 +12,25 @@ - diff --git a/src/renderer/layouts/DockableSidebar.vue b/src/renderer/layouts/DockableSidebar.vue index c12f38f..8d859bd 100644 --- a/src/renderer/layouts/DockableSidebar.vue +++ b/src/renderer/layouts/DockableSidebar.vue @@ -1,15 +1,38 @@ @@ -27,7 +50,12 @@ export default { section width: 100% max-width: 250px + min-height: 100vh padding: 2rem 3rem box-sizing: border-box background-color: #fcfcfc + display: flex + flex-direction: column + .grow + flex-grow: 1 From 776296e879e269f7b9347e6593d5f05980ae5b6c Mon Sep 17 00:00:00 2001 From: Nikan Dalvand Date: Sat, 20 Jul 2019 17:46:34 +0430 Subject: [PATCH 7/7] Made Sidebar scrollable and limited the root height for modular scrollbars --- src/renderer/App.vue | 1 + src/renderer/layouts/DockableSidebar.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/renderer/App.vue b/src/renderer/App.vue index d2f9e12..b1fe1e6 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -25,6 +25,7 @@ export default { .root,.page-wrapper display: flex font-family: 'Lato', sans-serif + max-height: 100vh .page-wrapper flex-direction: column diff --git a/src/renderer/layouts/DockableSidebar.vue b/src/renderer/layouts/DockableSidebar.vue index 8d859bd..d515b64 100644 --- a/src/renderer/layouts/DockableSidebar.vue +++ b/src/renderer/layouts/DockableSidebar.vue @@ -56,6 +56,7 @@ section background-color: #fcfcfc display: flex flex-direction: column + overflow: auto .grow flex-grow: 1