Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9cbd154

Browse files
Merge pull request#8790 from haidubogdan/t_issue_7010_unknown_css_properties
Add missing CSS properties : margin-block, pading-block, scroll-behavior, conic-gradient, filter-effects
2 parentscde0836 +ec9501d commit9cbd154

File tree

17 files changed

+357
-12
lines changed

17 files changed

+357
-12
lines changed

‎ide/css.editor/external/binaries-list‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717
901D8F815922C435D985DA3814D20E34CC7622CB css21-spec.zip
18-
72202BE5A9B984CDE2B6FEE9A86DDBABA7922384 css3-spec.zip
18+
FD81D87A20BB39C331599193E1CFBA0F64D4693E css3-spec.zip

‎ide/css.editor/external/css3-spec-howtocreate.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@ http://www.w3.org/TR/css-break-3/ \
5454
http://www.w3.org/TR/css-position-3/ \
5555
http://www.w3.org/TR/css-sizing-3/ \
5656
http://www.w3.org/TR/css-contain-3/ \
57-
http://www.w3.org/TR/css-text-4/
57+
http://www.w3.org/TR/css-text-4/ \
58+
http://www.w3.org/TR/filter-effects-1/ \
59+
http://www.w3.org/TR/css-logical-1/ \
60+
http://www.w3.org/TR/css-overflow-3/ \
61+
http://www.w3.org/TR/css-scroll-snap-1/
5862

5963
3. Check that the contents still looks sane and mirroring worked
6064

‎ide/css.editor/src/org/netbeans/modules/css/editor/module/main/Bundle.properties‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ css-module-displayname-fragmentation=Fragmentation
5656
css-module-displayname-positioning=Positioning
5757
css-module-displayname-sizing=Sizing
5858
css-module-displayname-contain=Containment
59+
css-module-displayname-logical=Logical properties and values
60+
css-module-displayname-overflow=Overflow
61+
css-module-displayname-filter_effects=Filter Effects
62+
css-module-displayname-scroll_snap=Scroll Snap
5963

6064
completion-help-no-documentation-found=No documentation found
6165

