diff --git a/client/src/sass/base/_animations.scss b/client/src/sass/base/_animations.scss index fa3e6d6a..5cfd80c8 100644 --- a/client/src/sass/base/_animations.scss +++ b/client/src/sass/base/_animations.scss @@ -1,5 +1,4 @@ @keyframes fade-in { - 0% { opacity: 0; } @@ -7,11 +6,9 @@ 100% { opacity: 1; } - } @keyframes fade-out { - 0% { opacity: 1; } @@ -19,5 +16,4 @@ 100% { opacity: 0; } - } diff --git a/client/src/sass/base/_font-families.scss b/client/src/sass/base/_font-families.scss index 385d7aa1..dcdd0426 100644 --- a/client/src/sass/base/_font-families.scss +++ b/client/src/sass/base/_font-families.scss @@ -3,10 +3,8 @@ font-weight: 400; font-style: normal; src: url('../fonts/Roboto-regular/Roboto-regular.eot'); - src: url('../fonts/Roboto-regular/Roboto-regular.eot?#iefix') format('embedded-opentype'), - local('Roboto'), - local('Roboto-regular'), - url('../fonts/Roboto-regular/Roboto-regular.woff2') format('woff2'), + src: url('../fonts/Roboto-regular/Roboto-regular.eot?#iefix') format('embedded-opentype'), local('Roboto'), + local('Roboto-regular'), url('../fonts/Roboto-regular/Roboto-regular.woff2') format('woff2'), url('../fonts/Roboto-regular/Roboto-regular.woff') format('woff'), url('../fonts/Roboto-regular/Roboto-regular.ttf') format('truetype'), url('../fonts/Roboto-regular/Roboto-regular.svg#Roboto') format('svg'); @@ -17,10 +15,8 @@ font-weight: 500; font-style: normal; src: url('../fonts/Roboto-500/Roboto-500.eot'); - src: url('../fonts/Roboto-500/Roboto-500.eot?#iefix') format('embedded-opentype'), - local('Roboto Medium'), - local('Roboto-500'), - url('../fonts/Roboto-500/Roboto-500.woff2') format('woff2'), + src: url('../fonts/Roboto-500/Roboto-500.eot?#iefix') format('embedded-opentype'), local('Roboto Medium'), + local('Roboto-500'), url('../fonts/Roboto-500/Roboto-500.woff2') format('woff2'), url('../fonts/Roboto-500/Roboto-500.woff') format('woff'), url('../fonts/Roboto-500/Roboto-500.ttf') format('truetype'), url('../fonts/Roboto-500/Roboto-500.svg#Roboto') format('svg'); @@ -31,10 +27,8 @@ font-weight: 700; font-style: normal; src: url('../fonts/Roboto-700/Roboto-700.eot'); - src: url('../fonts/Roboto-700/Roboto-700.eot?#iefix') format('embedded-opentype'), - local('Roboto Bold'), - local('Roboto-700'), - url('../fonts/Roboto-700/Roboto-700.woff2') format('woff2'), + src: url('../fonts/Roboto-700/Roboto-700.eot?#iefix') format('embedded-opentype'), local('Roboto Bold'), + local('Roboto-700'), url('../fonts/Roboto-700/Roboto-700.woff2') format('woff2'), url('../fonts/Roboto-700/Roboto-700.woff') format('woff'), url('../fonts/Roboto-700/Roboto-700.ttf') format('truetype'), url('../fonts/Roboto-700/Roboto-700.svg#Roboto') format('svg'); @@ -45,10 +39,8 @@ font-weight: 400; font-style: italic; src: url('../fonts/Roboto-italic/Roboto-italic.eot'); - src: url('../fonts/Roboto-italic/Roboto-italic.eot?#iefix') format('embedded-opentype'), - local('Roboto Italic'), - local('Roboto-italic'), - url('../fonts/Roboto-italic/Roboto-italic.woff2') format('woff2'), + src: url('../fonts/Roboto-italic/Roboto-italic.eot?#iefix') format('embedded-opentype'), local('Roboto Italic'), + local('Roboto-italic'), url('../fonts/Roboto-italic/Roboto-italic.woff2') format('woff2'), url('../fonts/Roboto-italic/Roboto-italic.woff') format('woff'), url('../fonts/Roboto-italic/Roboto-italic.ttf') format('truetype'), url('../fonts/Roboto-italic/Roboto-italic.svg#Roboto') format('svg'); @@ -60,8 +52,7 @@ font-style: italic; src: url('../fonts/Roboto-700italic/Roboto-700italic.eot'); src: url('../fonts/Roboto-700italic/Roboto-700italic.eot?#iefix') format('embedded-opentype'), - local('Roboto Bold Italic'), - local('Roboto-700italic'), + local('Roboto Bold Italic'), local('Roboto-700italic'), url('../fonts/Roboto-700italic/Roboto-700italic.woff2') format('woff2'), url('../fonts/Roboto-700italic/Roboto-700italic.woff') format('woff'), url('../fonts/Roboto-700italic/Roboto-700italic.ttf') format('truetype'), diff --git a/client/src/sass/base/_layout.scss b/client/src/sass/base/_layout.scss index b16ddaf8..769976df 100644 --- a/client/src/sass/base/_layout.scss +++ b/client/src/sass/base/_layout.scss @@ -17,7 +17,6 @@ body { } .application { - &, &__view { align-content: center; diff --git a/client/src/sass/base/_typography.scss b/client/src/sass/base/_typography.scss index dfcc7952..b245960f 100644 --- a/client/src/sass/base/_typography.scss +++ b/client/src/sass/base/_typography.scss @@ -24,7 +24,7 @@ h1, h2, h3, h4, -h5 +h5, h6, .h1, .h2, @@ -104,10 +104,9 @@ p { } .copy { - &--lead { font-size: $font-size--medium; line-height: 1.5rem; font-weight: 300; } -} \ No newline at end of file +} diff --git a/client/src/sass/components/_action-bar.scss b/client/src/sass/components/_action-bar.scss index ed4fecba..6dbb6a13 100644 --- a/client/src/sass/components/_action-bar.scss +++ b/client/src/sass/components/_action-bar.scss @@ -24,7 +24,6 @@ $torrent-list--border: rgba($sidebar--background, 0.15); } &__item { - &:first-child { text-align: left; } @@ -97,9 +96,7 @@ $torrent-list--border: rgba($sidebar--background, 0.15); } .action { - box-shadow: - 1px 0 transparent, - -1px 0 transparent; + box-shadow: 1px 0 transparent, -1px 0 transparent; cursor: pointer; display: inline-block; height: 60px; @@ -110,9 +107,7 @@ $torrent-list--border: rgba($sidebar--background, 0.15); &:hover { background: $action--background--hover; - box-shadow: - 1px 0 $action--border--hover, - -1px 0 $action--border--hover; + box-shadow: 1px 0 $action--border--hover, -1px 0 $action--border--hover; .icon { fill: $action--foreground--hover; diff --git a/client/src/sass/components/_client-stats.scss b/client/src/sass/components/_client-stats.scss index 1933deab..0813b836 100644 --- a/client/src/sass/components/_client-stats.scss +++ b/client/src/sass/components/_client-stats.scss @@ -5,11 +5,11 @@ $client-stats--speed--stroke--width: 2px; $client-stats--download--primary--foreground: #39ce83; $client-stats--download--secondary--foreground: rgba($client-stats--download--primary--foreground, 0.75); -$client-stats--download--graph--stroke: #39Ce83; +$client-stats--download--graph--stroke: #39ce83; $client-stats--download--graph--fill--top: #2bae6c; $client-stats--download--graph--fill--bottom: #2bae6c; -$client-stats--upload--primary--foreground: #349Cf4; +$client-stats--upload--primary--foreground: #349cf4; $client-stats--upload--secondary--foreground: rgba($client-stats--upload--primary--foreground, 0.75); $client-stats--upload--graph--stroke: #349cf4; $client-stats--upload--graph--fill--top: #2387d9; @@ -40,11 +40,8 @@ $client-stats--timestamp--foreground: #526780; color: $client-stats--download--primary--foreground; .client-stats { - &__rate { - &__data { - &--limit { background: $client-stats--download--primary--foreground; } @@ -61,11 +58,8 @@ $client-stats--timestamp--foreground: #526780; color: $client-stats--upload--primary--foreground; .client-stats { - &__rate { - &__data { - &--limit { background: $client-stats--upload--primary--foreground; } @@ -91,7 +85,6 @@ $client-stats--timestamp--foreground: #526780; } &__data { - &--secondary, &--timestamp { font-size: 0.8em; @@ -178,9 +171,7 @@ $client-stats--timestamp--foreground: #526780; } .graph { - &__gradient { - &--bottom { stop-opacity: $client-stats--speed--fill--bottom--opacity; diff --git a/client/src/sass/components/_connection-status.scss b/client/src/sass/components/_connection-status.scss index c48dbb30..ffc57492 100644 --- a/client/src/sass/components/_connection-status.scss +++ b/client/src/sass/components/_connection-status.scss @@ -13,4 +13,4 @@ color: $light-grey--lighter; font-size: 14px; } -} \ No newline at end of file +} diff --git a/client/src/sass/components/_dependency-list.scss b/client/src/sass/components/_dependency-list.scss index f846bc47..82d5ea21 100644 --- a/client/src/sass/components/_dependency-list.scss +++ b/client/src/sass/components/_dependency-list.scss @@ -28,9 +28,7 @@ opacity: 1; .dependency-list { - &__dependency { - &__icon { opacity: 1; } diff --git a/client/src/sass/components/_directory-tree.scss b/client/src/sass/components/_directory-tree.scss index 06ba7468..0d85dc43 100644 --- a/client/src/sass/components/_directory-tree.scss +++ b/client/src/sass/components/_directory-tree.scss @@ -14,18 +14,14 @@ $selection-toolbar--height: $spacing-unit * 1.5; min-height: 0; &--toolbar-visible { - .directory-tree { - &__selection-toolbar { transform: translateY(0); } } .modal__content { - &--nested-scroll { - &__content { margin-bottom: $selection-toolbar--height; } @@ -70,16 +66,13 @@ $selection-toolbar--height: $spacing-unit * 1.5; } .dropdown { - &__items { font-size: 1.1em; padding-bottom: 0; } &__trigger { - .dropdown { - &__button { padding-top: 5px; padding-bottom: 5px; @@ -99,7 +92,6 @@ $selection-toolbar--height: $spacing-unit * 1.5; text-overflow: ellipsis; .icon { - &--disk { height: 14px; margin-right: 8px; @@ -109,11 +101,8 @@ $selection-toolbar--height: $spacing-unit * 1.5; } .directory-tree { - &__checkbox { - .checkbox { - &__decoy { height: 18px; width: 18px; @@ -124,7 +113,6 @@ $selection-toolbar--height: $spacing-unit * 1.5; } &__tree { - .directory-tree__tree { padding-left: 0; } @@ -138,15 +126,10 @@ $selection-toolbar--height: $spacing-unit * 1.5; white-space: nowrap; &:hover > .file__label .directory-tree { - &__checkbox { - .directory-tree { - &__checkbox { - &__item { - &--icon { opacity: 0; } @@ -155,9 +138,7 @@ $selection-toolbar--height: $spacing-unit * 1.5; opacity: 1; .checkbox { - &__decoy { - &:after { opacity: 1; } @@ -171,15 +152,10 @@ $selection-toolbar--height: $spacing-unit * 1.5; } &--selected .directory-tree { - &__checkbox { - .directory-tree { - &__checkbox { - &__item { - &--icon { opacity: 0.75; } @@ -214,7 +190,6 @@ $selection-toolbar--height: $spacing-unit * 1.5; width: auto; .icon { - &--file { transition: fill 0.25s; } @@ -232,7 +207,6 @@ $selection-toolbar--height: $spacing-unit * 1.5; } &--priority { - .icon { height: auto; margin-right: 0; @@ -286,7 +260,6 @@ $selection-toolbar--height: $spacing-unit * 1.5; z-index: 2; .checkbox { - &__decoy { height: 16px; margin-right: 0; @@ -300,7 +273,6 @@ $selection-toolbar--height: $spacing-unit * 1.5; z-index: 1; .icon { - &.icon--folder { margin: -1px 0 0 1px; } @@ -310,11 +282,8 @@ $selection-toolbar--height: $spacing-unit * 1.5; } & > .directory-tree { - &__tree { - & > .directory-tree { - &__node { padding-left: 0; } @@ -323,7 +292,6 @@ $selection-toolbar--height: $spacing-unit * 1.5; } .icon { - &--file, &--folder { height: 14px; @@ -337,11 +305,8 @@ $selection-toolbar--height: $spacing-unit * 1.5; } .directory-tree { - &__node { - .file { - &__label { align-items: center; display: flex; diff --git a/client/src/sass/components/_dropdown.scss b/client/src/sass/components/_dropdown.scss index 183a076e..43f6f491 100644 --- a/client/src/sass/components/_dropdown.scss +++ b/client/src/sass/components/_dropdown.scss @@ -41,7 +41,8 @@ $dropdown--item--foreground--active: $menu--item--foreground--active; &__button { display: block; - padding: $dropdown--button--padding--top $dropdown--button--padding--right + $dropdown--arrow--width + $dropdown--arrow--margin $dropdown--button--padding--bottom $dropdown--button--padding--left; + padding: $dropdown--button--padding--top $dropdown--button--padding--right + $dropdown--arrow--width + + $dropdown--arrow--margin $dropdown--button--padding--bottom $dropdown--button--padding--left; text-align: left; width: auto; @@ -136,9 +137,7 @@ $dropdown--item--foreground--active: $menu--item--foreground--active; } &--match-button-width { - .dropdown { - &__content { max-width: 100%; } @@ -153,11 +152,8 @@ $dropdown--item--foreground--active: $menu--item--foreground--active; z-index: 10; .dropdown { - &__header { - .dropdown { - &__value { color: $dropdown--value--active; } diff --git a/client/src/sass/components/_dropzone.scss b/client/src/sass/components/_dropzone.scss index 2e4f4e2f..bf557ce8 100644 --- a/client/src/sass/components/_dropzone.scss +++ b/client/src/sass/components/_dropzone.scss @@ -22,7 +22,6 @@ $dropzone--file--foreground: $dropzone--foreground; border-color: $input--inverse--border--hover; .dropzone__icon { - .icon { fill: $dropzone--icon--fill--hover; } @@ -30,14 +29,12 @@ $dropzone--file--foreground: $dropzone--foreground; } &--is-dragging { - &, &:hover { border-color: $dropzone--border--dragging; color: $dropzone--foreground--dragging; .dropzone__icon { - .icon { fill: $dropzone--icon--fill--dragging; } @@ -46,9 +43,7 @@ $dropzone--file--foreground: $dropzone--foreground; } &__icon { - .icon { - &--files { fill: $dropzone--icon--fill; height: 64px; @@ -56,7 +51,6 @@ $dropzone--file--foreground: $dropzone--foreground; width: 64px; &__file { - &--right, &--left { fill-opacity: 0.5; @@ -97,9 +91,7 @@ $dropzone--file--foreground: $dropzone--foreground; } &__file { - .icon { - &--file { display: inline-block; height: 14px; @@ -114,9 +106,7 @@ $dropzone--file--foreground: $dropzone--foreground; } &:hover { - .icon { - &--file { opacity: 0.5; } diff --git a/client/src/sass/components/_duration.scss b/client/src/sass/components/_duration.scss index 4cb231bb..29d21456 100644 --- a/client/src/sass/components/_duration.scss +++ b/client/src/sass/components/_duration.scss @@ -1,5 +1,4 @@ .duration { - &--segment { margin-right: 0.25em; diff --git a/client/src/sass/components/_filesystem.scss b/client/src/sass/components/_filesystem.scss index 3acc7817..fddbe339 100644 --- a/client/src/sass/components/_filesystem.scss +++ b/client/src/sass/components/_filesystem.scss @@ -4,7 +4,6 @@ $filesystem--directory-list--background--hover: rgba($filesystem--directory-list $filesystem--directory-list--parent--border-color: lighten($filesystem--directory-list--foreground, 43%); .filesystem { - &__directory-list { color: $filesystem--directory-list--foreground; list-style: none; @@ -26,7 +25,6 @@ $filesystem--directory-list--parent--border-color: lighten($filesystem--director } &--directory { - &:hover { background: $filesystem--directory-list--background--hover; } diff --git a/client/src/sass/components/_floating-action.scss b/client/src/sass/components/_floating-action.scss index bcb29362..fdfdf2dd 100644 --- a/client/src/sass/components/_floating-action.scss +++ b/client/src/sass/components/_floating-action.scss @@ -6,7 +6,6 @@ $textbox-repeater--button--foreground: rgba(#12191f, 0.7); $textbox-repeater--button--foreground--hover: #12191f; .floating-action { - &__button { background: $textbox-repeater--button--background; border: none; @@ -46,7 +45,6 @@ $textbox-repeater--button--foreground--hover: #12191f; } &--search { - .icon { height: 15px; width: 15px; @@ -55,7 +53,6 @@ $textbox-repeater--button--foreground--hover: #12191f; } &__group { - &--on-textbox { display: flex; margin-top: -8px; diff --git a/client/src/sass/components/_icons.scss b/client/src/sass/components/_icons.scss index 3ce788c0..be1c1a69 100644 --- a/client/src/sass/components/_icons.scss +++ b/client/src/sass/components/_icons.scss @@ -19,11 +19,8 @@ } .icon { - &--eta { - .icon { - &__ring { fill-opacity: 1; } @@ -31,7 +28,6 @@ } &--information { - &__fill { fill-opacity: 0.05; } @@ -42,11 +38,8 @@ } &--limits { - .limits { - &__bars { - &--top { fill-opacity: 0.4; } @@ -63,11 +56,8 @@ } &--loading-indicator { - .loading-indicator { - &--dots { - &__dot { animation: loading-indicator-dots-pulse 0.6s linear alternate infinite; fill: $white; diff --git a/client/src/sass/components/_loading-indicator.scss b/client/src/sass/components/_loading-indicator.scss index 539e3e72..a350df33 100644 --- a/client/src/sass/components/_loading-indicator.scss +++ b/client/src/sass/components/_loading-indicator.scss @@ -23,9 +23,7 @@ $loading-indicator--tick--background--inverse: rgba($blue, 0.75); width: 32px; &.is-inverse { - .loading-indicator { - &__bar { background: $loading-indicator--bar--background--inverse; diff --git a/client/src/sass/components/_mediainfo.scss b/client/src/sass/components/_mediainfo.scss index cdf621e9..161263e3 100644 --- a/client/src/sass/components/_mediainfo.scss +++ b/client/src/sass/components/_mediainfo.scss @@ -17,9 +17,7 @@ } &__copy-button { - &.tooltip { - &__wrapper { position: absolute; right: 0; diff --git a/client/src/sass/components/_notifications.scss b/client/src/sass/components/_notifications.scss index 503ce098..203f8b66 100644 --- a/client/src/sass/components/_notifications.scss +++ b/client/src/sass/components/_notifications.scss @@ -1,15 +1,12 @@ $notification--sub-heading--color: saturate(lighten(#7189a8, 5%), 5%); .notifications { - &--empty { text-align: center; } &--is-loading { - .notifications { - &__list { opacity: 0.25; } @@ -64,9 +61,7 @@ $notification--sub-heading--color: saturate(lighten(#7189a8, 5%), 5%); width: 24px; .loading-indicator { - &--dots { - &__dot { fill: currentColor; } @@ -76,11 +71,8 @@ $notification--sub-heading--color: saturate(lighten(#7189a8, 5%), 5%); } &__toolbar { - .toolbar { - &__item { - &--button { flex-basis: 33.33%; } @@ -90,7 +82,6 @@ $notification--sub-heading--color: saturate(lighten(#7189a8, 5%), 5%); } .notification { - &__heading { color: #495d76; font-size: 0.75rem; @@ -102,7 +93,6 @@ $notification--sub-heading--color: saturate(lighten(#7189a8, 5%), 5%); } &__message { - &__sub-heading { color: $notification--sub-heading--color; font-style: italic; diff --git a/client/src/sass/components/_peers-list.scss b/client/src/sass/components/_peers-list.scss index 07102fa0..1b9e7f64 100644 --- a/client/src/sass/components/_peers-list.scss +++ b/client/src/sass/components/_peers-list.scss @@ -1,5 +1,4 @@ .peers-list { - &__flag { display: inline-block; height: 10px; @@ -32,7 +31,6 @@ } &__encryption { - .icon { fill: $green; height: 12px; diff --git a/client/src/sass/components/_priority-meter.scss b/client/src/sass/components/_priority-meter.scss index 67f2b979..2027340b 100644 --- a/client/src/sass/components/_priority-meter.scss +++ b/client/src/sass/components/_priority-meter.scss @@ -43,9 +43,7 @@ $priority-meter--bar--level-2--background: $green; width: 18px; &.priority-meter { - &--level-0 { - &:before { background: $priority-meter--track--level-0--background; } @@ -57,7 +55,6 @@ $priority-meter--bar--level-2--background: $green; } &--level-1 { - &:before { background: $priority-meter--track--level-1--background; } @@ -69,7 +66,6 @@ $priority-meter--bar--level-2--background: $green; } &--level-2 { - &:before { background: $priority-meter--track--level-2--background; } @@ -86,9 +82,7 @@ $priority-meter--bar--level-2--background: $green; width: 26px; &.priority-meter { - &--level-0 { - &:before { background: $priority-meter--track--level-0--background; } @@ -100,7 +94,6 @@ $priority-meter--bar--level-2--background: $green; } &--level-1 { - &:before { background: $priority-meter--track--level-1--background; } @@ -112,7 +105,6 @@ $priority-meter--bar--level-2--background: $green; } &--level-2 { - &:before { background: $priority-meter--track--level-2--background; } @@ -124,7 +116,6 @@ $priority-meter--bar--level-2--background: $green; } &--level-3 { - &:before { background: $priority-meter--track--level-2--background; } diff --git a/client/src/sass/components/_progress-bar.scss b/client/src/sass/components/_progress-bar.scss index 1e1caaa6..e82b566e 100644 --- a/client/src/sass/components/_progress-bar.scss +++ b/client/src/sass/components/_progress-bar.scss @@ -142,22 +142,34 @@ $progress-bar--track--background--selected: rgba(#fff, 0.15); .torrent--is-checking & { animation: candy-stripe 0.25s linear infinite; background-color: transparent; - background-image: linear-gradient(-45deg, rgba($progress-bar--track--background--checking, 0) 0, - rgba($progress-bar--track--background--checking, 0) 25%, rgba($progress-bar--track--background--checking, 0.5) 25%, - rgba($progress-bar--track--background--checking, 0.5) 50%, rgba($progress-bar--track--background--checking, 0) 50%, - rgba($progress-bar--track--background--checking, 0) 75%, rgba($progress-bar--track--background--checking, 0.5) 75%, - rgba($progress-bar--track--background--checking, 0.5) 100%); + background-image: linear-gradient( + -45deg, + rgba($progress-bar--track--background--checking, 0) 0, + rgba($progress-bar--track--background--checking, 0) 25%, + rgba($progress-bar--track--background--checking, 0.5) 25%, + rgba($progress-bar--track--background--checking, 0.5) 50%, + rgba($progress-bar--track--background--checking, 0) 50%, + rgba($progress-bar--track--background--checking, 0) 75%, + rgba($progress-bar--track--background--checking, 0.5) 75%, + rgba($progress-bar--track--background--checking, 0.5) 100% + ); background-size: 4px 4px; height: $progress-bar--height; top: 0; } .torrent--is-selected.torrent--is-checking & { - background-image: linear-gradient(-45deg, rgba(#fff, 0) 0, - rgba(#fff, 0) 25%, rgba(#fff, 0.5) 25%, - rgba(#fff, 0.5) 50%, rgba(#fff, 0) 50%, - rgba(#fff, 0) 75%, rgba(#fff, 0.5) 75%, - rgba(#fff, 0.5) 100%); + background-image: linear-gradient( + -45deg, + rgba(#fff, 0) 0, + rgba(#fff, 0) 25%, + rgba(#fff, 0.5) 25%, + rgba(#fff, 0.5) 50%, + rgba(#fff, 0) 50%, + rgba(#fff, 0) 75%, + rgba(#fff, 0.5) 75%, + rgba(#fff, 0.5) 100% + ); } } } diff --git a/client/src/sass/components/_scrollbars.scss b/client/src/sass/components/_scrollbars.scss index 4fc215e1..bf7e61bc 100644 --- a/client/src/sass/components/_scrollbars.scss +++ b/client/src/sass/components/_scrollbars.scss @@ -4,7 +4,6 @@ $scrollbar--thumb--background--inverted--inactive: rgba(#e9eef2, 0.3); $scrollbar--thumb--background--inverted--hover: rgba(#e9eef2, 0.6); .scrollbars { - &__thumb { background: $scrollbar--thumb--background--inactive; border-radius: 10px; @@ -39,7 +38,6 @@ $scrollbar--thumb--background--inverted--hover: rgba(#e9eef2, 0.6); } &:hover { - .scrollbars__thumb { opacity: 1; } diff --git a/client/src/sass/components/_search.scss b/client/src/sass/components/_search.scss index aef43704..3cf288be 100644 --- a/client/src/sass/components/_search.scss +++ b/client/src/sass/components/_search.scss @@ -78,7 +78,6 @@ $search-torrents--icon--foreground--active: $blue; } &.is-in-use { - .icon { fill: $search-torrents--icon--foreground--active; opacity: 1; diff --git a/client/src/sass/components/_sidebar-filter.scss b/client/src/sass/components/_sidebar-filter.scss index a37756ac..721d9e7e 100644 --- a/client/src/sass/components/_sidebar-filter.scss +++ b/client/src/sass/components/_sidebar-filter.scss @@ -51,11 +51,8 @@ } } - .sidebar-filter { - &__item { - &--heading { cursor: default; font-size: 0.8em; diff --git a/client/src/sass/components/_sort-dropdown.scss b/client/src/sass/components/_sort-dropdown.scss index a5df2d94..a8eca9cc 100644 --- a/client/src/sass/components/_sort-dropdown.scss +++ b/client/src/sass/components/_sort-dropdown.scss @@ -1,5 +1,4 @@ .sort-dropdown { - &__item { align-items: center; display: flex; diff --git a/client/src/sass/components/_sortable-list.scss b/client/src/sass/components/_sortable-list.scss index bcc5a388..81c77909 100644 --- a/client/src/sass/components/_sortable-list.scss +++ b/client/src/sass/components/_sortable-list.scss @@ -59,17 +59,15 @@ $sortable-list--item--border--preview: darken($sortable-list--item--border, 3%); } & + .sortable-list { - &__item { margin-top: -1px; } } .toggle-input { - &__indicator { background: darken($input--inverse--background, 5%); - border-color: darken($input--inverse--background, 8%); + border-color: darken($input--inverse--background, 8%); } } diff --git a/client/src/sass/components/_table.scss b/client/src/sass/components/_table.scss index 22afa356..73e0a191 100644 --- a/client/src/sass/components/_table.scss +++ b/client/src/sass/components/_table.scss @@ -1,4 +1,4 @@ -$table--heading--background: rgba(#f6f8fA, 0.6); +$table--heading--background: rgba(#f6f8fa, 0.6); $table--heading--border: rgba(#1d2938, 0.1); $table--heading--border--horizontal: rgba(#1d2938, 0.08); @@ -9,12 +9,10 @@ $table--heading--color--active--hover: darken($table--heading--color, 40%); $table--heading--resize--handle--width: 9px; $table--heading--resize--indicator--width: 1px; -$table--heading--resize--indicator--background: rgba(darken(#f6f8fA, 10%), 0.75); +$table--heading--resize--indicator--background: rgba(darken(#f6f8fa, 10%), 0.75); .table { - &__row { - &--heading { background: $table--heading--background; box-shadow: 0 1px 0 $table--heading--border; @@ -71,9 +69,7 @@ $table--heading--resize--indicator--background: rgba(darken(#f6f8fA, 10%), 0.75) } &--direction { - &--asc { - &:after { transform: rotate(180deg); } @@ -85,7 +81,6 @@ $table--heading--resize--indicator--background: rgba(darken(#f6f8fA, 10%), 0.75) min-width: 0; &.table { - &__heading { border: none; margin: 0; diff --git a/client/src/sass/components/_textbox-repeater.scss b/client/src/sass/components/_textbox-repeater.scss index 50894717..4fef69c2 100644 --- a/client/src/sass/components/_textbox-repeater.scss +++ b/client/src/sass/components/_textbox-repeater.scss @@ -1,5 +1,4 @@ .textbox-repeater { - .icon { height: 12px; width: 12px; diff --git a/client/src/sass/components/_toolbar.scss b/client/src/sass/components/_toolbar.scss index 1e4c4255..f78501bd 100644 --- a/client/src/sass/components/_toolbar.scss +++ b/client/src/sass/components/_toolbar.scss @@ -5,9 +5,7 @@ width: 100%; &--dark { - &.toolbar { - &--bottom { border-top: 1px solid $dark-blue; } @@ -18,9 +16,7 @@ } .toolbar { - &__item { - &--button { color: darken($foreground, 10%); diff --git a/client/src/sass/components/_tooltip.scss b/client/src/sass/components/_tooltip.scss index ef3cef1b..1b67e6d0 100644 --- a/client/src/sass/components/_tooltip.scss +++ b/client/src/sass/components/_tooltip.scss @@ -70,21 +70,15 @@ $tooltip-anchor-offset: $tooltip-arrow-offset + $tooltip-arrow-border-width; } &--position { - &--bottom, &--top { - &.tooltip { - &--anchor { - &--center { transform: translateX(-50%); .tooltip { - &__content { - &:after { left: 50%; transform: translateX(-50%); @@ -94,11 +88,8 @@ $tooltip-anchor-offset: $tooltip-arrow-offset + $tooltip-arrow-border-width; } &--start { - &.tooltip { - &--align { - &--center { transform: translateX($tooltip-anchor-offset * -1); } @@ -106,9 +97,7 @@ $tooltip-anchor-offset: $tooltip-arrow-offset + $tooltip-arrow-border-width; } .tooltip { - &__content { - &:after { left: $tooltip-arrow-offset; } @@ -120,9 +109,7 @@ $tooltip-anchor-offset: $tooltip-arrow-offset + $tooltip-arrow-border-width; transform: translateX(calc(-100% + #{$tooltip-anchor-offset})); .tooltip { - &__content { - &:after { right: $tooltip-arrow-offset; } @@ -137,9 +124,7 @@ $tooltip-anchor-offset: $tooltip-arrow-offset + $tooltip-arrow-border-width; padding-top: $tooltip-arrow-border-width; .tooltip { - &__content { - &:after { border-left-color: transparent; border-right-color: transparent; @@ -154,9 +139,7 @@ $tooltip-anchor-offset: $tooltip-arrow-offset + $tooltip-arrow-border-width; padding-bottom: $tooltip-arrow-border-width; .tooltip { - &__content { - &:after { border-bottom: none; border-left-color: transparent; @@ -169,19 +152,14 @@ $tooltip-anchor-offset: $tooltip-arrow-offset + $tooltip-arrow-border-width; &--left, &--right { - &.tooltip { - &--anchor { - &--center { top: 50%; transform: translateY(-50%); .tooltip { - &__content { - &:after { top: 50%; transform: translateY(-50%); @@ -194,9 +172,7 @@ $tooltip-anchor-offset: $tooltip-arrow-offset + $tooltip-arrow-border-width; transform: translateY($tooltip-anchor-offset * -1); .tooltip { - &__content { - &:after { top: $tooltip-arrow-offset; } @@ -208,9 +184,7 @@ $tooltip-anchor-offset: $tooltip-arrow-offset + $tooltip-arrow-border-width; transform: translateY(calc(-100% + #{$tooltip-anchor-offset})); .tooltip { - &__content { - &:after { bottom: $tooltip-arrow-offset; } @@ -225,9 +199,7 @@ $tooltip-anchor-offset: $tooltip-arrow-offset + $tooltip-arrow-border-width; padding-right: $tooltip-arrow-border-width; .tooltip { - &__content { - &:after { border-bottom-color: transparent; border-right: none; @@ -242,9 +214,7 @@ $tooltip-anchor-offset: $tooltip-arrow-offset + $tooltip-arrow-border-width; padding-left: $tooltip-arrow-border-width; .tooltip { - &__content { - &:after { border-bottom-color: transparent; border-left: none; @@ -257,9 +227,7 @@ $tooltip-anchor-offset: $tooltip-arrow-offset + $tooltip-arrow-border-width; } &--is-error { - .tooltip { - &__content { background: $tooltip-background--error; color: $tooltip-foreground--error; diff --git a/client/src/sass/components/_torrent-details-panel.scss b/client/src/sass/components/_torrent-details-panel.scss index e765e8cf..7fcb27dd 100644 --- a/client/src/sass/components/_torrent-details-panel.scss +++ b/client/src/sass/components/_torrent-details-panel.scss @@ -41,7 +41,6 @@ $torrent-details--tags--background: #515f6f; $torrent-details--tags--foreground: #1a2028; .torrent-details { - &__heading { color: inherit; font-size: inherit; @@ -103,14 +102,10 @@ $torrent-details--tags--foreground: #1a2028; } &__header { - &.is-completed, &.is-stopped { - .progress-bar { - &__icon { - .icon { fill: $torrent-details--header--progress-bar--fill; } @@ -120,7 +115,6 @@ $torrent-details--tags--foreground: #1a2028; background: $torrent-details--header--progress-bar--fill; &__wrapper { - &:after { background: $torrent-details--header--progress-bar--fill; } @@ -152,7 +146,6 @@ $torrent-details--tags--foreground: #1a2028; width: 100%; &__heading { - &--primary { color: $torrent-details--directory-tree--parent-directory--foreground; font-size: 1.125em; @@ -186,14 +179,12 @@ $torrent-details--tags--foreground: #1a2028; margin-left: -8px; .directory-tree { - &__node { color: $directory-tree--foreground; position: relative; transition: background 0.25s, border 0.25s, color 0.25s; &--group { - &:after { background: $directory-tree--group--extension; } @@ -207,7 +198,6 @@ $torrent-details--tags--foreground: #1a2028; font-weight: 500; .icon { - &--folder { fill: $directory-tree--icon--folder--open; } @@ -215,7 +205,6 @@ $torrent-details--tags--foreground: #1a2028; } .icon { - &--folder { fill: $directory-tree--icon--folder; } @@ -247,9 +236,7 @@ $torrent-details--tags--foreground: #1a2028; } .file { - &__detail { - &--size, &--priority { color: $directory-tree--file-details--hover--foreground; @@ -258,7 +245,6 @@ $torrent-details--tags--foreground: #1a2028; } .icon { - &--file { fill: $torrent-details--directory-tree--file--hover--foreground; } @@ -270,7 +256,6 @@ $torrent-details--tags--foreground: #1a2028; width: auto; &__detail { - &--size, &--priority { color: currentColor; @@ -287,7 +272,6 @@ $torrent-details--tags--foreground: #1a2028; color: $torrent-details--directory-tree--parent-directory--foreground; .icon { - &--disk { fill: $torrent-details--directory-tree--parent-directory--icon--fill; } @@ -296,7 +280,6 @@ $torrent-details--tags--foreground: #1a2028; } .icon { - &--file { fill: $directory-tree--icon--file; } @@ -310,16 +293,13 @@ $torrent-details--tags--foreground: #1a2028; } &__detail { - &--hash { - .torrent-details__detail__value { word-break: break-all; } } &--tags { - .tag { background: $torrent-details--tags--background; color: $torrent-details--tags--foreground; @@ -327,7 +307,6 @@ $torrent-details--tags--foreground: #1a2028; } & + .torrent-details__table__heading { - .torrent-details__table__heading--tertiary { padding-top: 10px; } diff --git a/client/src/sass/components/_torrent.scss b/client/src/sass/components/_torrent.scss index 4d1a83c6..8a799ad1 100644 --- a/client/src/sass/components/_torrent.scss +++ b/client/src/sass/components/_torrent.scss @@ -58,13 +58,11 @@ $more-info--border: $textbox-repeater--button--border; } &:hover { - &:after { background: $torrent--background--hover; } .torrent { - &__more-info { opacity: 1; pointer-events: auto; @@ -82,9 +80,7 @@ $more-info--border: $textbox-repeater--button--border; } &--tags { - .torrent { - &__tag { display: inline-block; margin-right: $spacing-unit * 3/10; @@ -102,9 +98,7 @@ $more-info--border: $textbox-repeater--button--border; } &__icon { - &--checkmark { - &.icon { opacity: 1; } @@ -120,9 +114,7 @@ $more-info--border: $textbox-repeater--button--border; } &__details { - &__section { - &--secondary { color: $torrent--secondary--foreground; } @@ -134,13 +126,9 @@ $more-info--border: $textbox-repeater--button--border; } &--is-stopped { - .torrent { - &__details { - &__section { - &--secondary { color: $torrent--secondary--foreground--stopped; } @@ -167,15 +155,10 @@ $more-info--border: $textbox-repeater--button--border; } &--has-error { - &.torrent { - &--is-stopped { - .torrent { - &__detail { - &--name { color: $torrent--primary--foreground--error--stopped; } @@ -185,9 +168,7 @@ $more-info--border: $textbox-repeater--button--border; } .torrent { - &__detail { - &--name { color: $torrent--primary--foreground--error; } @@ -200,13 +181,9 @@ $more-info--border: $textbox-repeater--button--border; } &--is-downloading { - &--actively { - .torrent { - &__detail { - &--downRate { color: $green; font-weight: 500; @@ -215,11 +192,8 @@ $more-info--border: $textbox-repeater--button--border; } .torrent-details { - &__sub-heading { - &__tertiary { - &--download { color: $blue; @@ -234,13 +208,9 @@ $more-info--border: $textbox-repeater--button--border; } &--is-uploading { - &--actively { - .torrent { - &__detail { - &--upRate { color: $blue; font-weight: 500; @@ -249,11 +219,8 @@ $more-info--border: $textbox-repeater--button--border; } .torrent-details { - &__sub-heading { - &__tertiary { - &--upload { color: $green; @@ -268,21 +235,15 @@ $more-info--border: $textbox-repeater--button--border; } &--is-selected { - &.torrent { - &--has-error { - .torrent { - &__detail { - &--name { color: $torrent--primary--foreground--selected--error; } &--tags { - .tag { background: $torrent--tags--background--selected--has-error; color: $torrent--tags--foreground--has-error; @@ -298,7 +259,6 @@ $more-info--border: $textbox-repeater--button--border; &, &:hover { - &:after { background: $torrent--background--error; } @@ -306,15 +266,10 @@ $more-info--border: $textbox-repeater--button--border; } &--is-stopped { - &.torrent { - &--has-error { - .torrent { - &__detail { - &--name { color: $torrent--primary--foreground--error--stopped--selected; } @@ -324,7 +279,6 @@ $more-info--border: $textbox-repeater--button--border; } .torrent { - &__detail { color: $torrent--secondary--foreground--selected--stopped; @@ -343,9 +297,7 @@ $more-info--border: $textbox-repeater--button--border; } &__details { - &__section { - &--secondary { color: $torrent--secondary--foreground--selected--stopped; } @@ -361,7 +313,6 @@ $more-info--border: $textbox-repeater--button--border; &, &:hover { - &:after { background: $torrent--background--selected; opacity: 1; @@ -369,7 +320,6 @@ $more-info--border: $textbox-repeater--button--border; } .torrent { - &__detail { color: $torrent--secondary--foreground--selected; @@ -383,7 +333,6 @@ $more-info--border: $textbox-repeater--button--border; } &--tags { - .tag { background: $torrent--tags--background--selected; color: $torrent--tags--foreground--selected; @@ -392,9 +341,7 @@ $more-info--border: $textbox-repeater--button--border; } &__details { - &__section { - &--secondary { color: $torrent--secondary--foreground--selected; } @@ -416,15 +363,10 @@ $more-info--border: $textbox-repeater--button--border; height: 70px; &.torrent { - &--is-downloading { - &--actively { - .torrent { - &__detail { - &--eta { margin-right: 10px; opacity: 1; @@ -437,9 +379,7 @@ $more-info--border: $textbox-repeater--button--border; } .torrent { - &__details { - &__section { display: flex; @@ -467,7 +407,6 @@ $more-info--border: $textbox-repeater--button--border; } .torrent { - &__detail { width: auto; } @@ -541,20 +480,17 @@ $more-info--border: $textbox-repeater--button--border; } &--tags { - &:last-child { margin-left: auto; width: auto; } .torrent { - &__tags { margin-right: 0; } &__tag { - &:last-child { margin-right: 0; } @@ -587,11 +523,8 @@ $more-info--border: $textbox-repeater--button--border; } &.torrent { - &--is-stopped { - .torrent { - &__detail { color: $torrent--secondary--foreground--stopped; } @@ -599,16 +532,13 @@ $more-info--border: $textbox-repeater--button--border; } &--is-selected { - &, & + .torrent { border-color: $torrent--border--selected; } &.torrent { - &--has-error { - &, & + .torrent { border-color: $torrent--border--selected--error; @@ -616,9 +546,7 @@ $more-info--border: $textbox-repeater--button--border; } &--is-stopped { - .torrent { - &__detail { color: $torrent--tertiary--foreground--selected--stopped; } @@ -627,7 +555,6 @@ $more-info--border: $textbox-repeater--button--border; } .torrent { - &__detail { color: $torrent--secondary--foreground--selected; } @@ -636,7 +563,6 @@ $more-info--border: $textbox-repeater--button--border; } .torrent { - &__detail { flex: 0 0 auto; font-size: 0.8em; @@ -650,7 +576,6 @@ $more-info--border: $textbox-repeater--button--border; } &--percentComplete { - .icon { opacity: 1; } @@ -659,9 +584,7 @@ $more-info--border: $textbox-repeater--button--border; } .progress-bar { - &__icon { - .icon { margin-right: 0; } @@ -672,9 +595,7 @@ $more-info--border: $textbox-repeater--button--border; &__more-info { background: $more-info--background; border-radius: 32px 0 0 32px; - box-shadow: - 0 0 30px rgba($more-info--box-shadow--hue, 0.11), - 0 0 0 1px rgba($more-info--box-shadow--hue, 0.07); + box-shadow: 0 0 30px rgba($more-info--box-shadow--hue, 0.11), 0 0 0 1px rgba($more-info--box-shadow--hue, 0.07); height: 32px; margin-top: -16px; position: absolute; @@ -697,9 +618,7 @@ $more-info--border: $textbox-repeater--button--border; &:hover { background: $more-info--background--hover; - box-shadow: - 0 0 30px rgba($more-info--box-shadow--hue, 0.2), - 0 0 0 1px rgba($more-info--box-shadow--hue, 0.1); + box-shadow: 0 0 30px rgba($more-info--box-shadow--hue, 0.2), 0 0 0 1px rgba($more-info--box-shadow--hue, 0.1); .icon { fill: $blue; diff --git a/client/src/sass/components/_transfer-data.scss b/client/src/sass/components/_transfer-data.scss index f8b48716..c1a97c49 100644 --- a/client/src/sass/components/_transfer-data.scss +++ b/client/src/sass/components/_transfer-data.scss @@ -2,7 +2,6 @@ $transfer-data--download: $green; $transfer-data--upload: $blue; .transfer-data { - &--download { color: $transfer-data--download; diff --git a/client/src/sass/style.scss b/client/src/sass/style.scss index 6fc3b82a..33843a83 100644 --- a/client/src/sass/style.scss +++ b/client/src/sass/style.scss @@ -1,54 +1,54 @@ -@import "~ress"; -@import "ui/index"; +@import '~ress'; +@import 'ui/index'; -@import "tools/variables"; -@import "tools/reset"; +@import 'tools/variables'; +@import 'tools/reset'; -@import "base/animations"; -@import "base/font-families"; -@import "base/layout"; -@import "base/main"; -@import "base/typography"; +@import 'base/animations'; +@import 'base/font-families'; +@import 'base/layout'; +@import 'base/main'; +@import 'base/typography'; -@import "components/action-bar"; -@import "components/app-wrapper"; -@import "components/alerts"; -@import "components/attached-panel"; -@import "components/badge"; -@import "components/base-menu"; -@import "components/client-stats"; -@import "components/connection-status"; -@import "components/dependency-list"; -@import "components/directory-tree"; -@import "components/dropdown"; -@import "components/dropzone"; -@import "components/duration"; -@import "components/filesystem"; -@import "components/floating-action"; -@import "components/icons"; -@import "components/interactive-list"; -@import "components/loading-indicator"; -@import "components/mediainfo"; -@import "components/modals"; -@import "components/notifications"; -@import "components/peers-list"; -@import "components/priority-meter"; -@import "components/progress-bar"; -@import "components/scrollbars"; -@import "components/search"; -@import "components/sidebar"; -@import "components/sidebar-filter"; -@import "components/sort-dropdown"; -@import "components/sortable-list"; -@import "components/table"; -@import "components/tags"; -@import "components/textbox-repeater"; -@import "components/toolbar"; -@import "components/tooltip"; -@import "components/torrent-details-panel"; -@import "components/torrents"; -@import "components/torrent"; -@import "components/transfer-data"; +@import 'components/action-bar'; +@import 'components/app-wrapper'; +@import 'components/alerts'; +@import 'components/attached-panel'; +@import 'components/badge'; +@import 'components/base-menu'; +@import 'components/client-stats'; +@import 'components/connection-status'; +@import 'components/dependency-list'; +@import 'components/directory-tree'; +@import 'components/dropdown'; +@import 'components/dropzone'; +@import 'components/duration'; +@import 'components/filesystem'; +@import 'components/floating-action'; +@import 'components/icons'; +@import 'components/interactive-list'; +@import 'components/loading-indicator'; +@import 'components/mediainfo'; +@import 'components/modals'; +@import 'components/notifications'; +@import 'components/peers-list'; +@import 'components/priority-meter'; +@import 'components/progress-bar'; +@import 'components/scrollbars'; +@import 'components/search'; +@import 'components/sidebar'; +@import 'components/sidebar-filter'; +@import 'components/sort-dropdown'; +@import 'components/sortable-list'; +@import 'components/table'; +@import 'components/tags'; +@import 'components/textbox-repeater'; +@import 'components/toolbar'; +@import 'components/tooltip'; +@import 'components/torrent-details-panel'; +@import 'components/torrents'; +@import 'components/torrent'; +@import 'components/transfer-data'; -@import "views/login"; -@import "views/feeds"; \ No newline at end of file +@import 'views/login'; +@import 'views/feeds'; diff --git a/client/src/sass/tools/_colors.scss b/client/src/sass/tools/_colors.scss index 042adcc5..7e395915 100644 --- a/client/src/sass/tools/_colors.scss +++ b/client/src/sass/tools/_colors.scss @@ -1,6 +1,6 @@ $dark-blue: #1d2938; $grey: #293341; -$light-grey: #3A4553; +$light-grey: #3a4553; $light-grey--lighter: lighten($light-grey, 40%); $blue: #258de5; $blue--lighter: saturate(lighten($blue, 10%), 100%); diff --git a/client/src/sass/ui/components/button.scss b/client/src/sass/ui/components/button.scss index a6630919..b77fa8c6 100644 --- a/client/src/sass/ui/components/button.scss +++ b/client/src/sass/ui/components/button.scss @@ -1,11 +1,9 @@ @function button--text-shadow($color) { - @return 0 1px 0 darken($color, 5%), - 0 1px 2px rgba(darken($color, 10%), 0.8); + @return 0 1px 0 darken($color, 5%), 0 1px 2px rgba(darken($color, 10%), 0.8); } @function button--svg-shadow($color) { - @return drop-shadow(0 1px 0 darken($color, 5%)) - drop-shadow(0 1px 2px rgba(darken($color, 10%), 0.8)); + @return drop-shadow(0 1px 0 darken($color, 5%)) drop-shadow(0 1px 2px rgba(darken($color, 10%), 0.8)); } .button { @@ -268,16 +266,13 @@ } &--is-loading { - .button { - &__content { opacity: 0; } } .icon { - &--loading { opacity: 1; } diff --git a/client/src/sass/ui/components/context-menu.scss b/client/src/sass/ui/components/context-menu.scss index bed4d900..fd5495b7 100644 --- a/client/src/sass/ui/components/context-menu.scss +++ b/client/src/sass/ui/components/context-menu.scss @@ -7,9 +7,7 @@ top: 0; &--enter { - .context-menu { - &__items { opacity: 0; transform: translateY(2rem * -1); @@ -21,9 +19,7 @@ } &--active { - .context-menu { - &__items { opacity: 1; transform: translateY(0); @@ -33,9 +29,7 @@ } &--exit { - .context-menu { - &__items { opacity: 1; transform: translateY(0); @@ -43,9 +37,7 @@ } &--active { - .context-menu { - &__items { opacity: 0; transform: translateY(20px * -1); @@ -61,9 +53,7 @@ &__items { background: $white; border-radius: $form--element--border-radius; - box-shadow: - form--element--box-shadow($darkest-grey, 0.05, 0.1), - 0 0 0 1px rgba($darkest-grey, 0.1); + box-shadow: form--element--box-shadow($darkest-grey, 0.05, 0.1), 0 0 0 1px rgba($darkest-grey, 0.1); max-width: 200px; overflow-x: hidden; overflow-y: auto; diff --git a/client/src/sass/ui/components/element-addon.scss b/client/src/sass/ui/components/element-addon.scss index 490e9b2c..bc3bd899 100644 --- a/client/src/sass/ui/components/element-addon.scss +++ b/client/src/sass/ui/components/element-addon.scss @@ -1,9 +1,6 @@ .form { - &__element { - &--has-addon { - &--placed-before { padding-left: $button--has-addon--padding--left; @@ -94,7 +91,6 @@ pointer-events: auto; &:hover { - .icon { fill: $blue; transition: all $speed--xx-fast; diff --git a/client/src/sass/ui/components/form.scss b/client/src/sass/ui/components/form.scss index 7d1715ff..761ec76f 100644 --- a/client/src/sass/ui/components/form.scss +++ b/client/src/sass/ui/components/form.scss @@ -15,7 +15,6 @@ } .form { - &__row { display: flex; margin-bottom: $form__row--margin--vertical; @@ -31,7 +30,6 @@ } &--align { - &--start { align-items: flex-start; } @@ -46,7 +44,6 @@ } &--justify { - &--start { justify-content: flex-start; } @@ -138,7 +135,6 @@ } &__element { - &__label { display: block; font-size: $font-size--x-small; diff --git a/client/src/sass/ui/components/icon.scss b/client/src/sass/ui/components/icon.scss index 17455358..5674d203 100644 --- a/client/src/sass/ui/components/icon.scss +++ b/client/src/sass/ui/components/icon.scss @@ -30,7 +30,6 @@ } &--loading { - &--ring { stroke: currentColor; } diff --git a/client/src/sass/ui/components/input.scss b/client/src/sass/ui/components/input.scss index c4585502..b56f685b 100644 --- a/client/src/sass/ui/components/input.scss +++ b/client/src/sass/ui/components/input.scss @@ -85,7 +85,6 @@ transition: all $speed--xx-fast; .toggle-input { - &__indicator { border-color: $input--border--hover; @@ -99,7 +98,6 @@ } &__icon { - &, .icon { display: block; @@ -114,7 +112,6 @@ color: $blue; .toggle-input { - &__indicator { border-color: $blue; box-shadow: form--element--box-shadow--active($blue); @@ -138,9 +135,7 @@ &:active, &--is-active { - .toggle-input { - &__indicator { background-color: rgba($blue, 0.1); color: rgba($blue, 0.8); @@ -162,15 +157,10 @@ visibility: hidden; &:checked { - & + .toggle-input { - &__indicator { - .toggle-input { - &__indicator { - &__icon { opacity: 1; } @@ -218,9 +208,7 @@ } &.checkbox { - .toggle-input { - &__indicator { border-radius: $form--element--border-radius; } @@ -228,9 +216,7 @@ } &.radio { - .toggle-input { - &__indicator { border-radius: 100%; } diff --git a/client/src/sass/ui/components/panel.scss b/client/src/sass/ui/components/panel.scss index 4606b2c7..1e215bd5 100644 --- a/client/src/sass/ui/components/panel.scss +++ b/client/src/sass/ui/components/panel.scss @@ -1,4 +1,3 @@ - $panel--spacing--horizontal--medium: $spacing--x-large; $panel--spacing--vertical--medium: $spacing--medium; @@ -12,15 +11,14 @@ $panel--spacing--vertical--large: $spacing--xx-large; overflow: hidden; &--medium { - .panel { - &__content { padding: $panel--spacing--vertical--medium $panel--spacing--horizontal--medium; } &__header { - padding: $panel--spacing--vertical--medium $panel--spacing--horizontal--medium 0 $panel--spacing--horizontal--medium; + padding: $panel--spacing--vertical--medium $panel--spacing--horizontal--medium 0 + $panel--spacing--horizontal--medium; &--has-border { padding-bottom: $panel--spacing--vertical--medium; @@ -28,7 +26,8 @@ $panel--spacing--vertical--large: $spacing--xx-large; } &__footer { - padding: 0 $panel--spacing--horizontal--medium $panel--spacing--vertical--medium $panel--spacing--horizontal--medium; + padding: 0 $panel--spacing--horizontal--medium $panel--spacing--vertical--medium + $panel--spacing--horizontal--medium; &--has-border { padding-top: $panel--spacing--vertical--medium; @@ -38,15 +37,14 @@ $panel--spacing--vertical--large: $spacing--xx-large; } &--large { - .panel { - &__content { padding: $panel--spacing--vertical--large $panel--spacing--horizontal--large; } &__header { - padding: $panel--spacing--vertical--large $panel--spacing--horizontal--large 0 $panel--spacing--horizontal--large; + padding: $panel--spacing--vertical--large $panel--spacing--horizontal--large 0 + $panel--spacing--horizontal--large; &--has-border { padding-bottom: $panel--spacing--vertical--large; @@ -54,7 +52,8 @@ $panel--spacing--vertical--large: $spacing--xx-large; } &__footer { - padding: 0 $panel--spacing--horizontal--large $panel--spacing--vertical--large $panel--spacing--horizontal--large ; + padding: 0 $panel--spacing--horizontal--large $panel--spacing--vertical--large + $panel--spacing--horizontal--large; &--has-border { padding-top: $panel--spacing--vertical--large; @@ -64,7 +63,6 @@ $panel--spacing--vertical--large: $spacing--xx-large; } &__header { - &--has-border { border-bottom: 1px solid $grey--soft; } @@ -86,9 +84,7 @@ $panel--spacing--vertical--large: $spacing--xx-large; } &__content { - &--has-border { - &--top { border-top: 1px solid $grey--soft; } @@ -100,7 +96,6 @@ $panel--spacing--vertical--large: $spacing--xx-large; } &__footer { - &--has-border { border-top: 1px solid $grey--soft; } diff --git a/client/src/sass/ui/components/select.scss b/client/src/sass/ui/components/select.scss index e65ac06b..c47dab76 100644 --- a/client/src/sass/ui/components/select.scss +++ b/client/src/sass/ui/components/select.scss @@ -6,11 +6,8 @@ text-align: left; &:hover { - .select { - &__indicator { - .icon { fill: $grey--hard; } @@ -20,11 +17,8 @@ &:focus, &:active { - .select { - &__indicator { - .icon { fill: $blue; transition: all $speed--xx-fast; @@ -38,7 +32,6 @@ } .select { - &__item { overflow: hidden; text-overflow: ellipsis; @@ -54,7 +47,6 @@ z-index: 1; .context-menu__items & { - &:hover { background: $light-grey--lighter; } @@ -84,11 +76,8 @@ } &--is-open { - .select { - &__indicator { - .icon { transform: translate(-50%, -50%) rotate(180deg); } diff --git a/client/src/sass/ui/config/colors.scss b/client/src/sass/ui/config/colors.scss index 119527d5..6f9e78a9 100644 --- a/client/src/sass/ui/config/colors.scss +++ b/client/src/sass/ui/config/colors.scss @@ -8,7 +8,7 @@ $red: #f34570; $red--alpha--light: rgba($red, 0.1); $red--alpha--medium: rgba($red, 0.2); -$blue: #349CF4; +$blue: #349cf4; $blue--light: lighten($blue, 7%); $blue--lighter: lighten($blue, 40%); $blue--soft: rgba($blue, 0.05); @@ -16,34 +16,34 @@ $blue--hard: harden($blue, 1.5); $blue--darker: darken($blue, 20%); -$green: #39CE83; +$green: #39ce83; $green--light: lighten($green, 7%); $green--hard: harden($green, 1.3); -$medium-grey: #ABBAC7; -$medium-grey--lighter: #B9C7D3; +$medium-grey: #abbac7; +$medium-grey--lighter: #b9c7d3; $medium-grey--soft: rgba($medium-grey, 0.15); -$grey: #8899A8; +$grey: #8899a8; $grey--soft: rgba($grey, 0.15); $grey--light: lighten($grey, 7%); $grey--lighter: lighten($grey, 25%); $grey--hard: harden($grey, 1.75); $grey--harder: harden($grey, 1); -$dark-grey: #34516C; +$dark-grey: #34516c; $dark-grey--light: lighten($dark-grey, 7%); -$darker-grey: #1D2938; +$darker-grey: #1d2938; $darkest-grey: #28303b; $darkest-grey--hard: #293341; -$darkest-grey--darker: #202D3C; +$darkest-grey--darker: #202d3c; -$another-grey: #3A4553; +$another-grey: #3a4553; -$light-grey: #E9EEF2; -$light-grey--lighter: #F8F9FB; +$light-grey: #e9eef2; +$light-grey--lighter: #f8f9fb; $light-grey--soft: rgba($light-grey, 0.15); $light-grey--hard: harden($light-grey); diff --git a/client/src/sass/ui/config/variables.scss b/client/src/sass/ui/config/variables.scss index 7f80e719..b9a3bd8d 100644 --- a/client/src/sass/ui/config/variables.scss +++ b/client/src/sass/ui/config/variables.scss @@ -49,4 +49,4 @@ $button--has-addon--padding--left: $input--addon--padding--left; $button--has-two-addons--padding--right: $input--two-addons--padding--right; $button--has-two-addons--padding--left: $input--two-addons--padding--left; -$font-family--monospace: monaco, Consolas, "Lucida Console", monospace; +$font-family--monospace: monaco, Consolas, 'Lucida Console', monospace; diff --git a/client/src/sass/ui/util/box-shadows.scss b/client/src/sass/ui/util/box-shadows.scss index 88de358a..87de38ad 100644 --- a/client/src/sass/ui/util/box-shadows.scss +++ b/client/src/sass/ui/util/box-shadows.scss @@ -1,11 +1,9 @@ -@function form--element--box-shadow($color, $smallShadowOpacity:0.15, $bigShadowOpacity:0.2) { - @return 0 1px 1px rgba($color, $smallShadowOpacity), - 0 1px 3px 1px rgba($color, $bigShadowOpacity); +@function form--element--box-shadow($color, $smallShadowOpacity: 0.15, $bigShadowOpacity: 0.2) { + @return 0 1px 1px rgba($color, $smallShadowOpacity), 0 1px 3px 1px rgba($color, $bigShadowOpacity); } @function form--element--box-shadow--active($color) { - @return form--element--box-shadow($color), - 0 0 0 1px rgba($color, 1); + @return form--element--box-shadow($color), 0 0 0 1px rgba($color, 1); } @function form--element--inverse--box-shadow--active($color) { @@ -13,13 +11,11 @@ } @function form--element--box-shadow--active--slim($color) { - @return form--element--box-shadow($color), - 0 0 0 2px rgba($color, 0.2); + @return form--element--box-shadow($color), 0 0 0 2px rgba($color, 0.2); } @function form--element--box-shadow--active--smaller($color) { - @return form--element--box-shadow($color), - 0 0 0 2px rgba($color, 0.2); + @return form--element--box-shadow($color), 0 0 0 2px rgba($color, 0.2); } @function panel--box-shadow($color) { diff --git a/client/src/sass/views/_feeds.scss b/client/src/sass/views/_feeds.scss index 31cd4ad7..aa74f445 100644 --- a/client/src/sass/views/_feeds.scss +++ b/client/src/sass/views/_feeds.scss @@ -1,8 +1,7 @@ .feed-list { - &__feed-label { display: block; overflow: hidden; text-overflow: ellipsis; } -} \ No newline at end of file +} diff --git a/client/src/sass/views/_login.scss b/client/src/sass/views/_login.scss index 2dc50f00..3d2ccd42 100644 --- a/client/src/sass/views/_login.scss +++ b/client/src/sass/views/_login.scss @@ -9,9 +9,7 @@ $authentication--header--foreground: $white; $authentication--label--foreground: #3a5567; .application { - &__view { - &--auth-form { background: $light-blue; } @@ -19,13 +17,11 @@ $authentication--label--foreground: #3a5567; } .form { - &--authentication { max-width: 350px; width: 100%; .form { - &__wrapper { background: $white; border: 1px solid $authentication--form--border; @@ -34,7 +30,8 @@ $authentication--label--foreground: #3a5567; &__header { background: $blue; - margin: $authentication--form--padding * -1 $authentication--form--padding * -1 0 $authentication--form--padding * -1; + margin: $authentication--form--padding * -1 $authentication--form--padding * -1 0 $authentication--form--padding * + -1; padding: $authentication--form--padding * 0.75 $authentication--form--padding; h1 { @@ -50,7 +47,6 @@ $authentication--label--foreground: #3a5567; } &--header { - } &__label { @@ -58,7 +54,6 @@ $authentication--label--foreground: #3a5567; } &__row { - &--error { color: $red; font-size: 0.75em; diff --git a/scripts/prettier.js b/scripts/prettier.js index 7850e016..2e705bbf 100644 --- a/scripts/prettier.js +++ b/scripts/prettier.js @@ -4,7 +4,7 @@ const glob = require('glob'); const path = require('path'); const prettier = require('prettier'); -const SOURCE_PATTERN = `{client,scripts,server,shared}${path.sep}!(assets){${path.sep},}{**${path.sep}*,*}.{js,jsx,ts,tsx,json,md}`; +const SOURCE_PATTERN = `{client,scripts,server,shared}${path.sep}!(assets){${path.sep},}{**${path.sep}*,*}.{js,jsx,ts,tsx,json,md,css,scss,sass,less}`; const readFile = (filePath) => { return new Promise((resolve, reject) => {