Merge pull request #1155 from Horsetopus/development

Added values for flex and pointer-events

Author: elsassph

FlashDevelop/Bin/Debug/Settings/Languages/CSS.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Scintilla xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<keyword-classes>
 		<keyword-class name="css1-keywords">
@@ -33,6 +33,7 @@
 			voice-stress voice-volume hanging-punctuation punctuation-trim text-align-last text-justify text-outline text-overflow text-shadow text-wrap word-break 
 			word-wrap transform transform-origin transform-style perspective perspective-origin backface-visibility transition transition-property transition-duration 
 			transition-timing-function transition-delay appearance box-sizing icon nav-down nav-index nav-left nav-right nav-up outline-offset resize user-select
+			flex flex-basis flex-direction flex-flow flex-grow flex-shrink flex-wrap align-content align-items align-self justify-content order pointer-events
 		</keyword-class>
 		<keyword-class name="css-values">
 			auto none normal italic oblique small-caps bold bolder lighter xx-small x-small small medium large x-large xx-large larger smaller 
@@ -47,7 +48,9 @@
 			semi-expanded expanded extra-expanded ultra-expanded caption icon menu message-box small-caption status-bar separate show hide once crosshair 
 			default pointer move text wait help e-resize ne-resize nw-resize n-resize se-resize sw-resize s-resize w-resize silent x-soft soft medium loud x-loud 
 			spell-out mix left-side far-left center-left center-right far-right right-side behind leftwards rightwards below level above higher lower x-slow slow 
-			medium fast x-fast faster slower male female child x-low low high x-high code digits continous
+			medium fast x-fast faster slower male female child x-low low high x-high code digits continous fill max-content min-content fit-content content
+			row row-reverse column column-reverse nowrap wrap wrap-reverse flex-start flex-end space-between space-around stretch visiblePainted visibleFill
+			visibleStroke painted stroke all
 			ActiveBorder ActiveCaption AppWorkspace Background ButtonFace ButtonHighlight ButtonShadow InactiveCaptionText ButtonText CaptionText GrayText Highlight 
 			HighlightText InactiveBorder InactiveCaption InfoBackground InfoText Menu MenuText Scrollbar ThreeDDarkShadow ThreeDFace ThreeDHighlight ThreeDLightShadow 
 			ThreeDShadow Window WindowFrame WindowText
@@ -114,4 +117,4 @@
 			<!-- COLORING_END -->
 		</language>
 	</languages>
-</Scintilla>
+</Scintilla>

FlashDevelop/Bin/Debug/Tools/css/completion.ini

@@ -31,6 +31,9 @@ pseudo=link visited hover active focus target enabled disabled checked indetermi
 prefixes=-webkit- -moz- -ms- -o-
 
 [Properties]
+align-content=flex-start flex-end center space-between space-around stretch
+align-items=flex-start flex-end center baseline stretch
+align-self=auto flex-start flex-end center baseline stretch
 alignment-adjust=auto baseline before-edge text-before-edge middle central after-edge text-after-edge ideographic alphabetic hanging mathematical <percentage> <length>
 alignment-baseline=baseline use-script before-edge text-before-edge after-edge text-after-edge central middle ideographic alphabetic hanging mathematical
 animation=<animation-name> <animation-duration> <animation-timing-function> <animation-delay> <animation-iteration-count> <animation-direction>
@@ -81,11 +84,18 @@ counter-increment=<identifier> <integer> none
 counter-reset=<identifier> <integer> none
 cursor=<uri> auto crosshair default pointer move e-resize ne-resize nw-resize n-resize se-resize sw-resize s-resize w-resize text wait help progress
 direction=ltr rtl
-display=inline block list-item inline-block table inline-table table-row-group table-header-group table-footer-group table-row table-column-group table-column table-cell table-caption none
+display=inline block list-item inline-block table inline-table table-row-group table-header-group table-footer-group table-row table-column-group table-column table-cell table-caption none flex
 dominant-baseline=auto use-script no-change reset-size alphabetic hanging ideographic mathematical central middle text-after-edge text-before-edge
 empty-cells=show hide
 fit=fill hidden meet slice
 fit-position=<percentage> <length> top center bottom left center right auto
+flex=<flex-grow> <flex-shrink> <flex-basis> none
+flex-basis=<length> <percentage> auto fill max-content min-content fit-content content
+flex-direction=row row-reverse column column-reverse
+flex-flow=<flex-direction> <flex-wrap>
+flex-grow=<number>
+flex-shrink=<number>
+flex-wrap=nowrap wrap wrap-reverse
 float=left right none
 font=<font-style> <font-variant> <font-weight> <font-size> <line-height> <font-family> caption icon menu message-box small-caption status-bar
 font-family=<family-name> <generic-family>
@@ -94,6 +104,7 @@ font-style=normal italic oblique
 font-variant=normal small-caps
 font-weight=normal bold bolder lighter 100 200 300 400 500 600 700 800 900
 height=<length> <percentage> auto
+justify-content=flex-start flex-end center space-between space-around
 left=<length> <percentage> auto
 letter-spacing=normal <length>
 line-height=normal <number> <length> <percentage>
@@ -111,6 +122,7 @@ min-height=<length> <percentage>
 min-width=<length> <percentage>
 nbsp-mode=normal space
 opacity=<number>
+order=<integer>
 orphans=<integer>
 outline=<outline-color> <outline-style> <outline-width>
 outline-color=<color> invert
@@ -127,6 +139,7 @@ page-break-before=auto always avoid left right
 page-break-inside=avoid auto
 perspective=none <distance>
 perspective-origin=center left top right bottom
+pointer-events=auto none visiblePainted visibleFill visibleStroke visible painted fill stroke all
 position=static relative absolute fixed
 quotes=<string> none
 right=<length> <percentage> auto