diff --git a/.stylelintrc b/.stylelintrc index 594153814..d981fe782 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -2,6 +2,9 @@ "extends": "stylelint-config-standard", "rules": { "indentation": 4, - "no-descending-specificity": null + "no-descending-specificity": null, + "selector-list-comma-newline-after": null, + "declaration-empty-line-before": null, + "no-duplicate-selectors": null } } diff --git a/package.json b/package.json index 8218000ce..2d20c4094 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "scripts": { "lint:js": "eslint --ext \".js,.vue\" --ignore-path .gitignore .", - "lint:style": "stylelint \"**/*.{vue,css}\" --ignore-path .gitignore", + "lint:style": "stylelint \"**/*.{vue,css,scss}\" --ignore-path .gitignore", "lint": "npm run lint:js && npm run lint:style", "dev": "vite --host", "start": "npm run start-server", diff --git a/src/assets/app.scss b/src/assets/app.scss index 0362a8a3c..715e67517 100644 --- a/src/assets/app.scss +++ b/src/assets/app.scss @@ -2,7 +2,7 @@ @import "node_modules/bootstrap/scss/bootstrap"; #app { - font-family: ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,segoe ui,Roboto,helvetica neue,Arial,noto sans,sans-serif,apple color emoji,segoe ui emoji,segoe ui symbol,noto color emoji; + font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, segoe ui, Roboto, helvetica neue, Arial, noto sans, sans-serif, apple color emoji, segoe ui emoji, segoe ui symbol, noto color emoji; } h1 { @@ -18,7 +18,7 @@ h2 { } ::-webkit-scrollbar-thumb { - background: #CCC; + background: #ccc; border-radius: 20px; } @@ -28,7 +28,7 @@ h2 { .modal-content { border-radius: 1rem; - box-shadow: 0 15px 70px rgba(0, 0, 0, .1); + box-shadow: 0 15px 70px rgba(0, 0, 0, 0.1); .dark & { box-shadow: 0 15px 70px rgb(0 0 0); @@ -41,10 +41,9 @@ h2 { text-align: center; } - .shadow-box { //overflow: hidden; // Forget why add this, but multiple select hide by this - box-shadow: 0 15px 70px rgba(0, 0, 0, .1); + box-shadow: 0 15px 70px rgba(0, 0, 0, 0.1); padding: 10px; border-radius: 10px; @@ -81,7 +80,6 @@ h2 { } @media (max-width: 550px) { - .table-shadow-box { padding: 10px !important; @@ -89,7 +87,7 @@ h2 { display: none; } - tbody { + tbody { .shadow-box { background-color: white; } @@ -126,12 +124,11 @@ h2 { } } } - } // Dark Theme override here .dark { - background-color: #090C10; + background-color: #090c10; color: $dark-font-color; &::-webkit-scrollbar-thumb { @@ -173,7 +170,7 @@ h2 { } .table-hover > tbody > tr:hover { - --bs-table-accent-bg: #070A10; + --bs-table-accent-bg: #070a10; color: $dark-font-color; } @@ -263,11 +260,13 @@ h2 { // page-change .slide-fade-enter-active { - transition: all 0.20s $easing-in; + transition: all 0.2s $easing-in; } + .slide-fade-leave-active { - transition: all 0.20s $easing-in; + transition: all 0.2s $easing-in; } + .slide-fade-enter-from, .slide-fade-leave-to { transform: translateY(50px); diff --git a/src/assets/vars.scss b/src/assets/vars.scss index 58ad677c8..9d487eb26 100644 --- a/src/assets/vars.scss +++ b/src/assets/vars.scss @@ -1,5 +1,5 @@ -$primary: #5CDD8B; -$danger: #DC3545; +$primary: #5cdd8b; +$danger: #dc3545; $warning: #f8a306; $link-color: #111; $border-radius: 50rem; @@ -9,10 +9,10 @@ $highlight-white: #e7faec; $dark-font-color: #b1b8c0; $dark-font-color2: #020b05; -$dark-bg: #0D1117; -$dark-bg2: #070A10; +$dark-bg: #0d1117; +$dark-bg2: #070a10; $dark-border-color: #1d2634; -$easing-in: cubic-bezier(0.54,0.78,0.55,0.97); +$easing-in: cubic-bezier(0.54, 0.78, 0.55, 0.97); $easing-out: cubic-bezier(0.25, 0.46, 0.45, 0.94); $easing-in-out: cubic-bezier(0.79, 0.14, 0.15, 0.86); diff --git a/src/components/HeartbeatBar.vue b/src/components/HeartbeatBar.vue index 857fc68cc..1f403dd27 100644 --- a/src/components/HeartbeatBar.vue +++ b/src/components/HeartbeatBar.vue @@ -186,7 +186,7 @@ export default { } .dark { - .hp-bar-big .beat.empty{ + .hp-bar-big .beat.empty { background-color: #848484; } } diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue index e1aa47cf6..43b56b2f1 100644 --- a/src/components/NotificationDialog.vue +++ b/src/components/NotificationDialog.vue @@ -210,7 +210,7 @@