summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSimen Heggestøyl <simenheg@gmail.com>2016-02-01 21:38:25 +0100
committerSimen Heggestøyl <simenheg@gmail.com>2016-02-01 21:38:25 +0100
commit1d07dcd720890764774770e0ad24ba11a5bda233 (patch)
tree4a72b7ed09878ea11b9a012044c60c6d6fe0a4f9 /test
parentee8b46699523cc1dea7b3d03e3cccff3d62cd847 (diff)
downloademacs-1d07dcd720890764774770e0ad24ba11a5bda233.tar.gz
Highlight two additional SCSS keywords
* lisp/textmodes/css-mode.el (css-bang-ids): New defconst holding CSS identifiers on the form !foo. (scss-bang-ids): New defconst holding SCSS identifiers on the form !foo. (css--font-lock-keywords): Highlight the new SCSS bang identifiers in `font-lock-builtin-face'. * test/indent/css-mode.css: Add bang rule test case. * test/indent/scss-mode.css: Add test cases for the introduced bang rules.
Diffstat (limited to 'test')
-rw-r--r--test/indent/css-mode.css2
-rw-r--r--test/indent/scss-mode.scss11
2 files changed, 11 insertions, 2 deletions
diff --git a/test/indent/css-mode.css b/test/indent/css-mode.css
index 24166b00282..3a00739bfc4 100644
--- a/test/indent/css-mode.css
+++ b/test/indent/css-mode.css
@@ -9,7 +9,7 @@ article[role="main"] {
}
a, b:hover, c {
- color: black;
+ color: black !important;
}
a, b:hover { /* bug:20282 */
diff --git a/test/indent/scss-mode.scss b/test/indent/scss-mode.scss
index 02a4a98a8c5..e1ec90a5299 100644
--- a/test/indent/scss-mode.scss
+++ b/test/indent/scss-mode.scss
@@ -40,11 +40,20 @@ p.#{$name} var
}
article[role="main"] {
$toto: 500 !global;
- float: left;
+ $var-with-default: 300 !default;
+ float: left !important;
width: 600px / 888px * 100%;
height: 100px / 888px * 100%;
}
+%placeholder {
+ color: #f0f0f0;
+}
+
+button {
+ @extend %placeholder !optional;
+}
+
@import 'reset';
@mixin border-radius($radius) {