dispatch({ type: "application/updatebannertext", text: undefined }) }>
+ return (text !== undefined) &&
dispatch({ type: "application/updatebannertext", text: undefined }) }>
{ text }
;
}
diff --git a/bfrontend/src/Components/UI/Sidebar.js b/bfrontend/src/Components/UI/Sidebar.js
index 09351d2..02e7996 100644
--- a/bfrontend/src/Components/UI/Sidebar.js
+++ b/bfrontend/src/Components/UI/Sidebar.js
@@ -7,7 +7,7 @@ import { connect } from 'react-redux';
function Sidebar({ user }) {
return (
-
{ user && }
diff --git a/bfrontend/src/Styles/Components/Button.scss b/bfrontend/src/Styles/Components/Button.scss
index b251997..e519748 100644
--- a/bfrontend/src/Styles/Components/Button.scss
+++ b/bfrontend/src/Styles/Components/Button.scss
@@ -1,5 +1,4 @@
.button {
- @include card;
background-color: var(--button-color);
color: var(--default-text-color);
diff --git a/bfrontend/src/Styles/Components/Card.scss b/bfrontend/src/Styles/Components/Card.scss
index d0da9f2..557acec 100644
--- a/bfrontend/src/Styles/Components/Card.scss
+++ b/bfrontend/src/Styles/Components/Card.scss
@@ -1,16 +1,4 @@
-@mixin card {
- padding: 0px;
- margin: 0px;
- background-color: rgba(0, 0, 0, 0);
- border-radius: var(--default-border-radius);
-}
-
-.card {
- @include card;
-}
-
-.bar-card {
- @include card;
+.bar {
@extend .elevated;
height: 32px;
@@ -22,39 +10,33 @@
z-index: 10;
&-accent {
- @extend .bar-card;
+ @extend .bar;
background-color: var(--channel-top-bar-color-accent);
}
}
-.message-list-card {
- @include card;
+.message-list {
@include fancy-scrollbar-firefox;
- background-color: var(--channel-message-list-background-color);
flex-basis: 100%;
border-radius: 0px;
overflow: auto;
}
-.col-flex-card {
- @include card;
-
+.col-flex {
flex-grow: 1;
display: flex;
flex-direction: column;
}
-.row-flex-card {
- @include card;
-
+.row-flex {
flex-grow: 10;
display: flex;
flex-direction: row;
}
-.gradient-banner-card {
+.gradient-banner {
background: var(--default-user-background);
height: 1.5rem;
padding: 10px;
@@ -69,7 +51,7 @@
.elevated-modal {
@extend .elevated-2;
- background-color: var(--card-accent-color-dark);
+ background-color: var(--accent-color-dark);
padding: 16px;
margin: 6px;
border-radius: var(--elevated-modal-border-radius);
diff --git a/bfrontend/src/Styles/Components/Containers.scss b/bfrontend/src/Styles/Components/Containers.scss
index 6bb903b..e16be39 100644
--- a/bfrontend/src/Styles/Components/Containers.scss
+++ b/bfrontend/src/Styles/Components/Containers.scss
@@ -10,7 +10,6 @@
.sidebar {
@include fancy-scrollbar-firefox;
- @include card;
@extend .no-select;
background-color: var(--sidebar-background-color);
@@ -32,10 +31,9 @@
.channel-message-panel {
@extend .hidden-overflow;
- @extend .col-flex-card;
+ @extend .col-flex;
padding: 15px;
- background-color: var(--channel-view-container-color);
}
.hidden-overflow {
diff --git a/bfrontend/src/Styles/Components/Message.scss b/bfrontend/src/Styles/Components/Message.scss
index 7e35711..c47695e 100644
--- a/bfrontend/src/Styles/Components/Message.scss
+++ b/bfrontend/src/Styles/Components/Message.scss
@@ -1,5 +1,4 @@
.message {
- @include card;
display: flex;
flex-direction: row;
diff --git a/bfrontend/src/Styles/Components/Textbox.scss b/bfrontend/src/Styles/Components/Textbox.scss
index 2e928dc..ea441d1 100644
--- a/bfrontend/src/Styles/Components/Textbox.scss
+++ b/bfrontend/src/Styles/Components/Textbox.scss
@@ -1,6 +1,4 @@
.text-input {
- @include card;
-
margin: 1px;
padding: 5px;
border: none;
diff --git a/bfrontend/src/Styles/root.scss b/bfrontend/src/Styles/root.scss
index ae10af9..34c958d 100644
--- a/bfrontend/src/Styles/root.scss
+++ b/bfrontend/src/Styles/root.scss
@@ -1,7 +1,7 @@
:root {
--background-color: hsl(230, 12%, 15%);
- --card-accent-color: hsl(230, 12%, 18%);
- --card-accent-color-dark: hsl(230, 12%, 12%);
+ --accent-color: hsl(230, 12%, 18%);
+ --accent-color-dark: hsl(230, 12%, 12%);
--default-text-color: hsl(0, 0%, 80%);
--darker-text-color: hsl(0, 0%, 65%);
@@ -20,14 +20,14 @@
--elevated-modal-border-radius: 10px;
- --default-scrollbar-color: var(--card-accent-color);
+ --default-scrollbar-color: var(--accent-color);
--default-scrollbar-color-track: var(--background-color);
--default-scrollbar-width: 1px;
--channel-top-bar-color-accent: var(--background-color);
--channel-top-bar-color: var(--background-color);
--elevation-box-shadow: 0 1px 0 0 hsla(230, 12%, 5%, 0.3), 0 2px 0 0 hsla(230, 12%, 6%, 0.2), 0 3px 0 0 hsla(230, 12%, 7%, 0.1);
- --message-box-color: var(--card-accent-color);
+ --message-box-color: var(--accent-color);
--sidebar-background-color: hsl(230, 12%, 12%);
@@ -35,9 +35,9 @@
--channel-message-color: var(--accent-color-dark);
--channel-view-container-color: var(--accent-color-dark);
- --button-color: var(--card-accent-color-dark);
- --button-hover-background-color: var(--card-accent-color);
- --button-selected-background-color: var(--card-accent-color);
+ --button-color: var(--accent-color-dark);
+ --button-hover-background-color: var(--accent-color);
+ --button-selected-background-color: var(--accent-color);
--channel-button-background: none;
--default-border-radius: 0px;