This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 9cdcfb18bb CSS: Implemented position:sticky new 658e17362d Merge pull request #4480 from troizet/implement_position_sticky 9cdcfb18bb is described below commit 9cdcfb18bba8f5640fd461eea8d202a8779c4504 Author: Alexey Borokhvostov <troi...@gmail.com> AuthorDate: Mon Aug 8 22:41:53 2022 +0700 CSS: Implemented position:sticky --- .../css/editor/module/main/Bundle.properties | 1 + .../editor/module/main/DefaultCssEditorModule.java | 3 ++- .../main/properties/default_module.properties | 2 -- .../module/main/properties/positioning.properties | 22 ++++++++++++++++++++++ .../css/lib/api/properties/PropertyCategory.java | 1 + 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/Bundle.properties b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/Bundle.properties index 87510e9ff6..acef45abdc 100644 --- a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/Bundle.properties +++ b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/Bundle.properties @@ -53,6 +53,7 @@ css-module-displayname-lists_and_counters=List and Counters css-module-displayname-paged_media=Paged Media css-module-displayname-alignment=Box Alignment css-module-displayname-fragmentation=Fragmentation +css-module-displayname-positioning=Positioning completion-help-no-documentation-found=No documentation found diff --git a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java index 4fb61b5522..8b63bd8fee 100644 --- a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java +++ b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java @@ -104,7 +104,8 @@ public class DefaultCssEditorModule extends CssEditorModule { module("presentation_levels", "http://www.w3.org/TR/css3-preslev"), //NOI18N module("generated_and_replaced_content", "http://www.w3.org/TR/css3-content"), //NOI18N module("alignment", "http://www.w3.org/TR/css-align-3"), //NOI18N - module("fragmentation", "http://www.w3.org/TR/css-break-3") //NOI18N + module("fragmentation", "http://www.w3.org/TR/css-break-3"), //NOI18N + module("positioning", "http://www.w3.org/TR/css3-positioning") //NOI18N }; private static Map<String, PropertyDefinition> propertyDescriptors; diff --git a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/default_module.properties b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/default_module.properties index f7dcbd92eb..3da6a2f30a 100644 --- a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/default_module.properties +++ b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/default_module.properties @@ -72,8 +72,6 @@ pitch=!frequency | x-low | low | medium | high | x-high play-during=<uri> [ mix || repeat ]? | auto | none | <var-fn> -position=static | relative | absolute | fixed | <var-fn> - quotes=[<string> <string>]+ | none | <var-fn> richness=<number> diff --git a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/positioning.properties b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/positioning.properties new file mode 100644 index 0000000000..9867713492 --- /dev/null +++ b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/positioning.properties @@ -0,0 +1,22 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +#CSS Positioning Module + +$category=positioning + +position=static | relative | absolute | fixed | sticky | <var-fn> diff --git a/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/PropertyCategory.java b/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/PropertyCategory.java index 44bcb6f935..7ac45bb679 100644 --- a/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/PropertyCategory.java +++ b/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/PropertyCategory.java @@ -54,6 +54,7 @@ public enum PropertyCategory { MARQUEE, MULTI_COLUMN_LAYOUT, PAGED_MEDIA, + POSITIONING, RUBY, SPEECH, TEXT, --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists