diff --git a/src/App.vue b/src/App.vue index acff291..8e398a0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -72,7 +72,7 @@ export default { .content { @include tablet-min{ width: calc(100% - 95px); - padding-top: $header-size; + margin-top: $header-size; margin-left: 95px; position: relative; } @@ -80,24 +80,30 @@ export default { diff --git a/src/components/LandingBanner.vue b/src/components/LandingBanner.vue index 682d986..d4920ef 100644 --- a/src/components/LandingBanner.vue +++ b/src/components/LandingBanner.vue @@ -43,7 +43,7 @@ header { background-repeat: no-repeat; background-position: 50% 50%; position: relative; - background-color: $c-dark; + @include tablet-min { height: 284px; } @@ -54,7 +54,7 @@ header { left: 0; width: 100%; height: 100%; - background: rgba($c-light, 0.7); + background: $background-70; } .container { @@ -67,7 +67,7 @@ header { font-size: 22px; text-transform: uppercase; letter-spacing: 0.5px; - color: $c-dark; + color: $text-color; margin: 0; @include tablet-min{ font-size: 28px; @@ -78,35 +78,11 @@ header { display: block; font-size: 14px; font-weight: 300; - color: $c-dark; + color: $text-color-70; margin: 5px 0; @include tablet-min{ font-size: 16px; } } - - .link { - text-decoration: none; - color: $c-dark; - font-size: 13px; - font-weight: 300; - opacity: 0.7; - transition: opacity 0.5s ease; - &:hover { - opacity: 1; - } - span { - display: inline-block; - vertical-align: middle; - } - &-icon { - display: inline-block; - vertical-align: middle; - margin-right: 2px; - width: 16px; - height: 15px; - fill: $c-dark; - } - } } \ No newline at end of file diff --git a/src/components/Movie.vue b/src/components/Movie.vue index c517921..90fd550 100644 --- a/src/components/Movie.vue +++ b/src/components/Movie.vue @@ -231,6 +231,9 @@ export default { @include tablet-min{ flex-direction: row; } + + background-color: $background-color; + color: $text-color; } } &__header { @@ -243,7 +246,7 @@ export default { background-size: cover; background-repeat: no-repeat; background-position: 50% 50%; - background-color: $c-dark; + background-color: $background-color; @include tablet-min { height: 350px; } @@ -256,7 +259,7 @@ export default { z-index: 0; width: 100%; height: 100%; - background: rgba($c-dark, 0.85); + background: $background-dark-85; } &.compact { height: 100px; @@ -266,7 +269,7 @@ export default { &__poster { display: none; @include tablet-min { - background: $c-white; + background: $background-color; height: 0; display: block; position: absolute; @@ -293,7 +296,7 @@ export default { &__title { position: relative; padding: 20px; - color: $c-green; + color: $green; text-align: center; width: 100%; @include tablet-min { @@ -310,16 +313,8 @@ export default { font-size: 30px; } } - span { - display: block; - font-size: 14px; - font-weight: 300; - color: rgba($c-white, 0.7); - margin-top: 10px; - } } &__main { - background: $c-light; min-height: calc(100vh - 250px); @include tablet-min { min-height: 0; @@ -329,64 +324,16 @@ export default { } &__actions { text-align: center; - // min-height: 394px; width: 100%; order: 2; padding: 20px; - border-top: 1px solid rgba($c-dark, 0.05); + border-top: 1px solid $text-color-5; @include tablet-min { order: 1; width: 45%; padding: 185px 0 40px 40px; border-top: 0; } - &-link { - display: flex; - align-items: center; - text-decoration: none; - text-transform: uppercase; - color: rgba($c-dark, 0.5); - transition: color 0.5s ease; - font-size: 11px; - padding: 5px 0; - border-bottom: 1px solid rgba($c-dark, 0.05); - &:hover { - color: rgba($c-dark, 0.75); - } - &.active { - color: $c-dark; - } - &.pending { - color: #f8bd2d; - } - } - &-icon { - width: 18px; - height: 18px; - margin: 0 10px 0 0; - fill: rgba($c-dark, 0.5); - transition: fill 0.5s ease, transform 0.5s ease; - &.waiting { - transform: scale(0.8, 0.8); - } - &.pending { - fill: #f8bd2d; - } - } - &-link:hover &-icon { - fill: rgba($c-dark, 0.75); - cursor: pointer; - } - &-link.active &-icon { - fill: $c-green; - } - &-text { - display: block; - padding-top: 2px; - cursor: pointer; - margin:4.4px; - margin-left: -3px; - } } &__info { width: 100%; @@ -399,7 +346,7 @@ export default { margin-left: 45%; } } - &__actions + &__info { + &__info { margin-left: 0; } &__description { @@ -429,7 +376,7 @@ export default { font-weight: 400; text-transform: uppercase; font-size: 14px; - color: $c-green; + color: $green; @include tablet-min { font-size: 16px; } @@ -456,7 +403,7 @@ export default { text-transform: uppercase; text-align: center; font-size: 14px; - color: $c-green; + color: $green; padding-bottom: 20px; @include tablet-min { font-size: 16px; diff --git a/src/components/MoviePopup.vue b/src/components/MoviePopup.vue index eacce46..52ac5b7 100644 --- a/src/components/MoviePopup.vue +++ b/src/components/MoviePopup.vue @@ -36,7 +36,7 @@ export default { z-index: 20; width: 100%; height: 100vh; - background: rgba($c-dark, 0.93); + background: rgba($dark, 0.93); -webkit-overflow-scrolling: touch; overflow: auto; &__box{ @@ -44,7 +44,7 @@ export default { max-width: 768px; position: relative; z-index: 5; - background: $c-dark; + background: $background-color-secondary; padding-bottom: 50px; @include tablet-min{ padding-bottom: 0; @@ -71,7 +71,7 @@ export default { left: 10px; width: 20px; height: 2px; - background: $c-white; + background: $white; } &:before{ transform: rotate(45deg); @@ -80,7 +80,7 @@ export default { transform: rotate(-45deg); } &:hover{ - background: $c-green; + background: $green; } } } diff --git a/src/components/MoviesList.vue b/src/components/MoviesList.vue index fc718f0..9f5425d 100644 --- a/src/components/MoviesList.vue +++ b/src/components/MoviesList.vue @@ -226,103 +226,161 @@ export default { } diff --git a/src/components/MoviesListItem.vue b/src/components/MoviesListItem.vue index aa520fd..9ae79c4 100644 --- a/src/components/MoviesListItem.vue +++ b/src/components/MoviesListItem.vue @@ -49,50 +49,28 @@ export default { .movies-item { padding: 10px; width: 50%; + background-color: $background-color; @include tablet-min{ padding: 15px; } @include tablet-landscape-min{ - padding: 20px; + padding: 15px; width: 25%; } @include desktop-min{ - padding: 30px; + padding: 15px; width: 20%; } @include desktop-lg-min{ padding: 20px; - width: 16.5%; - } - - &.shortList { - display: none; - - &:nth-child(-n+6) { // show first 6 - display: block; - } - - @include tablet-landscape-min{ - &:nth-child(-n+8) { // show first 8 - display: block; - } - } - @include desktop-min{ - &:nth-child(-n+10) { // show first 10 - display: block; - } - } - - @include desktop-lg-min{ - display: block; // show all - } + width: 12.5%; } &__link{ text-decoration: none; - color: rgba($c-dark, 0.5); + color: $text-color-70; font-weight: 300; } &__content{ @@ -101,7 +79,6 @@ export default { &__poster{ transition: transform 0.5s ease, box-shadow 0.3s ease; transform: translateZ(0); - background: $c-white; } &__img{ width: 100%; @@ -115,13 +92,14 @@ export default { } &__link:not(.no-image):hover &__poster{ transform: scale(1.03); - box-shadow: 0 0 10px rgba($c-dark, 0.1); + box-shadow: 0 0 10px rgba($dark, 0.1); } &__title{ margin: 0; font-size: 11px; letter-spacing: 0.5px; transition: color 0.5s ease; + cursor: pointer; @include mobile-ls-min{ font-size: 12px; } @@ -130,7 +108,7 @@ export default { } } &__link:hover &__title{ - color: $c-dark; + color: $text-color; } } diff --git a/src/components/Navigation.vue b/src/components/Navigation.vue index a498b26..07f015b 100644 --- a/src/components/Navigation.vue +++ b/src/components/Navigation.vue @@ -75,10 +75,16 @@ export default { diff --git a/src/components/SearchInput.vue b/src/components/SearchInput.vue index e3d8afd..dc0b34e 100644 --- a/src/components/SearchInput.vue +++ b/src/components/SearchInput.vue @@ -15,7 +15,7 @@ @keydown.up="navigateUp" @keydown.down="navigateDown" /> - + @@ -179,7 +179,7 @@ export default { z-index: 5; min-height: $header-size; right: 0px; - background-color: white; + background-color: $background-color-secondary; @include mobile-only { position: fixed; @@ -209,47 +209,45 @@ export default { cursor: pointer; border-bottom: 2px solid transparent; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + color: $text-color-50; &.active, &:hover, &:active { - color: $c-dark; - border-bottom: 2px solid black; + color: $text-color; + border-bottom: 2px solid $text-color; } } } } .search { - height: $header-size-mobile; + height: $header-size; display: flex; position: fixed; flex-wrap: wrap; z-index: 5; + background-color: $background-color-secondary; // TODO check if this is for mobile width: calc(100% - 110px); - // width: 100%; top: 0; right: 55px; @include tablet-min{ position: relative; - height: $header-size; width: 100%; right: 0px; } input { - // height: 75px; display: block; width: 100%; padding: 13px 20px 13px 45px; outline: none; border: 0; background-color: transparent; - color: $c-dark; font-weight: 300; font-size: 19px; @@ -261,7 +259,7 @@ export default { &--icon{ width: 20px; height: 20px; - fill: rgba($c-dark, 0.5); + fill: $text-color-50; transition: fill 0.5s ease; pointer-events: none; position: absolute; diff --git a/src/components/Settings.vue b/src/components/Settings.vue index d03a20f..6da4694 100644 --- a/src/components/Settings.vue +++ b/src/components/Settings.vue @@ -128,7 +128,7 @@ a { &__header { margin: 0; line-height: 16px; - color: $c-dark; + color: $text-color; font-weight: 300; margin-bottom: 20px; text-transform: uppercase; diff --git a/src/components/Signin.vue b/src/components/Signin.vue index 66859f6..9bcfabb 100644 --- a/src/components/Signin.vue +++ b/src/components/Signin.vue @@ -110,49 +110,27 @@ export default { diff --git a/src/components/TorrentList.vue b/src/components/TorrentList.vue index a3729b3..d682f30 100644 --- a/src/components/TorrentList.vue +++ b/src/components/TorrentList.vue @@ -58,7 +58,7 @@
Edit search query
@@ -276,15 +276,15 @@ export default { } - diff --git a/src/components/ui/SeasonedInput.vue b/src/components/ui/SeasonedInput.vue index 46b48eb..c04c195 100644 --- a/src/components/ui/SeasonedInput.vue +++ b/src/components/ui/SeasonedInput.vue @@ -46,20 +46,20 @@ export default { &:hover, &:focus { .group__input { - border-color: $c-dark; + border-color: $text-color; &-icon { - fill: $c-dark; + fill: $text-color; } } } &.completed { .group__input { - border-color: $c-dark; + border-color: $text-color; &-icon { - fill: $c-dark; + fill: $text-color; } } } @@ -70,12 +70,13 @@ export default { padding: 10px 10px 10px 45px; // padding: 15px 10px 15px 45px; outline: none; - background-color: $c-white; - color: $c-dark; + background-color: $background-color-secondary; + color: $text-color; font-weight: 100; font-size: 1.2rem; - border: 1px solid rgba($c-dark, 0.5); - margin-left: -2.2rem; + border: 1px solid $text-color-50; + margin: 0; + margin-left: -2.2rem !important; // margin-bottom: 1rem; z-index: 3; transition: border-color .5s ease; @@ -91,14 +92,14 @@ export default { height: 100%; font-size: 0.9rem; cursor: pointer; - color: rgba($c-dark, 0.5); + color: $text-color-50; } } &__input-icon { width: 24px; height: 24px; - fill: rgba($c-dark, 0.5); + fill: $text-color-50; transition: fill 0.5s ease; pointer-events: none; margin-top: 10px; diff --git a/src/components/ui/sidebarListElem.vue b/src/components/ui/sidebarListElem.vue index 6f2ef15..de69e41 100644 --- a/src/components/ui/sidebarListElem.vue +++ b/src/components/ui/sidebarListElem.vue @@ -63,12 +63,6 @@ export default { activeClassIfActive() { return this.active ? 'active' : '' } - // torrentResults() { - // return this.text.toLowerCase().includes('torrents') - // }, - // getTorrentResultCount() { - // return store.getters['torrentModule/resultCount'] - // } } } @@ -82,18 +76,18 @@ li { align-items: center; text-decoration: none; text-transform: uppercase; - color: rgba($c-dark, 0.5); + color: $text-color-50; transition: color 0.5s ease; font-size: 11px; padding: 10px 0; - border-bottom: 1px solid rgba($c-dark, 0.05); + border-bottom: 1px solid $text-color-5; &:hover { - color: rgba($c-dark, 0.80); + color: $text-color-70; cursor: pointer; } .active { - color: $c-dark; + color: $text-color; } .pending { color: #f8bd2d; @@ -108,7 +102,7 @@ li { width: 18px; height: 18px; margin: 0 7px 0 0; - fill: rgba($c-dark, 0.5); + fill: $text-color-50; transition: fill 0.5s ease, transform 0.5s ease; &.waiting { transform: scale(0.8, 0.8); @@ -117,15 +111,11 @@ li { fill: #f8bd2d; } &:hover &-icon { - fill: rgba($c-dark, 0.75); + fill: $text-color-70; cursor: pointer; } - &.active { - color: $c-green; - - > svg { - fill: $c-green; - } + &.active > svg { + fill: $green; } } } diff --git a/src/scss/elements.scss b/src/scss/elements.scss index 591a478..e15e36c 100644 --- a/src/scss/elements.scss +++ b/src/scss/elements.scss @@ -2,21 +2,18 @@ @import "./src/scss/media-queries"; .filter { - // margin: 10px 10px 20px; margin: 1rem; padding: 0; overflow: auto; list-style: none; border: 1px solid; border-radius: 2px; - // overflow: hidden; display: flex; transition: color .2s ease; - // justify-content: space-evenly; &-item { padding: 6px 15px; - background-color: $c-white; + background-color: $background-color-secondary; transition: color 0.2s ease; font-size: 13px; font-weight: 200; @@ -24,16 +21,17 @@ text-align: center; width: 100%; white-space:nowrap; - // overflow: hidden; + &:nth-child(n+2) { border-left: solid 1px; } &.active, &:hover { border-color: transparent; - background-color: #091c24; - color: $c-green; + background-color: $teal; + color: $green; cursor: pointer; } + @include tablet-min { font-size: 16px; } diff --git a/src/scss/variables.scss b/src/scss/variables.scss index 81fd715..e4a6f0e 100644 --- a/src/scss/variables.scss +++ b/src/scss/variables.scss @@ -1,12 +1,127 @@ // Colors -$c-green: #01d277; -$c-dark: #081c24; -$c-white: #ffffff; -$c-light: #f8f8f8; -$c-green-light: #dff0d9; -$c-green-dark: #3e7549; -$c-red-light: #f2dede; -$c-red-dark: #b75b91; +// @import "./media-queries"; +@import "./src/scss/media-queries"; -$header-size: 75px; -$header-size-mobile: 50px; \ No newline at end of file +:root { + color-scheme: light; + --text-color: #081c24; + --text-color-70: rgba(8, 28, 36, 0.7); + --text-color-50: rgba(8, 28, 36, 0.5); + --text-color-5: rgba(8, 28, 36, 0.05); + --text-color-secondary: orange; + --background-color: #f8f8f8; + --background-color-secondary: #ffffff; + --background-95: rgba(255, 255, 255, 0.95); + --background-70: rgba(255, 255, 255, 0.7); + --background-40: rgba(255, 255, 255, 0.4); + --background-nav-logo: #081c24; + + --color-green: #01d277; + --color-teal: #091c24; + --color-black: #081c24; + --white: #fff; + --white-70: rgba(255,255,255,0.7); + + --color-warning: #fff5cd; + --color-warning-text: #081c24; + --color-warning-light: rgb(255, 203, 5); + --color-success: rgba(0, 100, 66, 0.8); + --color-success-text: #fff; + --color-success-highlight: rgb(0, 100, 66); + --color-error: rgba(220, 48, 35, 0.8); + --color-error-highlight: #DC3023; + --color-error-text: #fff; + + --header-size: 75px; +} + +@media (prefers-color-scheme: dark) { + :root { + color-scheme: light dark; + --text-color: #fff; + --text-color-70: rgba(255, 255, 255, 0.7); + --text-color-50: rgba(255, 255, 255, 0.5); + --text-color-5: rgba(255, 255, 255, 0.05); + --text-color-secondary: orange; + --background-color: #1e1f22; + --background-color-secondary: #111111; + --background-95: rgba(30, 31, 34, 0.95); + --background-70: rgba(30, 31, 34, 0.8); + --background-40: rgba(30, 31, 34, 0.4); + --color-teal: #091c24; + } +} + +@include mobile-only { + :root { + --header-size: 50px; + } +} + +$header-size: var(--header-size); + +$dark: rgb(30, 31, 34); +$green: var(--color-green); +$teal: #091c24; +$black: #081c24; +$black-80: rgba(0,0,0,0.8); +$white: #fff; +$white-80: rgba(255,255,255,0.8); + +$text-color: var(--text-color) !default; +$text-color-70: var(--text-color-70) !default; +$text-color-50: var(--text-color-50) !default; +$text-color-5: var(--text-color-5) !default; +$text-color-secondary: var(--text-color-secondary) !default; +$background-color: var(--background-color) !default; +$background-color-secondary: var(--background-color-secondary) !default; +$background-95: var(--background-95) !default; +$background-70: var(--background-70) !default; +$background-40: var(--background-40) !default; +$background-dark-85: rgba($dark, 0.85) !default; +$background-nav-logo: var(--background-nav-logo) !default; +$color-warning: var(--color-warning) !default; +$color-warning-text: var(--color-warning-text) !default; +$color-warning-light: var(--color-warning-light) !default; +$color-success: var(--color-success) !default; +$color-success-highlight: var(--color-success-highlight) !default; +$color-error: var(--color-error) !default; +$color-error-highlight: var(--color-error-highlight) !default; +$color-error-text: var(--color-error-text) !default; +$color-error-light: var(--color-error) !default; + +.halloween { + --text-color: #6a318c; + --text-color-secondary: #fb5a33; + --background-color: #80c350; + --background-color-secondary: #ff9234; +} + +.dark { + --text-color: #fff; + --text-color-70: rgba(255, 255, 255, 0.7); + --text-color-50: rgba(255, 255, 255, 0.5); + --text-color-5: rgba(255, 255, 255, 0.05); + --text-color-secondary: orange; + --background-color: #1e1f22; + --background-color-secondary: #111111; + --background-95: rgba(30, 31, 34, 0.95); + --background-70: rgba(30, 31, 34, 0.7); + --color-teal: #091c24; +} + +.light { + --text-color: #081c24; + --text-color-70: rgba(8, 28, 36, 0.7); + --text-color-50: rgba(8, 28, 36, 0.5); + --text-color-5: rgba(8, 28, 36, 0.05); + --text-color-inverted: #fff; + --text-color-secondary: orange; + --background-color: #f8f8f8; + --background-color-secondary: #ffffff; + --background-95: rgba(255, 255, 255, 0.95); + --background-70: rgba(255, 255, 255, 0.7); + --background-nav-logo: #081c24; + --color-green: #01d277; + --color-teal: #091c24; +}