aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/textmodes
diff options
context:
space:
mode:
authorTheodor Thornhill2021-09-03 08:14:48 +0200
committerLars Ingebrigtsen2021-09-03 08:14:48 +0200
commite588fa45ceb59a3eb04e67b32c55d0181c2a581a (patch)
tree0bb4088472b0334190145cef3c6122c347c9462e /lisp/textmodes
parent5ae02f90fe79d09357fa9fbc2673ba44e2e64a5e (diff)
downloademacs-e588fa45ceb59a3eb04e67b32c55d0181c2a581a.tar.gz
emacs-e588fa45ceb59a3eb04e67b32c55d0181c2a581a.zip
Add CSS Box Alignment Module Level 3 to css-mode
* lisp/textmodes/css-mode.el (css-property-alist): Consolidate `align-{contents, items, self}', as well as the corresponding values for `justify-{contents, items, self}' and `place-{contents, items, self}'. Values extracted from the flex part and into its own block (bug#50345).
Diffstat (limited to 'lisp/textmodes')
-rw-r--r--lisp/textmodes/css-mode.el38
1 files changed, 30 insertions, 8 deletions
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 3bcd9c97667..f406afb7b68 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -301,14 +301,38 @@
301 ("grid-template-columns" "none" track-list auto-track-list) 301 ("grid-template-columns" "none" track-list auto-track-list)
302 ("grid-template-rows" "none" track-list auto-track-list) 302 ("grid-template-rows" "none" track-list auto-track-list)
303 303
304 ;; CSS Box Alignment Module Level 3
305 ;; (https://www.w3.org/TR/css-align-3/#alignment-values)
306 ("align-content" "center" "start" "end" "flex-start" "flex-end"
307 "normal" "first" "last" "baseline" "space-between" "space-around"
308 "space-evenly" "stretch" "safe" "unsafe")
309 ("align-items" "normal" "stretch" "center" "start" "end"
310 "flex-start" "flex-end" "baseline" "first" "last" "baseline"
311 "safe" "unsafe")
312 ("align-self" "auto" "normal" "center" "start" "end"
313 "self-start" "self-end" "flex-start" "flex-end"
314 "baseline" "first" "last" "stretch" "safe" "unsafe")
315 ("justify-content" "center" "start" "end" "flex-start" "flex-end"
316 "left" "right" "normal" "space-between" "space-around"
317 "space-evenly" "stretch" "safe" "unsafe")
318 ("justify-items" "auto" "normal" "stretch" "center" "start" "end"
319 "flex-start" "flex-end" "self-start" "self-end" "left" "right"
320 "baseline" "first" "last" "legacy" "safe" "unsafe")
321 ("justify-self" "auto" "normal" "stretch" "center" "start" "end"
322 "flex-start" "flex-end" "self-start" "self-end" "left" "right"
323 "baseline" "first" "last" "safe" "unsafe")
324 ("place-content" "center" "start" "end" "left" "right" "flex-start"
325 "flex-end" "baseline" "first" "last" "space-evenly" "space-around"
326 "space-between")
327 ("place-items" "auto" "normal" "center" "start" "end"
328 "self-start" "self-end" "flex-start" "flex-end"
329 "left" "right" "baseline" "first" "last" "stretch")
330 ("place-self" "auto" "center" "start" "end" "self-start" "self-end"
331 "flex-start" "flex-end" "normal" "left" "right" "baseline"
332 "first" "last" "stretch")
333
304 ;; CSS Flexible Box Layout Module Level 1 334 ;; CSS Flexible Box Layout Module Level 1
305 ;; (https://www.w3.org/TR/css-flexbox-1/#property-index) 335 ;; (https://www.w3.org/TR/css-flexbox-1/#property-index)
306 ("align-content" "flex-start" "flex-end" "center" "space-between"
307 "space-around" "stretch")
308 ("align-items" "flex-start" "flex-end" "center" "baseline"
309 "stretch")
310 ("align-self" "auto" "flex-start" "flex-end" "center" "baseline"
311 "stretch")
312 ("flex" "none" flex-grow flex-shrink flex-basis) 336 ("flex" "none" flex-grow flex-shrink flex-basis)
313 ("flex-basis" "auto" "content" width) 337 ("flex-basis" "auto" "content" width)
314 ("flex-direction" "row" "row-reverse" "column" "column-reverse") 338 ("flex-direction" "row" "row-reverse" "column" "column-reverse")
@@ -316,8 +340,6 @@
316 ("flex-grow" number) 340 ("flex-grow" number)
317 ("flex-shrink" number) 341 ("flex-shrink" number)
318 ("flex-wrap" "nowrap" "wrap" "wrap-reverse") 342 ("flex-wrap" "nowrap" "wrap" "wrap-reverse")
319 ("justify-content" "flex-start" "flex-end" "center"
320 "space-between" "space-around")
321 ("order" integer) 343 ("order" integer)
322 344
323 ;; CSS Fonts Module Level 3 345 ;; CSS Fonts Module Level 3