diff --git a/client/src/styles/partials/bdsettings/sidebarview.scss b/client/src/styles/partials/bdsettings/sidebarview.scss index 07662c4f..4442f35f 100644 --- a/client/src/styles/partials/bdsettings/sidebarview.scss +++ b/client/src/styles/partials/bdsettings/sidebarview.scss @@ -64,20 +64,14 @@ cursor: pointer; &:hover { - .material-design-icon { + .bd-material-design-icon { fill: #FFF; } } } - .material-design-icon { + .bd-material-design-icon { fill: #414245; - - svg { - width: 16px; - height: 16px; - } - &:hover { fill: #FFF; } diff --git a/client/src/ui/components/BdSettings.vue b/client/src/ui/components/BdSettings.vue index f6f6e2a3..0c349a83 100644 --- a/client/src/ui/components/BdSettings.vue +++ b/client/src/ui/components/BdSettings.vue @@ -20,10 +20,10 @@
v2.0.0a by Jiiks/JsSucks
- +
- +
@@ -53,7 +53,7 @@ import { Settings } from 'modules'; import { SidebarView, Sidebar, SidebarItem, ContentColumn } from './sidebar'; import { CoreSettings, UISettings, EmoteSettings, CssEditorView, PluginsView } from './bd'; - import { SvgX } from './common'; + import { SvgX, MaterialIcon } from './common'; import MiGithub from 'vue-material-design-icons/github-circle.vue'; import MiWeb from 'vue-material-design-icons/web.vue'; @@ -88,9 +88,8 @@ }, components: { SidebarView, Sidebar, SidebarItem, ContentColumn, - CoreSettings, UISettings, EmoteSettings, CssEditorView, PluginsView, - SvgX, - MiGithub, MiWeb + CoreSettings, UISettings, EmoteSettings, CssEditorView, PluginsView, MaterialIcon, + SvgX }, methods: { itemOnClick(id) { diff --git a/client/src/ui/components/bd/PluginCard.vue b/client/src/ui/components/bd/PluginCard.vue index ce20d3d2..b4fb9f5c 100644 --- a/client/src/ui/components/bd/PluginCard.vue +++ b/client/src/ui/components/bd/PluginCard.vue @@ -25,16 +25,16 @@
@@ -45,11 +45,7 @@ \ No newline at end of file diff --git a/client/src/ui/components/common/index.js b/client/src/ui/components/common/index.js index 1c0884f8..019c48cb 100644 --- a/client/src/ui/components/common/index.js +++ b/client/src/ui/components/common/index.js @@ -5,3 +5,4 @@ export { default as ButtonGroup } from './ButtonGroup.vue'; export { default as Button } from './Button.vue'; export { default as Modal } from './Modal.vue'; export { default as SvgX } from './SvgX.vue'; +export { default as MaterialIcon } from './MaterialIcon.vue'; diff --git a/client/src/ui/components/common/materialicons/Delete.vue b/client/src/ui/components/common/materialicons/Delete.vue new file mode 100644 index 00000000..a49f6f55 --- /dev/null +++ b/client/src/ui/components/common/materialicons/Delete.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/common/materialicons/GithubCircle.vue b/client/src/ui/components/common/materialicons/GithubCircle.vue new file mode 100644 index 00000000..1cfc90e7 --- /dev/null +++ b/client/src/ui/components/common/materialicons/GithubCircle.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/common/materialicons/Pencil.vue b/client/src/ui/components/common/materialicons/Pencil.vue new file mode 100644 index 00000000..bc822551 --- /dev/null +++ b/client/src/ui/components/common/materialicons/Pencil.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/common/materialicons/Refresh.vue b/client/src/ui/components/common/materialicons/Refresh.vue new file mode 100644 index 00000000..dc05440d --- /dev/null +++ b/client/src/ui/components/common/materialicons/Refresh.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/common/materialicons/Settings.vue b/client/src/ui/components/common/materialicons/Settings.vue new file mode 100644 index 00000000..57a753e8 --- /dev/null +++ b/client/src/ui/components/common/materialicons/Settings.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/common/materialicons/Web.vue b/client/src/ui/components/common/materialicons/Web.vue new file mode 100644 index 00000000..128aedd5 --- /dev/null +++ b/client/src/ui/components/common/materialicons/Web.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 +*/ + + +