diff --git a/src/renderer/components/side-nav-more-options/side-nav-more-options.css b/src/renderer/components/side-nav-more-options/side-nav-more-options.css
index 3b061f2c..36ad7399 100644
--- a/src/renderer/components/side-nav-more-options/side-nav-more-options.css
+++ b/src/renderer/components/side-nav-more-options/side-nav-more-options.css
@@ -50,9 +50,7 @@
.navOption, .closed .navOption {
width: 70px;
height: 40px;
- padding: 0px;
- padding-top: 10px;
- padding-bottom: 10px;
+ padding: 10px 0px;
}
.navLabel {
@@ -67,10 +65,14 @@
margin-left: 0px;
width: 100%;
display: block;
- margin-bottom: 0px;
+ margin-top: 0.5em;
}
.moreOption {
display: block;
}
+
+ .closed .navIconExpand{
+ height:1.3em;
+ }
}
diff --git a/src/renderer/components/side-nav-more-options/side-nav-more-options.js b/src/renderer/components/side-nav-more-options/side-nav-more-options.js
index 2bb05892..72041448 100644
--- a/src/renderer/components/side-nav-more-options/side-nav-more-options.js
+++ b/src/renderer/components/side-nav-more-options/side-nav-more-options.js
@@ -13,6 +13,14 @@ export default Vue.extend({
},
hideTrendingVideos: function () {
return this.$store.getters.getHideTrendingVideos
+ },
+ hideLabelsSideBar: function () {
+ return this.$store.getters.getHideLabelsSideBar
+ },
+ applyNavIconExpand: function() {
+ return {
+ navIconExpand: this.hideLabelsSideBar
+ }
}
},
methods: {
diff --git a/src/renderer/components/side-nav-more-options/side-nav-more-options.vue b/src/renderer/components/side-nav-more-options/side-nav-more-options.vue
index f9c3f4cb..710d6535 100644
--- a/src/renderer/components/side-nav-more-options/side-nav-more-options.vue
+++ b/src/renderer/components/side-nav-more-options/side-nav-more-options.vue
@@ -2,13 +2,18 @@
@@ -19,38 +24,54 @@
-
+
{{ $t("Trending.Trending") }}
-
+
{{ $t("Most Popular") }}
-
+
{{ $t("About.About") }}
@@ -62,6 +83,7 @@
{{ $t("History.History") }}
@@ -75,6 +97,7 @@
{{ $t("Settings.Settings") }}
@@ -87,8 +110,12 @@
-
+
{{ $t("About.About") }}
diff --git a/src/renderer/components/side-nav/side-nav.css b/src/renderer/components/side-nav/side-nav.css
index d71079f3..e5affb4f 100644
--- a/src/renderer/components/side-nav/side-nav.css
+++ b/src/renderer/components/side-nav/side-nav.css
@@ -26,6 +26,14 @@
width: 80px;
}
+.closed .hiddenLabels {
+ width: 60px;
+}
+
+.closed.hiddenLabels {
+ width: 60px;
+}
+
.topNavOption {
margin-top: 10px;
}
@@ -34,6 +42,7 @@
position: relative;
padding: 5px;
cursor: pointer;
+ min-height: 35px;
}
.moreOption {
@@ -58,15 +67,18 @@
margin-left: 10px;
}
-.navLabel {
- margin-left: 5px;
- display: inline-block;
+.navOption .navLabel {
+ margin-left: 40px;
+ overflow: hidden;
+ margin-left: 40px;
+ word-break: break-word;
}
.navChannel .navLabel {
- font-size: 11px;
- width: 150px;
+ overflow: hidden;
margin-left: 40px;
+ word-break: break-word;
+ font-size: 12px;
}
.thumbnailContainer {
@@ -106,10 +118,7 @@
.closed .navOption {
width: 100%;
- height: 45px;
- padding: 0px;
- padding-top: 10px;
- padding-bottom: 10px;
+ padding: 5px 0px;
}
.closed .navIcon {
@@ -118,6 +127,9 @@
display: block;
margin-bottom: 0px;
}
+.closed .navIconExpand{
+ height:1.3em;
+}
.closed .navLabel {
margin-left: 0px;
@@ -125,24 +137,25 @@
text-align: center;
left: 0px;
font-size: 11px;
+ margin-block-end: 0em;
}
.closed .navChannel {
width: 100%;
- padding: 0px;
- padding-top: 10px;
- padding-bottom: 10px;
+ height: 45px;
+ padding: 5px 0px;
}
.closed .thumbnailContainer {
position: static;
display: block;
float: none;
- margin-left: 0px;
margin: 0 auto;
top: 0px;
-ms-transform: none;
transform: none;
+ margin-block-start: 0.3em;
+ margin-block-end: 0.3em;
}
@media only screen and (max-width: 680px) {
@@ -189,14 +202,10 @@
font-size: 11px;
}
- .navIcon {
- margin-left: 0px;
- width: 100%;
- display: block;
- margin-bottom: 0px;
- }
-
.moreOption {
display: block;
}
+ .closed.hiddenLabels{
+ width: 100%;
+ }
}
diff --git a/src/renderer/components/side-nav/side-nav.js b/src/renderer/components/side-nav/side-nav.js
index d5a52d41..329f474f 100644
--- a/src/renderer/components/side-nav/side-nav.js
+++ b/src/renderer/components/side-nav/side-nav.js
@@ -55,6 +55,22 @@ export default Vue.extend({
},
hideActiveSubscriptions: function () {
return this.$store.getters.getHideActiveSubscriptions
+ },
+ hideLabelsSideBar: function () {
+ return this.$store.getters.getHideLabelsSideBar
+ },
+ hideText: function () {
+ return !this.isOpen && this.hideLabelsSideBar
+ },
+ applyNavIconExpand: function() {
+ return {
+ navIconExpand: this.hideText
+ }
+ },
+ applyHiddenLabels: function() {
+ return {
+ hiddenLabels: this.hideText
+ }
}
},
methods: {
diff --git a/src/renderer/components/side-nav/side-nav.vue b/src/renderer/components/side-nav/side-nav.vue
index 7a2c801f..ac0b5ad0 100644
--- a/src/renderer/components/side-nav/side-nav.vue
+++ b/src/renderer/components/side-nav/side-nav.vue
@@ -2,21 +2,33 @@
-
+
-
-
+
+
+
+
{{ $t("Subscriptions.Subscriptions") }}
@@ -25,15 +37,24 @@
class="navOption mobileHidden"
role="button"
tabindex="0"
+ :title="$t('Trending.Trending')"
@click="navigate('trending')"
@keypress="navigate('trending')"
>
-
-
+
+
+
+
{{ $t("Trending.Trending") }}
@@ -42,15 +63,24 @@
class="navOption mobileHidden"
role="button"
tabindex="0"
+ :title="$t('Most Popular')"
@click="navigate('popular')"
@keypress="navigate('popular')"
>
-
-
+
+
+
+
{{ $t("Most Popular") }}
@@ -59,15 +89,24 @@
class="navOption mobileShow"
role="button"
tabindex="0"
+ :title="$t('Playlists')"
@click="navigate('userplaylists')"
@keypress="navigate('userplaylists')"
>
-
-
+
+
+
+
{{ $t("Playlists") }}
@@ -78,15 +117,24 @@
class="navOption mobileShow"
role="button"
tabindex="0"
+ :title="$t('History.History')"
@click="navigate('history')"
@keypress="navigate('history')"
>
-
-
+
+
+
+
{{ $t("History.History") }}
@@ -95,31 +143,49 @@
class="navOption mobileShow"
role="button"
tabindex="0"
+ :title="$t('Settings.Settings')"
@click="navigate('settings')"
@keypress="navigate('settings')"
>
-
-
- {{ $t("Settings.Settings") }}
+
+
+
+
+ {{ $t('Settings.Settings') }}
-
-
+
+
+
+
{{ $t("About.About") }}
diff --git a/src/renderer/components/theme-settings/theme-settings.js b/src/renderer/components/theme-settings/theme-settings.js
index eeafaadf..b38e95a0 100644
--- a/src/renderer/components/theme-settings/theme-settings.js
+++ b/src/renderer/components/theme-settings/theme-settings.js
@@ -81,7 +81,9 @@ export default Vue.extend({
disableSmoothScrolling: function () {
return this.$store.getters.getDisableSmoothScrolling
},
-
+ hideLabelsSideBar: function () {
+ return this.$store.getters.getHideLabelsSideBar
+ },
restartPromptMessage: function () {
return this.$t('Settings["The app needs to restart for changes to take effect. Restart and apply change?"]')
},
@@ -215,7 +217,8 @@ export default Vue.extend({
...mapActions([
'updateBarColor',
'updateUiScale',
- 'updateDisableSmoothScrolling'
+ 'updateDisableSmoothScrolling',
+ 'updateHideLabelsSideBar'
])
}
})
diff --git a/src/renderer/components/theme-settings/theme-settings.vue b/src/renderer/components/theme-settings/theme-settings.vue
index 9633aba5..2b5082fb 100644
--- a/src/renderer/components/theme-settings/theme-settings.vue
+++ b/src/renderer/components/theme-settings/theme-settings.vue
@@ -22,6 +22,11 @@
:default-value="disableSmoothScrollingToggleValue"
@change="handleRestartPrompt"
/>
+