diff --git a/src/assets/graphics/HomeGraphics.png b/src/assets/graphics/HomeGraphics.png index 3c69a79..e1f528d 100644 Binary files a/src/assets/graphics/HomeGraphics.png and b/src/assets/graphics/HomeGraphics.png differ diff --git a/src/components/ProfilePictureTemplate.vue b/src/components/ProfilePictureTemplate.vue index fc47ea8..3b722b2 100644 --- a/src/components/ProfilePictureTemplate.vue +++ b/src/components/ProfilePictureTemplate.vue @@ -80,6 +80,7 @@ export default { } .inner-profile-picture { background-color: rgba(0, 0, 0, 0.315); + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.20); border-radius: 50%; background-position: center; background-size: cover; diff --git a/src/components/app/FriendsList.vue b/src/components/app/FriendsList.vue index e3869fd..c19202f 100644 --- a/src/components/app/FriendsList.vue +++ b/src/components/app/FriendsList.vue @@ -2,6 +2,7 @@
+
-
-
@@ -94,15 +93,12 @@ export default { diff --git a/src/components/app/MainNav.vue b/src/components/app/MainNav.vue new file mode 100644 index 0000000..967b86d --- /dev/null +++ b/src/components/app/MainNav.vue @@ -0,0 +1,380 @@ + + + + + diff --git a/src/components/app/MemberTemplate.vue b/src/components/app/MemberTemplate.vue index 71f7bb5..27ce85e 100644 --- a/src/components/app/MemberTemplate.vue +++ b/src/components/app/MemberTemplate.vue @@ -75,10 +75,13 @@ export default { cursor: pointer; user-select: none; overflow: hidden; + border-radius: 4px; + margin-left: 5px; + margin-right: 5px; } .member:hover { - background: #064d55; + background: #063442; } .information { diff --git a/src/components/app/MembersList.vue b/src/components/app/MembersList.vue index 6bdef5f..bcfbeb9 100644 --- a/src/components/app/MembersList.vue +++ b/src/components/app/MembersList.vue @@ -81,16 +81,14 @@ export default { display: flex; flex-direction: column; width: 300px; + max-width: calc(100% - 60px); height: 100%; - background-image: url("../../assets/leftPanelBackground.jpg"); - background-repeat: no-repeat; - background-position: center; - background-size: cover; + background: rgba(0, 0, 0, 0.14); } .header { height: 50px; width: 100%; - background: rgba(0, 0, 0, 0.438); + background: #083A4A; display: flex; flex-shrink: 0; } @@ -103,12 +101,12 @@ export default { overflow: auto; } .tab { - background: #095a5c; padding: 5px; user-select: none; cursor: default; - color: #cce4e3; + color: #b5c4ca; font-size: 15px; + margin-left: 10px; } diff --git a/src/components/app/MessagePanel.vue b/src/components/app/MessagePanel.vue index a44d3a5..78710be 100644 --- a/src/components/app/MessagePanel.vue +++ b/src/components/app/MessagePanel.vue @@ -41,7 +41,6 @@
-
format_bold
format_italic
@@ -78,7 +77,7 @@ @paste="onPaste" >
{{ getFile.fileName }}
- +
Download
@@ -272,6 +272,10 @@ export default { \ No newline at end of file diff --git a/src/components/app/Popouts/Popouts/AddFriend.vue b/src/components/app/Popouts/Popouts/AddFriend.vue index 5a6992c..5e17328 100644 --- a/src/components/app/Popouts/Popouts/AddFriend.vue +++ b/src/components/app/Popouts/Popouts/AddFriend.vue @@ -98,15 +98,14 @@ export default { position: relative; margin: auto; overflow: hidden; - background-image: url("../../../../assets/leftPanelBackground.jpg"); - background-repeat: no-repeat; - background-position: center; - background-size: cover; + box-shadow: 0px 0px 20px 5px #151515bd; + background: linear-gradient(#0B4155, #01677E); + border-radius: 4px; } .header { display: flex; flex-shrink: 0; - background-color: #085053; + background-color: #05222d; color: white; height: 50px; align-content: center; @@ -142,10 +141,10 @@ export default { align-self: center; color: white; width: initial; - background: #05353b; + background: #024554; cursor: pointer; &:hover { - background: #0f292c; + background: #02303c; } } diff --git a/src/components/app/Popouts/Popouts/AddServer.vue b/src/components/app/Popouts/Popouts/AddServer.vue index 770795c..643c527 100644 --- a/src/components/app/Popouts/Popouts/AddServer.vue +++ b/src/components/app/Popouts/Popouts/AddServer.vue @@ -217,16 +217,15 @@ export default { flex-direction: column; color: white; overflow: hidden; - background-image: url("../../../../assets/leftPanelBackground.jpg"); - background-repeat: no-repeat; - background-position: center; - background-size: cover; + box-shadow: 0px 0px 20px 5px #151515bd; + background: linear-gradient(#0B4155, #01677E); + border-radius: 4px; } .tabs { display: flex; justify-content: center; padding-top: 15px; - background: #144a59; + background: #05222d; flex-shrink: 0; } .tab { @@ -284,7 +283,7 @@ export default { align-self: center; margin-top: 15px; margin-bottom: 10px; - background-color: #06454d; + background-color: #044050; padding: 10px; } @@ -301,7 +300,7 @@ export default { .button { padding: 5px; - background: #05353b; + background: #024554; user-select: none; border: none; color: white; @@ -313,7 +312,7 @@ export default { cursor: pointer; } .button:hover { - background: #0f292c; + background: #02303c; } .button-clicked { diff --git a/src/components/app/Popouts/Popouts/DragDropFileUploadDialog.vue b/src/components/app/Popouts/Popouts/DragDropFileUploadDialog.vue index 247c46e..1a1f159 100644 --- a/src/components/app/Popouts/Popouts/DragDropFileUploadDialog.vue +++ b/src/components/app/Popouts/Popouts/DragDropFileUploadDialog.vue @@ -28,10 +28,10 @@ display: flex; flex-direction: column; user-select: none; - background-image: url("../../../../assets/leftPanelBackground.jpg"); - background-repeat: no-repeat; - background-position: center; - background-size: cover; + overflow: hidden; + box-shadow: 0px 0px 20px 5px #151515bd; + background-color: #044050; + border-radius: 4px; } .material-icons{ font-size: 80px; diff --git a/src/components/app/Popouts/Popouts/GDriveLinkMenu.vue b/src/components/app/Popouts/Popouts/GDriveLinkMenu.vue index 7ff17db..3fa500e 100644 --- a/src/components/app/Popouts/Popouts/GDriveLinkMenu.vue +++ b/src/components/app/Popouts/Popouts/GDriveLinkMenu.vue @@ -94,11 +94,10 @@ export default { display: flex; flex-direction: column; color: white; - border-radius: 3px; - background-image: url("../../../../assets/leftPanelBackground.jpg"); - background-repeat: no-repeat; - background-position: center; - background-size: cover; + overflow: hidden; + box-shadow: 0px 0px 20px 5px #151515bd; + background: linear-gradient(#0B4155, #01677E); + border-radius: 4px; } .text { color: white; diff --git a/src/components/app/Popouts/Popouts/ServerInvitePopout.vue b/src/components/app/Popouts/Popouts/ServerInvitePopout.vue index 27a6f99..e618ab3 100644 --- a/src/components/app/Popouts/Popouts/ServerInvitePopout.vue +++ b/src/components/app/Popouts/Popouts/ServerInvitePopout.vue @@ -110,10 +110,9 @@ export default { flex-direction: column; color: white; overflow: hidden; - background-image: url("../../../../assets/leftPanelBackground.jpg"); - background-repeat: no-repeat; - background-position: center; - background-size: cover; + box-shadow: 0px 0px 20px 5px #151515bd; + background: linear-gradient(#0B4155, #01677E); + border-radius: 4px; } .top { display: flex; @@ -125,14 +124,14 @@ export default { .button { padding: 10px; - background: #05353b; + background: #062c3a; margin: auto; transition: 0.3s; user-select: none; cursor:pointer; } .button:hover { - background: #0f292c; + background: #041e27; } .bottom { diff --git a/src/components/app/Popouts/Popouts/ServerSettingsPanels/DropDownMenu.vue b/src/components/app/Popouts/Popouts/ServerSettingsPanels/DropDownMenu.vue index eb26912..3c8a39a 100644 --- a/src/components/app/Popouts/Popouts/ServerSettingsPanels/DropDownMenu.vue +++ b/src/components/app/Popouts/Popouts/ServerSettingsPanels/DropDownMenu.vue @@ -86,7 +86,7 @@ export default { diff --git a/src/components/app/Popouts/Popouts/SettingsPanels/appSettings.vue b/src/components/app/Popouts/Popouts/SettingsPanels/appSettings.vue index b580a1d..88d72dc 100644 --- a/src/components/app/Popouts/Popouts/SettingsPanels/appSettings.vue +++ b/src/components/app/Popouts/Popouts/SettingsPanels/appSettings.vue @@ -111,7 +111,6 @@ export default { width: 100%; height: 100%; flex-direction: column; - background:#09464f; } diff --git a/src/components/app/Popouts/Popouts/SettingsPanels/survey.vue b/src/components/app/Popouts/Popouts/SettingsPanels/survey.vue index 7d931bb..7d03be2 100644 --- a/src/components/app/Popouts/Popouts/SettingsPanels/survey.vue +++ b/src/components/app/Popouts/Popouts/SettingsPanels/survey.vue @@ -226,7 +226,7 @@ export default { } .survey .button { color: white; - background: #05353b; + background: #024554; padding-top: 10px; padding-bottom: 10px; width: 100%; @@ -236,7 +236,7 @@ export default { cursor: pointer; } .survey .button:hover { - background: #0f292c; + background: #02303c; } .title { @@ -256,7 +256,7 @@ export default { .input { display: flex; flex-direction: column; - background-color: #06454d; + background-color: #044050; padding: 10px; margin: 10px; margin-left: 30px; @@ -266,15 +266,14 @@ export default { .input input { width: initial; margin-top: 2px; - background: #05353b; + background: #032d38; } textarea { padding: 10px; resize: none; - background: #05353b; + background: #032d38; border: none; outline: none; - border-radius: 5px; color: white; height: 100px; margin-bottom: 10px; diff --git a/src/components/app/Popouts/Popouts/TakeSurveyPopout.vue b/src/components/app/Popouts/Popouts/TakeSurveyPopout.vue index 74c37e3..1df1c9a 100644 --- a/src/components/app/Popouts/Popouts/TakeSurveyPopout.vue +++ b/src/components/app/Popouts/Popouts/TakeSurveyPopout.vue @@ -74,10 +74,10 @@ export default { margin: auto; box-shadow: 0px 0px 20px rgba(0, 0, 0, 0.507); padding: 10px; - background-image: url("../../../../assets/leftPanelBackground.jpg"); - background-repeat: no-repeat; - background-position: center; - background-size: cover; + overflow: hidden; + box-shadow: 0px 0px 20px 5px #151515bd; + background: linear-gradient(#0B4155, #01677E); + border-radius: 4px; } .survay-icon .material-icons{ color: white; @@ -99,16 +99,16 @@ export default { .button { padding: 10px; margin: 3px; - background: #05353b; + background: #014656; transition: 0.3s; user-select: none; cursor: pointer; } .valid { - background: #05353b; + background: #014656; } .valid:hover{ - background: #0f292c; + background: #02303c; } .warning { background: rgba(255, 27, 27, 0.589) diff --git a/src/components/app/Popouts/Popouts/uploadDialog.vue b/src/components/app/Popouts/Popouts/uploadDialog.vue index 373c367..1e0c203 100644 --- a/src/components/app/Popouts/Popouts/uploadDialog.vue +++ b/src/components/app/Popouts/Popouts/uploadDialog.vue @@ -198,7 +198,7 @@ export default { diff --git a/src/components/app/ServerTemplate/ChannelTemplate.vue b/src/components/app/ServerTemplate/ChannelTemplate.vue index 3fac2e7..8e97286 100644 --- a/src/components/app/ServerTemplate/ChannelTemplate.vue +++ b/src/components/app/ServerTemplate/ChannelTemplate.vue @@ -70,12 +70,14 @@ export default { overflow: hidden; padding-right: 10px; padding-left: 10px; + margin: 5px; + border-radius: 4px; } .channel:hover { - background: #08616b; + background: #053c4c; } .channel.selected { - background: #064c55; + background: #053240; } .channel-name { diff --git a/src/components/app/ServerTemplate/ServerTemplate.vue b/src/components/app/ServerTemplate/ServerTemplate.vue index 2f1cdd7..7cbc438 100644 --- a/src/components/app/ServerTemplate/ServerTemplate.vue +++ b/src/components/app/ServerTemplate/ServerTemplate.vue @@ -9,6 +9,7 @@ >
@@ -85,8 +86,8 @@ export default { z-index: 1; display: flex; align-self: center; - width: 60px; - height: 60px; + width: 70px; + height: 70px; flex-shrink: 0; justify-content: center; align-content: center; @@ -94,14 +95,25 @@ export default { user-select: none; transition: background 0.2s; cursor: pointer; - &:hover { - background: #074447; + &:hover::before { + content: ""; + position: absolute; + top: 15px; + bottom: 15px; + left: 0; + width: 3px; + background: #ffffff5e; } - &.selected { - background: #042a2b; + &.selected::before { + content: ""; + position: absolute; + top: 10px; + bottom: 10px; + left: 0; + width: 3px; + background: #ffffffc5; } } - .notifyAnimation:before { content: "!"; color: white; diff --git a/src/components/app/SimpleMarkdown.vue b/src/components/app/SimpleMarkdown.vue index ed4e532..056da8e 100644 --- a/src/components/app/SimpleMarkdown.vue +++ b/src/components/app/SimpleMarkdown.vue @@ -26,7 +26,7 @@ } .codeblock { - background-color: #233538; + background-color: #ffffff1a; padding: 5px; word-wrap: break-word; word-break: break-word; diff --git a/src/components/app/Tabs/DirectMessage.vue b/src/components/app/Tabs/DirectMessage.vue index 2a8d6a1..339c21f 100644 --- a/src/components/app/Tabs/DirectMessage.vue +++ b/src/components/app/Tabs/DirectMessage.vue @@ -1,5 +1,5 @@