diff --git a/.eslintrc.json b/.eslintrc.json index e0da5df..d348401 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -8,7 +8,6 @@ "plugin:vue/recommended", "plugin:@typescript-eslint/recommended" ], - "overrides": [], "globals": { "useCookie": true, "$fetch": true, @@ -56,7 +55,8 @@ "files": ["*.vue"], "rules": { "vue/multi-word-component-names": "off", - "vue/attribute-hyphenation": "off" + "vue/attribute-hyphenation": "off", + "vue/html-self-closing": "off" } } ] diff --git a/assets/css/main.css b/assets/css/main.css index 81c9ead..328813f 100755 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -3,23 +3,58 @@ @tailwind utilities; :root { - --background-color: hsl(230,28%,7.3%); - --foreground-color: hsl(230,26%,13%); - --primary-accent: hsl(180,55%,45%); - --message-input-color: hsl(228,27.3%,25%); - --primary-placeholder: hsl(218,11%,65%); - - - --primary-dark: hsl(225, 7.7%, 10.2%); /* dropdown and emoji picker bg */ - --primary-700: hsl(230,31.2%,6.3%); /* code block border */ - --primary-600: hsl(220, 6.8%, 17.3%); /* modal bg */ - --primary-500: hsl(230,28.7%,9.8%); /* reaction button bg, code block, and inline code bg */ - --primary-400: hsl(230, 12%, 19.2%); /* action buttons */ - --primary-300: hsl(230,26%,15%); /* nav button bg */ - --primary-200: hsl(230,26%,21.3%); /* nav button hover bg */ - --primary-text: hsl(216, 3.7%, 73.5%); /* main text color (duh) */ - --reaction-border: hsl(230,33.4%,18.7%); /* reaction border on hover */ - --reaction-hover: hsl(230,31.2%,12.5%); /* reaction bg on hover */ - --invite-members: var(--primary-accent); /* color of dot next to server members count on invites */ + --primary-bg: hsl(240, 5%, 4%); + --secondary-bg: hsl(240, 9%, 7%); + --tertiary-bg: hsl(240, 13%, 10%); + --tertiary-lightened-bg: hsl(240, 13%, 16%); + --primary-input: hsl(240, 8%, 12%); + --primary-accent: hsl(342, 75%, 55%); + --primary-text: hsl(0, 0%, 97%); + --primary-placeholder: hsl(0, 0%, 80%); + --reaction-hover-border: hsl(230, 33.4%, 18.7%); + --reaction-hover: hsl(230, 31.2%, 12.5%); + --reaction-active-border: rgb(88,101,242); --primary-danger: hsl(359, 66.7%, 54.1%); + + /* + --background-color: hsl(230, 28%, 7.3%); + --foreground-color: hsl(230, 26%, 13%); + --primary-accent: hsl(180, 55%, 45%); + --message-input-color: hsl(228, 27.3%, 25%); + --primary-placeholder: hsl(218, 11%, 65%); + + + --primary-dark: hsl(225, 7.7%, 10.2%); + /* dropdown and emoji picker bg + --primary-700: hsl(230, 31.2%, 6.3%); + /* code block border + --primary-600: hsl(220, 6.8%, 17.3%); + /* modal bg + --primary-500: hsl(230, 28.7%, 9.8%); + /* reaction button bg, code block, and inline code bg + --primary-400: hsl(230, 12%, 19.2%); + /* action buttons + --primary-300: hsl(230, 26%, 15%); + /* nav button bg + --primary-200: hsl(230, 26%, 21.3%); + /* nav button hover bg + --primary-text: hsl(216, 3.7%, 73.5%); + /* main text color (duh) + --reaction-border: hsl(230, 33.4%, 18.7%); + /* reaction border on hover + --reaction-hover: hsl(230, 31.2%, 12.5%); + /* reaction bg on hover + --invite-members: var(--primary-accent); + /* color of dot next to server members count on invites + --primary-danger: hsl(359, 66.7%, 54.1%); + */ +} + +* { + color: var(--primary-text); + scrollbar-width: none; +} + +*::-webkit-scrollbar { + display: none; } \ No newline at end of file diff --git a/components/DropdownMenu.vue b/components/DropdownMenu.vue index 66b9414..eea1eb3 100755 --- a/components/DropdownMenu.vue +++ b/components/DropdownMenu.vue @@ -3,7 +3,7 @@
You've been invited to join a server @@ -8,13 +8,13 @@