Skip to content

fix: Update decprecated scss code #1126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: Update decprecated scss code #1126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
925d0b1
fix: Update decprecated scss code
rakilkim Nov 13, 2024
789e917
ci: Make linter happy
rakilkim Nov 14, 2024
5c9d60b
ci: Make linter happy
rakilkim Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions src/styles/ClassBox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@import 'variables.scss';
@use 'variables';


.class-thumbnail {
display: block;
width: 80px;
height: 80px;
margin-left: 0px;
margin-left: 0;
}

.class-box {
Expand All @@ -17,13 +17,14 @@
width: 95%;
border-radius: 5px;
margin: 10px;
color: $theme-dark;
color: variables.$theme-dark;
cursor: pointer;
flex: 0 0 auto;
@include themify($themes) {
color: themed("cardColor");
background-color: themed("cardBackground");
border: themed("cardBorder")

@include variables.themify(variables.$themes) {
color: variables.themed("cardColor");
background-color: variables.themed("cardBackground");
border: variables.themed("cardBorder")
}
}

Expand Down Expand Up @@ -59,15 +60,17 @@
width: 100%;
margin: 0;
padding: 0;
@include themify($themes){
border-top: 1px solid themed("cardDivider");

@include variables.themify(variables.$themes){
border-top: 1px solid variables.themed("cardDivider");
}
}

.sketch-button-divider {
width: 1px;
@include themify($themes){
border: 0.5px solid themed("cardDivider");

@include variables.themify(variables.$themes){
border: 0.5px solid variables.themed("cardDivider");
}
}

Expand Down
5 changes: 2 additions & 3 deletions src/styles/ClassPage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'variables.scss';
@use 'variables';

.add-sketch-box {
height: 153px;
Expand Down Expand Up @@ -47,8 +47,7 @@
justify-content: flex-start;
align-items: flex-start;
width: 100%;
overflow-y: auto;
overflow-x: hidden;
overflow: hidden auto;
}

.class-sketches-grid-row {
Expand Down
44 changes: 27 additions & 17 deletions src/styles/Classes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
@import 'variables.scss';
@use 'variables';

.classes-container {
flex-direction: column;
align-items: flex-start;
@include themify($themes) {
background-color: themed("backgroundColor");
color: themed("color");

@include variables.themify(variables.$themes) {
background-color: variables.themed("backgroundColor");
color: variables.themed("color");
}

justify-content: flex-start;
position: absolute;
transition: all 0.5s ease;
Expand Down Expand Up @@ -41,8 +43,9 @@
flex-direction: row;
justify-content: flex-start;
align-items: center;
@include themify($themes) {
border-bottom: 1px solid themed("color");

@include variables.themify(variables.$themes) {
border-bottom: 1px solid variables.themed("color");
}
}

Expand All @@ -61,37 +64,43 @@
.join-class-input {
font-size: 1.7em;
line-height: normal;
padding: 0.25rem 0.1rem 0px 0.1rem;
border: 0px;
@include themify($themes) {
background-color: themed("backgroundColor");
color: themed("color");
padding: 0.25rem 0.1rem 0;
border: 0;

@include variables.themify(variables.$themes) {
background-color: variables.themed("backgroundColor");
color: variables.themed("color");
}

border-bottom: 2px solid #dddcdf;
outline: 0;
width: 50%;
min-width: 300px;
max-width: 500px;
transition: all 0.5s ease;

// color: #dddcdf;
display: inline-block;
}

.join-class-button {
display: inline-block;
font-family: "Josefin Slab", sans-serif;

// color: #dddcdf;
color: white;

// background-color: #857e8f;
@include themify($themes) {
background-color: themed("accentBackground");
@include variables.themify(variables.$themes) {
background-color: variables.themed("accentBackground");
}

cursor: pointer;
overflow: visible;
text-align: center;
border: 0;
border-radius: 3px;
padding: 8px 10px 8px 10px;
padding: 8px 10px;
margin-left: 1rem;
font-size: 1.7em;
line-height: 1.4em;
Expand All @@ -114,7 +123,7 @@
.join-class-plus {
display: block;
width: 80px;
margin-left: 0px;
margin-left: 0;
}

.no-classes-container {
Expand All @@ -123,7 +132,8 @@
width: 100%;
height: 100%;
padding: 1em;
@include themify($themes) {
color: themed("color");

@include variables.themify(variables.$themes) {
color: variables.themed("color");
}
}
58 changes: 29 additions & 29 deletions src/styles/CustomCM.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "variables";
@use "variables";

.CodeMirror-lines {
cursor: default;
Expand All @@ -8,56 +8,56 @@

/* comments, e.g. // # /* */
.cm-comment {
@include themify($themes) {
color: themed("comment");
@include variables.themify(variables.$themes) {
color: variables.themed("comment");
}
}

/* import for while in etc */
span.cm-keyword {
@include themify($themes) {
color: themed("keyword");
@include variables.themify(variables.$themes) {
color: variables.themed("keyword");
}
}

/* e.g. var *blah*, blah will be colored */
span.cm-def {
@include themify($themes) {
color: themed("def");
@include variables.themify(variables.$themes) {
color: variables.themed("def");
}
}

/* e.g. var *blah*, blah will be colored */
span.cm-variable {
@include themify($themes) {
color: themed("variable");
@include variables.themify(variables.$themes) {
color: variables.themed("variable");
}
}

/* for python: print, range, all built-in functions */
.cm-builtin {
@include themify($themes) {
color: themed("builtin");
@include variables.themify(variables.$themes) {
color: variables.themed("builtin");
}
}

/* 1 2 -11 etc */
.cm-number {
@include themify($themes) {
color: themed("number");
@include variables.themify(variables.$themes) {
color: variables.themed("number");
}
}

/* + - > < etc */
.cm-operator {
@include themify($themes) {
color: themed("operator");
@include variables.themify(variables.$themes) {
color: variables.themed("operator");
}
}

.cm-property {
@include themify($themes) {
color: themed("property");
@include variables.themify(variables.$themes) {
color: variables.themed("property");
}
}

Expand All @@ -70,9 +70,9 @@ span.cm-variable {
max-width: inherit;
min-height: inherit;

@include themify($themes) {
background-color: themed("backgroundColor");
color: themed("color");
@include variables.themify(variables.$themes) {
background-color: variables.themed("backgroundColor");
color: variables.themed("color");
}
}

Expand All @@ -89,9 +89,9 @@ span.cm-variable {
white-space: normal;
width: 41px;

@include themify($themes) {
background-color: themed("backgroundColor");
color: themed("color");
@include variables.themify(variables.$themes) {
background-color: variables.themed("backgroundColor");
color: variables.themed("color");
}
}

Expand All @@ -101,8 +101,8 @@ span.cm-variable {
text-align: left;
width: 23px;

@include themify($themes) {
color: themed("color");
@include variables.themify(variables.$themes) {
color: variables.themed("color");
}
}

Expand Down Expand Up @@ -132,7 +132,7 @@ span.cm-variable {

/* required for safari because it places the ::after element differently than chrome/fiefox;
taken from https://stackoverflow.com/questions/16348489/is-there-a-css-hack-for-safari-only-not-chrome */
@media not all and (min-resolution: 0.001dpcm) {
@media not all and (resolution >= 0.001dpcm) {
.CodeMirror-cursor::after {
margin-top: 2px;
}
Expand All @@ -146,9 +146,9 @@ taken from https://stackoverflow.com/questions/16348489/is-there-a-css-hack-for-
.CodeMirror-matchingbracket {
text-decoration: none;

@include themify($themes) {
background-color: themed("highlightBracket");
color: themed('color');
@include variables.themify(variables.$themes) {
background-color: variables.themed("highlightBracket");
color: variables.themed('color');
}
}

Expand Down
Loading
Loading