Skip to content

Commit

Permalink
Try to fix stylelint
Browse files Browse the repository at this point in the history
  • Loading branch information
Evgeny Talagaev committed Sep 25, 2023
1 parent 436e1ec commit ad37215
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 66 deletions.
6 changes: 3 additions & 3 deletions src/scss/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "./reset.scss";
@import "./main.scss";
@import "./additions.scss";
@import "./reset";
@import "./main";
@import "./additions";
65 changes: 9 additions & 56 deletions src/scss/main.scss
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
@font-face {
font-display: swap;
font-family: "Roboto";
font-family: Roboto;
font-style: normal;
font-weight: 100;
src: url("../fonts/roboto-100.woff2") format("woff2");
}

@font-face {
font-display: swap;
font-family: "Roboto";
font-family: Roboto;
font-style: normal;
font-weight: 400;
src: url("../fonts/roboto-400.woff2") format("woff2");
}

@font-face {
font-display: swap;
font-family: "Roboto";
font-family: Roboto;
font-style: normal;
font-weight: 500;
src: url("../fonts/roboto-500.woff2") format("woff2");
}

@font-face {
font-display: swap;
font-family: "Roboto";
font-family: Roboto;
font-style: normal;
font-weight: 700;
src: url("../fonts/roboto-700.woff2") format("woff2");
Expand All @@ -36,25 +36,21 @@
--b-radius: 5px;
--on-focus: 0 0 0 2px var(--m-color-1);
--on-error: 0 0 0 2px tomato;

--m-color-1: #784dd4;
--m-color-1-1: #5e36b2;
--m-color-1-2: #d6c4ff;
--m-color-1-3: #f2ecff;
--m-color-2: #2872e0;
--m-color-2-1: #1e5bb4;

--t-l-grey-1: #9c9c9c;
--t-l-grey-2: #d9d9d9;
--t-l-grey-3: #f0f0f0;

--bg-whiteSmoke: #f5f5f5;

--bg-whiteSmoke: #f5f5f5; /* stylelint-disable-line */
--t-duration: 0.3s;
}

body {
font: 400 16px/1.5 "Roboto", sans-serif;
font: 400 16px/1.5 Roboto, sans-serif;
color: #000;
}

Expand Down Expand Up @@ -97,7 +93,7 @@ body {
top: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.65);
background-color: rgb(0 0 0 / 65%);

&__inner {
position: relative;
Expand Down Expand Up @@ -139,9 +135,6 @@ body {
transform: translate(-50%, -50%) rotate(45deg);
}
}

&__content {
}
}

/* ----- .user-settings ----- */
Expand Down Expand Up @@ -185,18 +178,12 @@ body {
width: 100%;
}

&__s {
}

&__list {
}

&__list-item {
display: flex;
justify-content: space-between;
align-content: center;
padding-bottom: 7px;
border-bottom: 1px solid #eeeeee;
border-bottom: 1px solid #eee;
font-weight: 500;
font-size: 15px;

Expand All @@ -217,9 +204,6 @@ body {
}
}

&__list-item-name {
}

&__list-item-value {
color: var(--t-l-grey-1);

Expand Down Expand Up @@ -259,9 +243,6 @@ body {
&__bottom {
margin-top: 75px;
}

&__link {
}
}

%d-scroll {
Expand Down Expand Up @@ -368,19 +349,13 @@ body {
margin-top: 15px;
}

&__f {
}

&__s {
margin-left: 15px;
}

&__s-f {
display: flex;
justify-content: space-between;

.name {
}
}

&__time {
Expand All @@ -394,7 +369,6 @@ body {
&__last-message {
font-size: 14px;
color: var(--t-l-grey-1);

display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
Expand Down Expand Up @@ -439,15 +413,9 @@ body {
align-items: center;
}

&__f-f {
}

&__f-s {
margin-left: 15px;
}

&__s {
}
}

/* ----- .chat-area ----- */
Expand Down Expand Up @@ -476,24 +444,15 @@ body {
background-color: var(--t-l-grey-2);
}

&__f-f {
}

&__info {
display: flex;
align-items: center;
}

&__info-l {
}

&__info-r {
margin-left: 15px;
}

&__f-s {
}

&__s {
padding-top: 15px;
padding-bottom: 15px;
Expand Down Expand Up @@ -546,9 +505,6 @@ body {
}
}

&__conversation {
}

&__conversation-item {
display: flex;
flex-direction: column;
Expand All @@ -558,9 +514,6 @@ body {
}
}

&__conversation-received {
}

&__conversation-sent {
align-items: flex-end;

Expand Down Expand Up @@ -597,7 +550,7 @@ body {
width: 400px;
max-width: 100%;
border-radius: var(--b-radius);
background-color: var(--bg-whiteSmoke);
background-color: var(--bg-whiteSmoke); /* stylelint-disable-line */

&__title {
margin-bottom: 70px;
Expand Down
11 changes: 4 additions & 7 deletions src/scss/reset.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
- The "symbol *" part is to solve Firefox SVG sprite bug
- The "html" element is excluded, otherwise a bug in Chrome breaks the CSS hyphens property (https://github.com/elad2412/the-new-css-reset/issues/36)
*/
*:where(
:not(html, iframe, canvas, img, svg, video, audio):not(svg *, symbol *)
) {
*:where(:not(html, iframe, canvas, img, svg, video, audio, svg *, symbol *)) {
all: unset;
display: revert;
}
Expand Down Expand Up @@ -49,7 +47,7 @@ table {
/* Safari - solving issue when using user-select:none on the <body> text input doesn't working */
input,
textarea {
-webkit-user-select: auto;
user-select: auto;
}

/* revert the 'white-space' property for textarea elements on Safari */
Expand All @@ -59,7 +57,6 @@ textarea {

/* minimum style to allow to style meter element */
meter {
-webkit-appearance: revert;
appearance: revert;
}

Expand All @@ -86,13 +83,13 @@ meter {

/* revert for bug in Chromium browsers
- fix for the content editable attribute will work properly.
- webkit-user-select: auto; added for Safari in case of using user-select:none on wrapper element*/
- webkit-user-select: auto; added for Safari in case of using user-select:none on wrapper element */
:where([contenteditable]:not([contenteditable="false"])) {
-moz-user-modify: read-write;
-webkit-user-modify: read-write;
overflow-wrap: break-word;
-webkit-line-break: after-white-space;
-webkit-user-select: auto;
user-select: auto;
}

/* apply back the draggable feature - exist only in Chromium and Safari */
Expand Down

0 comments on commit ad37215

Please sign in to comment.