Browse Source

Fix scss lint

develop
Chocobozzz 4 days ago
parent
commit
ffc424259e
No known key found for this signature in database GPG Key ID: 583A612D890159BE
9 changed files with 30 additions and 17 deletions
  1. +0
    -2
      client/.stylelintrc.json
  2. +3
    -1
      client/src/app/+admin/overview/users/user-edit/user-edit.component.scss
  3. +4
    -1
      client/src/app/+admin/overview/users/user-list/user-list.component.scss
  4. +3
    -1
      client/src/app/+my-account/my-account-settings/my-account-settings.component.scss
  5. +1
    -0
      client/src/sass/application.scss
  6. +9
    -7
      client/src/sass/include/_mixins.scss
  7. +3
    -3
      client/src/sass/include/_variables.scss
  8. +4
    -1
      client/src/sass/ng-select.scss
  9. +3
    -1
      client/src/sass/player/_player-variables.scss

+ 0
- 2
client/.stylelintrc.json View File

@@ -4,7 +4,6 @@
"scss/at-import-no-partial-leading-underscore": null,
"color-hex-case": null,
"color-hex-length": null,
"order/properties-alphabetical-order": null,
"selector-pseudo-element-no-unknown": [
true,
{
@@ -24,7 +23,6 @@
"rule-empty-line-before": null,
"selector-max-id": null,
"scss/at-function-pattern": null,
"function-parentheses-space-inside": "never-single-line",
"property-no-vendor-prefix": [
true,
{


+ 3
- 1
client/src/app/+admin/overview/users/user-edit/user-edit.component.scss View File

@@ -1,4 +1,6 @@
@use 'sass:math';
@use 'sass:color';

@use '_variables' as *;
@use '_mixins' as *;

@@ -8,7 +10,7 @@ $form-base-input-width: 340px;
@include settings-big-title;

&.account-title-danger {
color: lighten($color: #c54130, $amount: 10);
color: color.adjust($color: #c54130, $lightness: 10%);
}
}



+ 4
- 1
client/src/app/+admin/overview/users/user-list/user-list.component.scss View File

@@ -1,9 +1,12 @@
@use 'sass:color';

@use '_variables' as *;
@use '_mixins' as *;

@use 'bootstrap/scss/functions' as *;

tr.banned > td {
background-color: lighten($color: $red, $amount: 40) !important;
background-color: color.adjust($color: $red, $lightness: 40%) !important;
}

.banned-info {


+ 3
- 1
client/src/app/+my-account/my-account-settings/my-account-settings.component.scss View File

@@ -1,3 +1,5 @@
@use 'sass:color';

@use '_variables' as *;
@use '_mixins' as *;
@use 'bootstrap/scss/functions' as *;
@@ -6,7 +8,7 @@
@include settings-big-title;

&.account-title-danger {
color: lighten($color: #c54130, $amount: 10);
color: color.adjust($color: #c54130, $lightness: 10%);
}
}



+ 1
- 0
client/src/sass/application.scss View File

@@ -1,4 +1,5 @@
@use 'sass:math';
@use 'sass:color';

@use '_variables' as *;
@use '_mixins' as *;


+ 9
- 7
client/src/sass/include/_mixins.scss View File

@@ -1,4 +1,6 @@
@use 'sass:math';
@use 'sass:color';

@use '_variables' as *;

@import '_bootstrap-mixins';
@@ -220,7 +222,7 @@
}

@mixin danger-button {
$color: lighten($color: #c54130, $amount: 10);
$color: color.adjust($color: #c54130, $lightness: 10%);
$text: #fff6f5;

@include button-focus(scale-color($color, $alpha: -95%));
@@ -233,7 +235,7 @@
&:focus,
&[disabled],
&.disabled {
background-color: lighten($color: $color, $amount: 10);
background-color: color.adjust($color: $color, $lightness: 10%);
}

&[disabled],
@@ -676,7 +678,7 @@
transition: width 0.6s ease;

&.red {
background-color: lighten($color: #c54130, $amount: 10);
background-color: color.adjust($color: #c54130, $lightness: 10%);
}
}
}
@@ -721,7 +723,7 @@

> div {
box-sizing: border-box;
flex: 0 0 percentage(math.div(1, 3));
flex: 0 0 math.percentage(math.div(1, 3));
padding: 0 5px;
margin-bottom: 10px;

@@ -832,7 +834,7 @@
// an immediate's parent size. This allows to set a ratio without explicit
// dimensions, as width/height cannot be computed from each other.
@mixin block-ratio ($selector: 'div', $inverted-ratio: math.div(9, 16)) {
$padding-percent: percentage($inverted-ratio);
$padding-percent: math.percentage($inverted-ratio);

position: relative;
height: 0;
@@ -889,7 +891,7 @@

@mixin on-small-main-col () {
:host-context(.main-col:not(.expanded)) {
@media screen and (max-width: $small-view + $menu-width) {
@media screen and (max-width: #{$small-view + $menu-width}) {
@content;
}
}
@@ -903,7 +905,7 @@

@mixin on-mobile-main-col () {
:host-context(.main-col:not(.expanded)) {
@media screen and (max-width: $mobile-view + $menu-width) {
@media screen and (max-width: #{$mobile-view + $menu-width}) {
@content;
}
}


+ 3
- 3
client/src/sass/include/_variables.scss View File

@@ -17,11 +17,11 @@ $grey-foreground-hover-color: #303030;
$grey-button-outline-color: color.scale($grey-foreground-color, $alpha: -95%);

$main-color: hsl(24, 90%, 50%);
$main-color-lighter: lighten($main-color, 10%);
$main-color-lightest: lighten($main-color, 40%);
$main-color-lighter: color.adjust($main-color, $lightness: 10%);
$main-color-lightest: color.adjust($main-color, $lightness: 40%);
$main-color-very-light: #fff5eb;

$main-hover-color: lighten($main-color, 5%);
$main-hover-color: color.adjust($main-color, $lightness: 5%);
$main-background-hover-color: #e9ecef;

$support-button: inherit;


+ 4
- 1
client/src/sass/ng-select.scss View File

@@ -1,3 +1,6 @@
@use 'sass:math';
@use 'sass:color';

@use '_variables' as *;
@use '_mixins' as *;

@@ -9,7 +12,7 @@ $ng-select-border: $input-border-color;
$ng-select-bg: pvar(--mainBackgroundColor);

// Cannot use a CSS variable as the default them use darken on this variable
$ng-select-selected: lighten($main-color, 40%);
$ng-select-selected: color.adjust($main-color, $lightness: 40%);
// $ng-select-selected-text: $ng-select-primary-text !default;

$ng-select-marked: pvar(--mainColorLightest);


+ 3
- 1
client/src/sass/player/_player-variables.scss View File

@@ -1,3 +1,5 @@
@use 'sass:color';

@use 'bootstrap/scss/functions' as *;

$primary-foreground-color: #fff;
@@ -18,7 +20,7 @@ $control-bar-button-width: 38px;

$control-bar-total-height: $control-bar-height - $control-bar-slider-top;

$slider-bg-color: lighten($primary-background-color, 33%);
$slider-bg-color: color.adjust($primary-background-color, $lightness: 33%);

$progress-margin: 10px;



Loading…
Cancel
Save