‎ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,10 @@ public class DefaultCssEditorModule extends CssEditorModule {
8888
module("text","http://www.w3.org/TR/css-text-4"),//NOI18N
8989
module("writing_modes","http://www.w3.org/TR/css3-writing-modes"),//NOI18N
9090
module("generated_content_for_paged_media","http://www.w3.org/TR/css3-gcpm"),//NOI18N
91+
module("filter_effects","http://www.w3.org/TR/filter-effects-1"),//NOI18N
9192
module("fonts","http://www.w3.org/TR/css3-fonts"),//NOI18N
9293
module("basic_box_model","http://www.w3.org/TR/css3-box"),//NOI18N
94+
module("logical","https://www.w3.org/TR/css-logical-1"),//NOI18N
9395
module("speech","http://www.w3.org/TR/css3-speech"),//NOI18N
9496
module("grid","http://www.w3.org/TR/css3-grid"),//NOI18N
9597
module("flexible_box_layout","http://www.w3.org/TR/css3-flexbox"),//NOI18N
@@ -105,6 +107,8 @@ public class DefaultCssEditorModule extends CssEditorModule {
105107
module("alignment","http://www.w3.org/TR/css-align-3"),//NOI18N
106108
module("fragmentation","http://www.w3.org/TR/css-break-3"),//NOI18N
107109
module("positioning","http://www.w3.org/TR/css-position-3"),//NOI18N
110+
module("overflow","http://www.w3.org/TR/css-overflow-3"),//NOI18N
111+
module("scroll_snap","http://www.w3.org/TR/css-scroll-snap-1"),//NOI18N
108112
module("sizing","http://www.w3.org/TR/css-sizing-3"),//NOI18N
109113
module("contain","http://www.w3.org/TR/css-contain-3"),//NOI18N
110114
module("other",null)//NOI18N
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
# CSS Box Filter Effects Module
19+
20+
$category=filter_effects
21+
22+
backdrop-filter =<filter-value-list> | <var-fn> | none
23+
24+
@filter-value-list =[<filter-function> | <uri>]+
25+
26+
@filter-function =<blur> | <brightness> | <contrast> | <drop-shadow> | \
27+
<grayscale> | <hue-rotate> | <invert> | <opacity> | <sepia> | <saturate>
28+
@blur =blur ( <length> )
29+
@brightness =brightness ( <length-percentage> )
30+
@contrast =contrast ( <length-percentage> )
31+
@drop-shadow =drop-shadow ( [ <color>? && <length>{2,3} ] )
32+
@grayscale =grayscale ( <length-percentage> )
33+
@hue-rotate =hue-rotate ( <angle> | <var-fn> )
34+
@invert =invert ( <length-percentage>)
35+
@opacity =opacity ( <length-percentage> )
36+
@sepia =sepia ( <length-percentage>)
37+
@saturate =saturate ( <length-percentage> )

‎ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/image_values.properties‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ $category=images
3333
#-image-combination= cross-fade ( <image>, <image>, <percentage> )
3434
@image-combination=cross-fade ( [!anything]* )
3535

36-
@gradient=[ <linear-gradient> | <radial-gradient> | <repeating-linear-gradient> | <repeating-radial-gradient> ]
36+
@gradient=[ <linear-gradient> | <radial-gradient> | <conic-gradient> | <repeating-linear-gradient> | <repeating-radial-gradient> ]
3737

3838
@linear-gradient =linear-gradient ( \
3939
[ [ \
@@ -56,6 +56,19 @@ $category=images
5656
<color-stop> [ , <color-stop>]+ \
5757
)
5858

59+
@conic-gradient =conic-gradient ( <angular-color> [, <angular-color> ]* )
60+
61+
@angular-color =[ <color> [<angle-percentage>{1,2}]? ] | [ [ from <angle-percentage> ]? [ [ at [<bg-pos> ]{1,2} ] |\
62+
[ in [ <rectangular-color-space> | [ <polar-color-space> <hue-interpolation-method>? ] ] ] ]? ]
63+
64+
@angle-percentage =<angle> | <percentage> | <var-fn>
65+
66+
@rectangular-color-space =srgb | srgb-linear | display-p3 | display-p3-linear | a98-rgb | prophoto-rgb | rec2020 | lab | oklab | <var-fn>
67+
68+
@polar-color-space =hsl | hwb | lch | oklch | <var-fn>
69+
70+
@hue-interpolation-method =[ shorter | longer | increasing | decreasing | <var-fn> ] hue
71+
5972
@repeating-linear-gradient=repeating-linear-gradient ( \
6073
[ [ \
6174
[ [top | bottom] || [left | right] ] \
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
# CSS logical properties and values
19+
20+
$category=logical
21+
22+
# --- margin ---
23+
margin-block=<box-edge-size>{1,2}
24+
margin-block-start=<box-edge-size>
25+
margin-block-end=<box-edge-size>
26+
27+
margin-inline=<box-edge-size>{1,2}
28+
margin-inline-start=<box-edge-size>
29+
margin-inline-end=<box-edge-size>
30+
31+
# --- padding ---
32+
33+
padding-block=<box-edge-size>{1,2}
34+
padding-block-start=<box-edge-size>
35+
padding-block-end=<box-edge-size>
36+
37+
padding-inline=<box-edge-size>{1,2}
38+
padding-inline-start=<box-edge-size>
39+
padding-inline-end=<box-edge-size>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
# CSS Box Overflow Module
19+
20+
$category=overflow
21+
22+
scroll-behavior =auto | smooth | <var-fn>
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
# CSS Scroll Snap Module
19+
20+
$category=scroll_snap
21+
22+
scroll-snap-type =none | [ [ x | y | block | inline | both | <var-fn>] [ mandatory | proximity | <var-fn> ]? ]
23+
scroll-snap-align =[ none | start | end | center | <var-fn> ]{1,2}
24+
25+
scroll-margin =<scroll-margin-value>{1,4}
26+
scroll-padding =<scroll-padding-value>{1,4}
27+
28+
scroll-margin-block =<scroll-margin-value>{1,2}
29+
scroll-padding-block =<scroll-padding-value>{1,2}
30+
31+
scroll-margin-inline =<scroll-margin-value>{1,2}
32+
scroll-padding-inline =<scroll-padding-value>{1,2}
33+
34+
scroll-margin-top =<scroll-margin-value>
35+
scroll-margin-bottom =<scroll-margin-value>
36+
scroll-margin-left =<scroll-margin-value>
37+
scroll-margin-right =<scroll-margin-value>
38+
39+
scroll-padding-top =<scroll-padding-value>
40+
scroll-padding-bottom =<scroll-padding-value>
41+
scroll-padding-left =<scroll-padding-value>
42+
scroll-padding-right =<scroll-padding-value>
43+
44+
@scroll-margin-value =<length>
45+
@scroll-padding-value =<length-percentage> | auto
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
packageorg.netbeans.modules.css.editor.module.main;
20+
21+
publicclassFilterEffectsModuleTestextendsCssModuleTestBase {
22+
23+
publicFilterEffectsModuleTest(StringtestName) {
24+
super(testName);
25+
}
26+
27+
publicvoidtestBackdropFilter() {
28+
assertPropertyDeclaration("backdrop-filter: none");
29+
assertPropertyDeclaration("backdrop-filter: url(\"common-filters.svg#filter\")");
30+
assertPropertyDeclaration("backdrop-filter: var(--filter-val)");
31+
assertPropertyDeclaration("backdrop-filter: blur(2px)");
32+
assertPropertyDeclaration("backdrop-filter: brightness(60%)");
33+
assertPropertyDeclaration("backdrop-filter: contrast(40%)");
34+
assertPropertyDeclaration("backdrop-filter: drop-shadow(4px 4px 10px blue)");
35+
assertPropertyDeclaration("backdrop-filter: drop-shadow(red 1rem 1rem 10px)");
36+
assertPropertyDeclaration("backdrop-filter: grayscale(var(--percentage))");
37+
assertPropertyDeclaration("backdrop-filter: grayscale(30%)");
38+
}
39+
40+
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp