1
0
Fork 0
mirror of https://github.com/muerwre/vault-frontend.git synced 2025-04-24 20:36:40 +07:00

replaced node-sass with sass

This commit is contained in:
Fedor Katurov 2022-01-28 11:09:21 +07:00
parent 8ee5b09b65
commit 5c9fdf93db
39 changed files with 148 additions and 1162 deletions

View file

@ -24,7 +24,6 @@
"mobx-persist-store": "^1.0.4", "mobx-persist-store": "^1.0.4",
"mobx-react-lite": "^3.2.3", "mobx-react-lite": "^3.2.3",
"next": "^12.0.7", "next": "^12.0.7",
"node-sass": "^4.14.1",
"photoswipe": "^4.1.3", "photoswipe": "^4.1.3",
"raleway-cyrillic": "^4.0.2", "raleway-cyrillic": "^4.0.2",
"ramda": "^0.26.1", "ramda": "^0.26.1",
@ -39,6 +38,7 @@
"react-router-dom": "^5.1.2", "react-router-dom": "^5.1.2",
"react-sortable-hoc": "^2.0.0", "react-sortable-hoc": "^2.0.0",
"react-sticky-box": "^0.9.3", "react-sticky-box": "^0.9.3",
"sass": "^1.49.0",
"swiper": "^6.8.4", "swiper": "^6.8.4",
"swr": "^1.0.1", "swr": "^1.0.1",
"throttle-debounce": "^2.1.0", "throttle-debounce": "^2.1.0",
@ -76,7 +76,6 @@
] ]
}, },
"devDependencies": { "devDependencies": {
"eslint": "^7.32.0",
"@next/bundle-analyzer": "^12.0.8", "@next/bundle-analyzer": "^12.0.8",
"@next/eslint-plugin-next": "^12.0.8", "@next/eslint-plugin-next": "^12.0.8",
"@types/classnames": "^2.2.7", "@types/classnames": "^2.2.7",
@ -87,6 +86,7 @@
"@types/yup": "^0.29.11", "@types/yup": "^0.29.11",
"@typescript-eslint/eslint-plugin": "^5.10.1", "@typescript-eslint/eslint-plugin": "^5.10.1",
"@typescript-eslint/parser": "^5.10.1", "@typescript-eslint/parser": "^5.10.1",
"eslint": "^7.32.0",
"eslint-plugin-import": "^2.25.4", "eslint-plugin-import": "^2.25.4",
"eslint-plugin-react": "^7.28.0", "eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0", "eslint-plugin-react-hooks": "^4.3.0",

View file

Before

Width:  |  Height:  |  Size: 84 KiB

After

Width:  |  Height:  |  Size: 84 KiB

Before After
Before After

View file

@ -4,7 +4,7 @@
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 50%; left: 50%;
transform: translate($content_width / 2 + $gap, 0); transform: translate($content_width * 0.5 + $gap, 0);
z-index: 14; z-index: 14;
@media (max-width: $content_width + ($bar_height + $gap) * 2) { @media (max-width: $content_width + ($bar_height + $gap) * 2) {
@ -17,7 +17,7 @@
background: $red_gradient; background: $red_gradient;
width: $bar_height; width: $bar_height;
height: $bar_height; height: $bar_height;
border-radius: $bar_height / 2; border-radius: $bar_height * 0.5;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;

View file

@ -1,7 +1,7 @@
@import "src/styles/variables"; @import "src/styles/variables";
.wrap { .wrap {
padding: $gap / 2 0; padding: $gap * 0.5 0;
border-bottom: 1px solid #333333; border-bottom: 1px solid #333333;
&:last-child { &:last-child {

View file

@ -101,7 +101,7 @@
} }
.block_text { .block_text {
padding: $gap / 2 0; padding: $gap * 0.5 0;
} }
.date { .date {

View file

@ -11,7 +11,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-start; justify-content: flex-start;
margin: $gap / 4 0 !important; margin: $gap * 0.25 0 !important;
&:last-child { &:last-child {
margin-bottom: 0 !important; margin-bottom: 0 !important;
@ -58,7 +58,7 @@
} }
.preview { .preview {
padding: 0 $gap / 2 0; padding: 0 $gap * 0.5 0;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;

View file

@ -24,20 +24,20 @@
background: transparentize(black, 0.8); background: transparentize(black, 0.8);
border-radius: 0 0 $radius $radius; border-radius: 0 0 $radius $radius;
flex-wrap: wrap; flex-wrap: wrap;
padding: $gap / 4; padding: $gap * 0.25;
} }
.button_column { .button_column {
padding: $gap / 4; padding: $gap * 0.25;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
.uploads { .uploads {
padding: ($gap / 2); padding: ($gap * 0.5);
display: grid; display: grid;
grid-column-gap: $gap / 2; grid-column-gap: $gap * 0.5;
grid-row-gap: $gap / 2; grid-row-gap: $gap * 0.5;
grid-template-columns: repeat(auto-fill, minmax(100px, 1fr)); grid-template-columns: repeat(auto-fill, minmax(100px, 1fr));
} }

View file

@ -12,7 +12,7 @@
flex-direction: column; flex-direction: column;
& > * { & > * {
margin: $gap/2 0; margin: $gap*0.5 0;
&:first-child { margin-top: 0; } &:first-child { margin-top: 0; }
&:last-child { margin-bottom: 0; } &:last-child { margin-bottom: 0; }
@ -32,7 +32,7 @@
} }
& > * { & > * {
margin: 0 $gap / 2; margin: 0 $gap * 0.5;
&:first-child { margin-left: 0; } &:first-child { margin-left: 0; }
&:last-child { margin-right: 0; } &:last-child { margin-right: 0; }

View file

@ -8,7 +8,7 @@
flex-wrap: wrap; flex-wrap: wrap;
&> * { &> * {
margin: $gap / 2; margin: $gap * 0.5;
} }
} }

View file

@ -4,7 +4,7 @@
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
justify-content: flex-start; justify-content: flex-start;
padding: 0 $gap / 2; padding: 0 $gap * 0.5;
} }
.tab { .tab {

View file

@ -15,7 +15,7 @@
touch-action: none; touch-action: none;
& > * { & > * {
margin: 0 $gap / 2; margin: 0 $gap * 0.5;
pointer-events: all; pointer-events: all;
touch-action: auto; touch-action: auto;

View file

@ -4,7 +4,7 @@
@include outer_shadow(); @include outer_shadow();
height: $upload_button_height; height: $upload_button_height;
border-radius: ($upload_button_height / 2) !important; border-radius: ($upload_button_height * 0.5) !important;
position: relative; position: relative;
border-radius: $radius; border-radius: $radius;
cursor: pointer; cursor: pointer;
@ -49,7 +49,7 @@
top: 0; top: 0;
left: 0; left: 0;
z-index: 1; z-index: 1;
border-radius: ($upload_button_height / 2) !important; border-radius: ($upload_button_height * 0.5) !important;
background: 50% 50% no-repeat; background: 50% 50% no-repeat;
background-size: cover; background-size: cover;
will-change: transform; will-change: transform;

View file

@ -70,7 +70,7 @@
svg { svg {
fill: currentColor; fill: currentColor;
margin-right: $gap / 2; margin-right: $gap * 0.5;
margin-top: 1px; margin-top: 1px;
} }
} }

View file

@ -144,7 +144,7 @@
height: 20px; height: 20px;
font: $font_12_semibold; font: $font_12_semibold;
padding: 0 15px; padding: 0 15px;
border-radius: $radius / 2; border-radius: $radius * 0.5;
&:global(.round) { &:global(.round) {
border-radius: 10px; border-radius: 10px;
@ -153,7 +153,7 @@
.mini { .mini {
height: 26px; height: 26px;
border-radius: $radius / 2; border-radius: $radius * 0.5;
&:global(.round) { &:global(.round) {
border-radius: 14px; border-radius: 14px;
@ -204,13 +204,13 @@
} }
.icon_left { .icon_left {
margin-right: $gap / 2 !important; margin-right: $gap * 0.5 !important;
width: 20px; width: 20px;
height: 20px; height: 20px;
} }
.icon_right { .icon_right {
margin-left: $gap / 2 !important; margin-left: $gap * 0.5 !important;
width: 20px; width: 20px;
height: 20px; height: 20px;
} }

View file

@ -34,20 +34,20 @@
.error { .error {
position: absolute; position: absolute;
font: $font_12_semibold; font: $font_12_semibold;
padding: 0 $gap / 2; padding: 0 $gap * 0.5;
border-radius: 4px; border-radius: 4px;
color: white; color: white;
background-color: $red; background-color: $red;
bottom: 0; bottom: 0;
right: $gap / 2; right: $gap * 0.5;
transform: translate(0, 50%); transform: translate(0, 50%);
} }
.title { .title {
position: absolute; position: absolute;
top: $gap; top: $gap;
left: $gap / 2; left: $gap * 0.5;
padding: 0 $gap / 2; padding: 0 $gap * 0.5;
transform: translate(0, 0) scale(1); transform: translate(0, 0) scale(1);
font: $input_font; font: $input_font;
transition: transform 0.25s; transition: transform 0.25s;

View file

@ -3,7 +3,7 @@
.wrap { .wrap {
@include outer_shadow; @include outer_shadow;
background: url('../../../sprites/boris_lab.svg') 50% 50% no-repeat; background: url('/images/boris_lab.svg') 50% 50% no-repeat;
background-size: cover; background-size: cover;
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;

View file

@ -1,7 +1,7 @@
@import "src/styles/variables.scss"; @import "src/styles/variables.scss";
.wrap { .wrap {
padding: $lab_gap / 2 $lab_gap 0; padding: $lab_gap * 0.5 $lab_gap 0;
line-height: 1.3em; line-height: 1.3em;
@include tablet { @include tablet {
@ -9,6 +9,6 @@
line-height: 1.3em; line-height: 1.3em;
font: $font_16_regular; font: $font_16_regular;
padding: 0 $lab_gap_mobile; padding: 0 $lab_gap_mobile;
margin: $lab_gap_mobile / 2 0; margin: $lab_gap_mobile * 0.5 0;
} }
} }

View file

@ -5,7 +5,7 @@
border-radius: $radius; border-radius: $radius;
background-color: $content_bg; background-color: $content_bg;
padding: $gap / 2; padding: $gap * 0.5;
} }
.group { .group {
@ -18,6 +18,6 @@
} }
& > * { & > * {
margin: $gap / 2; margin: $gap * 0.5;
} }
} }

View file

@ -2,7 +2,7 @@
.item { .item {
flex: 0 0 auto; flex: 0 0 auto;
padding: $gap / 2; padding: $gap * 0.5;
fill: currentColor; fill: currentColor;
color: darken(white, 50%); color: darken(white, 50%);
transition: color 0.25s; transition: color 0.25s;

View file

@ -28,6 +28,6 @@
} }
.content { .content {
padding: $gap / 2 0; padding: $gap * 0.5 0;
text-decoration: none; text-decoration: none;
} }

View file

@ -5,6 +5,6 @@
flex-wrap: wrap; flex-wrap: wrap;
& > * { & > * {
margin: $gap / 2; margin: $gap * 0.5;
} }
} }

View file

@ -58,5 +58,3 @@
} }
} }
} }
#preload_shade>

View file

@ -19,7 +19,7 @@
box-sizing: border-box; box-sizing: border-box;
&:global(.logo) { &:global(.logo) {
height: (54px * 1.5) + $gap / 2; height: (54px * 1.5) + $gap * 0.5;
background: $red_gradient; background: $red_gradient;
background-size: 140px; background-size: 140px;
font-weight: 600; font-weight: 600;

View file

@ -30,7 +30,7 @@
} }
.text { .text {
margin-left: $gap / 2; margin-left: $gap * 0.5;
} }
.placeholder { .placeholder {

View file

@ -47,7 +47,7 @@ div.thumb {
.title { .title {
text-transform: uppercase; text-transform: uppercase;
padding: $gap / 2; padding: $gap * 0.5;
box-sizing: border-box; box-sizing: border-box;
align-items: flex-start; align-items: flex-start;
justify-content: flex-start; justify-content: flex-start;

View file

@ -95,6 +95,6 @@ $outgoing_color: $comment_bg;
.deleted { .deleted {
background: mix($red, $content_bg, 50%); background: mix($red, $content_bg, 50%);
border-radius: $radius $radius $radius 0; border-radius: $radius $radius $radius 0;
padding: $gap / 2; padding: $gap * 0.5;
z-index: 2; z-index: 2;
} }

View file

@ -36,7 +36,7 @@ $pad_usual: mix(white, $content_bg, 10%);
border-radius: 4px; border-radius: 4px;
font: $font_10_semibold; font: $font_10_semibold;
line-height: 12px; line-height: 12px;
padding: 2px $gap / 2; padding: 2px $gap * 0.5;
text-transform: uppercase; text-transform: uppercase;
} }
} }

View file

@ -27,6 +27,6 @@ $row_height: 24px;
.scroll { .scroll {
overflow: hidden; overflow: hidden;
padding: 0 0 $gap / 2; padding: 0 0 $gap * 0.5;
border-radius: 4px; border-radius: 4px;
} }

View file

@ -9,7 +9,7 @@ $big: 1.2;
cursor: default; cursor: default;
height: $tag_height; height: $tag_height;
background: $tag_bg; background: $tag_bg;
border-radius: ($tag_height / 2) 3px 3px ($tag_height / 2); border-radius: ($tag_height * 0.5) 3px 3px ($tag_height * 0.5);
font: $font_14_semibold; font: $font_14_semibold;
align-self: flex-start; align-self: flex-start;
position: relative; position: relative;
@ -28,7 +28,7 @@ $big: 1.2;
&:global(.big) { &:global(.big) {
height: $tag_height * $big; height: $tag_height * $big;
font: $font_16_semibold; font: $font_16_semibold;
border-radius: ($tag_height * $big / 2) 3px 3px ($tag_height * $big / 2); border-radius: ($tag_height * $big * 0.5) 3px 3px ($tag_height * $big * 0.5);
.hole { .hole {
width: $tag_height * $big; width: $tag_height * $big;

View file

@ -5,7 +5,7 @@
} }
.check { .check {
padding: $gap 0 0 $gap / 2; padding: $gap 0 0 $gap * 0.5;
font: $font_12_medium; font: $font_12_medium;
display: flex; display: flex;
align-items: center; align-items: center;

View file

@ -6,15 +6,15 @@ div.wrap {
margin-right: 0; margin-right: 0;
@include tablet { @include tablet {
padding: 0 $gap / 2; padding: 0 $gap * 0.5;
} }
} }
.column { .column {
background-clip: padding-box; background-clip: padding-box;
box-sizing: border-box; box-sizing: border-box;
padding: 0 $gap / 2; padding: 0 $gap * 0.5;
margin-top: -$gap / 2; margin-top: -$gap * 0.5;
@include tablet { @include tablet {
padding: 0; padding: 0;

View file

@ -5,7 +5,7 @@
} }
.tags.tags { .tags.tags {
margin: 0 -$gap / 2; margin: 0 -$gap * 0.5;
} }
.heroes { .heroes {
@ -21,5 +21,5 @@
} }
.updates { .updates {
padding: 0 $gap / 4 $gap * 2; padding: 0 $gap * 0.25 $gap * 2;
} }

View file

@ -11,7 +11,7 @@
.buttons { .buttons {
background: transparentize(black, 0.8); background: transparentize(black, 0.8);
border-radius: $radius; border-radius: $radius;
padding: $gap / 2; padding: $gap * 0.5;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
@ -64,7 +64,7 @@
&__name { &__name {
font: $font_16_semibold; font: $font_16_semibold;
padding-left: $gap / 2; padding-left: $gap * 0.5;
} }
&__drop { &__drop {
@ -82,6 +82,6 @@
} }
.info { .info {
padding: $gap $gap / 2; padding: $gap $gap * 0.5;
font: $font_14_regular; font: $font_14_regular;
} }

View file

@ -8,7 +8,7 @@
overflow: auto; overflow: auto;
& > * { & > * {
margin: $gap / 2 0; margin: $gap * 0.5 0;
&:last-child { &:last-child {
margin-top: 0; margin-top: 0;

View file

@ -1,3 +1,5 @@
@use "sass:math";
@import "src/styles/variables"; @import "src/styles/variables";
.wrap { .wrap {
@ -7,7 +9,7 @@
flex-direction: column; flex-direction: column;
} }
$cols: $content_width / $cell; $cols: math.div($content_width, $cell);
.container { .container {
@include container; @include container;

View file

@ -3,12 +3,12 @@
.wrap { .wrap {
display: grid; display: grid;
grid-template-columns: 3fr 1fr; grid-template-columns: 3fr 1fr;
column-gap: $gap/2; column-gap: $gap*0.5;
@include tablet { @include tablet {
grid-template-columns: 1fr; grid-template-columns: 1fr;
grid-auto-flow: row; grid-auto-flow: row;
padding: 0 $gap / 2; padding: 0 $gap * 0.5;
} }
} }
@ -40,15 +40,15 @@
.content { .content {
min-width: 0; min-width: 0;
margin-left: -$gap / 2; margin-left: -$gap * 0.5;
@include tablet { @include tablet {
margin-left: 0; margin-left: 0;
padding-bottom: $gap / 2; padding-bottom: $gap * 0.5;
} }
} }
.head { .head {
padding: 0 $gap / 2; padding: 0 $gap * 0.5;
display: none; display: none;
} }

View file

@ -1,4 +1,6 @@
@use "sass:math";
@mixin outer_shadow() { @mixin outer_shadow() {
box-shadow: box-shadow:
inset transparentize(white, 0.95) 1px 1px, inset transparentize(white, 0.95) 1px 1px,
@ -96,7 +98,7 @@
@content; @content;
& > * { & > * {
margin: $gap/2 0 !important; margin: $gap*0.5 0 !important;
&:first-child { &:first-child {
margin-top: 0 !important; margin-top: 0 !important;
@ -115,7 +117,7 @@
} }
@mixin blur($color: $content_bg, $radius: 15px, $opacity: 0.5) { @mixin blur($color: $content_bg, $radius: 15px, $opacity: 0.5) {
background: transparentize($color, $opacity / 1.5); background: transparentize($color, math.div($opacity, 1.5));
backdrop-filter: blur($radius); backdrop-filter: blur($radius);
-webkit-backdrop-filter: blur($radius); -webkit-backdrop-filter: blur($radius);
@ -172,7 +174,7 @@
@mixin editor_round_button { @mixin editor_round_button {
width: $upload_button_height; width: $upload_button_height;
height: $upload_button_height; height: $upload_button_height;
border-radius: ($upload_button_height / 2) !important; border-radius: ($upload_button_height * 0.5) !important;
flex: 0 0 $upload_button_height; flex: 0 0 $upload_button_height;
position: relative; position: relative;
border-radius: $radius; border-radius: $radius;

View file

@ -1,3 +1,5 @@
@use "sass:math";
@import "../variables"; @import "../variables";
$margin: 1em; $margin: 1em;
@ -5,7 +7,7 @@ $margin: 1em;
.wrapper { .wrapper {
blockquote { blockquote {
border-left: 4px solid $wisegreen; border-left: 4px solid $wisegreen;
padding: $margin / 2 0; padding: $margin * 0.5 0;
margin-bottom: $margin; margin-bottom: $margin;
color: $wisegreen; color: $wisegreen;
font-size: 0.9em; font-size: 0.9em;
@ -55,10 +57,10 @@ $margin: 1em;
h5, h4, h3, h2, h1 { h5, h4, h3, h2, h1 {
line-height: 1.2em; line-height: 1.2em;
margin: $margin * 1.5 0 $margin / 2; margin: $margin * 1.5 0 $margin * 0.5;
&:first-child { &:first-child {
margin-top: $margin / 4; margin-top: $margin * 0.25;
} }
} }
@ -68,7 +70,7 @@ $margin: 1em;
margin-bottom: $margin; margin-bottom: $margin;
li { li {
margin: $margin/3 0; margin: math.div($margin, 3) 0;
} }
} }

1166
yarn.lock

File diff suppressed because it is too large Load diff