diff --git a/client/src/styles/partials/bdsettings/sidebarview.scss b/client/src/styles/partials/bdsettings/sidebarview.scss index 2d9fd257..3007087a 100644 --- a/client/src/styles/partials/bdsettings/sidebarview.scss +++ b/client/src/styles/partials/bdsettings/sidebarview.scss @@ -53,9 +53,9 @@ .bd-info { display: flex; - flex-grow: 1; align-items: flex-end; overflow: hidden; + padding: 0 25px; .bd-vtext { color: #414245; diff --git a/client/src/styles/partials/generic/scrollable.scss b/client/src/styles/partials/generic/scrollable.scss index e93a426f..5803d1a3 100644 --- a/client/src/styles/partials/generic/scrollable.scss +++ b/client/src/styles/partials/generic/scrollable.scss @@ -8,6 +8,8 @@ flex-direction: column; overflow-y: auto; overflow-x: hidden; + padding: 10px 10px 10px 0; + margin: 10px 0; &::-webkit-scrollbar { width: 14px; diff --git a/client/src/ui/components/BdSettings.vue b/client/src/ui/components/BdSettings.vue index 9d8539b7..4be13fa5 100644 --- a/client/src/ui/components/BdSettings.vue +++ b/client/src/ui/components/BdSettings.vue @@ -17,16 +17,19 @@ ESC -
- v2.0.0a by Jiiks/JsSucks -
- -
-
- -
-
+
+ v2.0.0a by Jiiks/JsSucks +
+ +
+
+ +
+
+ +
+
@@ -53,7 +56,7 @@ import { Settings } from 'modules'; import { SidebarView, Sidebar, SidebarItem, ContentColumn } from './sidebar'; import { CoreSettings, UISettings, EmoteSettings, CssEditorView, PluginsView } from './bd'; - import { SvgX, MiGithubCircle, MiWeb, MiClose } from './common'; + import { SvgX, MiGithubCircle, MiWeb, MiClose, MiTwitterCircle } from './common'; // Constants const sidebarItems = [ @@ -86,7 +89,8 @@ }, components: { SidebarView, Sidebar, SidebarItem, ContentColumn, - CoreSettings, UISettings, EmoteSettings, CssEditorView, PluginsView, MiGithubCircle, MiWeb, MiClose + CoreSettings, UISettings, EmoteSettings, CssEditorView, PluginsView, + MiGithubCircle, MiWeb, MiClose, MiTwitterCircle }, methods: { itemOnClick(id) { @@ -134,6 +138,9 @@ }, openWebsite() { shell.openExternal('https://betterdiscord.net'); + }, + openTwitter() { + shell.openExternal('https://twitter.com/Jiiksi'); } } } diff --git a/client/src/ui/components/common/MaterialIcon.js b/client/src/ui/components/common/MaterialIcon.js index e49021e6..2047d0d0 100644 --- a/client/src/ui/components/common/MaterialIcon.js +++ b/client/src/ui/components/common/MaterialIcon.js @@ -7,3 +7,4 @@ export { default as MiWeb } from './materialicons/Web.vue'; export { default as MiClose } from './materialicons/Close.vue'; export { default as MiMinus } from './materialicons/Minus.vue'; export { default as MiOpenInNew } from './materialicons/OpenInNew.vue'; +export { default as MiTwitterCircle } from './materialicons/TwitterCircle.vue'; diff --git a/client/src/ui/components/common/materialicons/TwitterCircle.vue b/client/src/ui/components/common/materialicons/TwitterCircle.vue new file mode 100644 index 00000000..97154f86 --- /dev/null +++ b/client/src/ui/components/common/materialicons/TwitterCircle.vue @@ -0,0 +1,27 @@ +/** + * BetterDiscord Material Design Icon + * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks + * All rights reserved. + * https://betterdiscord.net + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * Material Design Icons + * Copyright (c) 2014 Google + * Apache 2.0 LICENSE + * https://www.apache.org/licenses/LICENSE-2.0.txt +*/ + + + diff --git a/client/src/ui/components/sidebar/Sidebar.vue b/client/src/ui/components/sidebar/Sidebar.vue index e416fbaa..4f646599 100644 --- a/client/src/ui/components/sidebar/Sidebar.vue +++ b/client/src/ui/components/sidebar/Sidebar.vue @@ -9,7 +9,7 @@ */ diff --git a/client/src/ui/components/sidebar/View.vue b/client/src/ui/components/sidebar/View.vue index 75211a61..1aea082b 100644 --- a/client/src/ui/components/sidebar/View.vue +++ b/client/src/ui/components/sidebar/View.vue @@ -10,12 +10,13 @@