diff options
| -rw-r--r-- | lisp/textmodes/css-mode.el | 5 | ||||
| -rw-r--r-- | test/manual/indent/css-mode.css | 7 | ||||
| -rw-r--r-- | test/manual/indent/scss-mode.scss | 14 |
3 files changed, 25 insertions, 1 deletions
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 458ed9f8bb2..45d750af755 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el | |||
| @@ -1208,7 +1208,10 @@ for determining whether point is within a selector." | |||
| 1208 | (smie-backward-sexp ";") | 1208 | (smie-backward-sexp ";") |
| 1209 | (smie-indent-virtual))) | 1209 | (smie-indent-virtual))) |
| 1210 | (`(:before . ,(or "{" "(")) | 1210 | (`(:before . ,(or "{" "(")) |
| 1211 | (if (smie-rule-hanging-p) (smie-rule-parent 0))))) | 1211 | (if (smie-rule-hanging-p) (smie-rule-parent 0))) |
| 1212 | (`(:after . ":-property") | ||
| 1213 | (when (smie-rule-hanging-p) | ||
| 1214 | css-indent-offset)))) | ||
| 1212 | 1215 | ||
| 1213 | ;;; Completion | 1216 | ;;; Completion |
| 1214 | 1217 | ||
diff --git a/test/manual/indent/css-mode.css b/test/manual/indent/css-mode.css index 0845c02c299..79b082188f5 100644 --- a/test/manual/indent/css-mode.css +++ b/test/manual/indent/css-mode.css | |||
| @@ -65,8 +65,15 @@ div::before { | |||
| 65 | 5.0, 6.0 | 65 | 5.0, 6.0 |
| 66 | ); | 66 | ); |
| 67 | } | 67 | } |
| 68 | |||
| 68 | @font-face { | 69 | @font-face { |
| 69 | src: url("Sans-Regular.eot") format("eot"), | 70 | src: url("Sans-Regular.eot") format("eot"), |
| 70 | url("Sans-Regular.woff") format("woff"), | 71 | url("Sans-Regular.woff") format("woff"), |
| 71 | url("Sans-Regular.ttf") format("truetype"); | 72 | url("Sans-Regular.ttf") format("truetype"); |
| 72 | } | 73 | } |
| 74 | |||
| 75 | @font-face { | ||
| 76 | src: | ||
| 77 | url("Sans-Regular.eot") format("eot"), | ||
| 78 | url("Sans-Regular.woff") format("woff"); | ||
| 79 | } | ||
diff --git a/test/manual/indent/scss-mode.scss b/test/manual/indent/scss-mode.scss index f9911ad11b7..a3dd41eeb47 100644 --- a/test/manual/indent/scss-mode.scss +++ b/test/manual/indent/scss-mode.scss | |||
| @@ -92,3 +92,17 @@ div:last-child { | |||
| 92 | "Nimbus Sans L", sans-serif; | 92 | "Nimbus Sans L", sans-serif; |
| 93 | } | 93 | } |
| 94 | } | 94 | } |
| 95 | |||
| 96 | body { | ||
| 97 | font: | ||
| 98 | 15px "Helvetica Neue", Helvetica, Arial, | ||
| 99 | "Nimbus Sans L", sans-serif; | ||
| 100 | font-family: | ||
| 101 | sans-serif; | ||
| 102 | |||
| 103 | article { | ||
| 104 | font: | ||
| 105 | 15px "Helvetica Neue", Helvetica, Arial, | ||
| 106 | "Nimbus Sans L", sans-serif; | ||
| 107 | } | ||
| 108 | } | ||