diff --git a/CHANGELOG.md b/CHANGELOG.md index 49e835d6..8c2df7ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ - MediaWiki, see #1925 (@sorairolake) - The `requirements.txt` syntax has been removed due to incompatible license requirements. - Dart, new highlighter, see #1959 (@Ersikan) +- SCSS and Sass syntaxes updated, see #1766 (@Enselic) ## New themes diff --git a/assets/syntaxes/02_Extra/SCSS_Sass b/assets/syntaxes/02_Extra/SCSS_Sass index 63819a1a..d3d94046 160000 --- a/assets/syntaxes/02_Extra/SCSS_Sass +++ b/assets/syntaxes/02_Extra/SCSS_Sass @@ -1 +1 @@ -Subproject commit 63819a1ab6b2075360933b2cfe41b416de0e3c26 +Subproject commit d3d94046409db6fbbc9d51dea52b589ecc9d3d48 diff --git a/tests/syntax-tests/highlighted/SCSS/example.scss b/tests/syntax-tests/highlighted/SCSS/example.scss index 7ba949d8..06244d5e 100644 --- a/tests/syntax-tests/highlighted/SCSS/example.scss +++ b/tests/syntax-tests/highlighted/SCSS/example.scss @@ -1,20 +1,20 @@ @import 'fonts'; $theme_dark: ( - "background-color": null, + "background-color": null, ); $theme_main: ( - "text-size": 3em, + "text-size": 3em,  "text-color": black, - "text-shadow": #36ad 0px 0px 3px, + "text-shadow": #36ad 0px 0px 3px,  "card-background": #d6f, - "card-shadow": #11121212 0px 0px 2px 1px, - "card-padding": 1rem, - "card-margin": 0.5in, - "image-width": 600px, - "image-height": 100vh, + "card-shadow": #11121212 0px 0px 2px 1px, + "card-padding": 1rem, + "card-margin": 0.5in, + "image-width": 600px, + "image-height": 100vh,  "background-color": #dedbef, - "i-ran-out-of-placeholders-for-units": (1vw 100% 60pt), + "i-ran-out-of-placeholders-for-units": (1vw 100% 60pt), ); $current_theme: $theme_main; @@ -51,12 +51,12 @@  header[data-selectable="false"] {  -webkit-user-select: none;  -moz-user-select: none; - -ms-user-select: /* CSS comment */ none; + -ms-user-select: /* CSS comment */ none;  cursor: default !important; // SCSS comment  }    > div { - border: #04f 1px solid; + border: #04f 1px solid;    &::after {  content: 'Pseudo'; @@ -67,12 +67,12 @@ } @keyframes rotate { - 0% { - transform: rotate(0deg); + 0% { + transform: rotate(0deg);  } - 50% { - transform: rotate(180deg)} - 100% {transform: rotate(0rad);} + 50% { + transform: rotate(180deg)} + 100% {transform: rotate(0rad);} } @font-face { diff --git a/tests/syntax-tests/highlighted/Sass/example.sass b/tests/syntax-tests/highlighted/Sass/example.sass index 845a2b94..89bcb0ca 100644 --- a/tests/syntax-tests/highlighted/Sass/example.sass +++ b/tests/syntax-tests/highlighted/Sass/example.sass @@ -1,22 +1,22 @@ @import "fonts" $theme_dark: ( - "background-color": null + "background-color": null ) $theme_main: ( - "text-size": 3em + "text-size": 3em  "text-color": black - "text-shadow": #36ad 0px 0px 3px + "text-shadow": #36ad 0px 0px 3px  "card-background": #d6f - "card-shadow": #11121212 0px 0px 2px 1px - "card-padding": 1rem - "card-margin": 0.5in - "image-width": 600px - "image-height": 100vh + "card-shadow": #11121212 0px 0px 2px 1px + "card-padding": 1rem + "card-margin": 0.5in + "image-width": 600px + "image-height": 100vh  "background-color": #dedbef  "i-ran-out-of-placeholders-for-units": ( - 1vw 100% 60pt + 1vw 100% 60pt  ) ) @@ -49,12 +49,12 @@  header[data-selectable="false"]  -webkit-user-select: none  -moz-user-select: none - -ms-user-select: /* CSS comment */ none - cursor: default !important // Sass comment + -ms-user-select: /* CSS comment */ none + cursor: default !important // Sass comment  > div - border: #04f 1px solid + border: #04f 1px solid  &::after  content: "Pseudo" @@ -62,12 +62,12 @@  box-sizing: border-box @keyframes rotate - 0% - transform: rotate(0deg) - 50% - transform: rotate(180deg) - 100% - transform: rotate(0rad) + 0% + transform: rotate(0deg) + 50% + transform: rotate(180deg) + 100% + transform: rotate(0rad) @font-face  font-family: "Example Font"