This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 2388352 Merge pull request #3373 from t-oster/feature-sass-default
new d5149f3 [NETBEANS-5449] Support namespaced variables in SCSS files
new 64a623e [NETBEANS-2005] Add definitions from CSS Box Alignment module
new f1b3e72 [NETBEANS-6063] Fix property mapping for CSS Fragmentation
module
new 72fc8f3 Merge pull request #3359 from matthiasblaesing/css_parser_fix
The 6323 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ide/css.editor/external/binaries-list | 2 +-
ide/css.editor/external/css3-spec-howtocreate.txt | 4 +-
.../css/editor/module/main/Bundle.properties | 4 +-
.../editor/module/main/DefaultCssEditorModule.java | 46 +-
.../module/main/properties/alignment.properties | 55 +
.../properties/backgrounds_and_borders.properties | 6 +-
.../main/properties/flexible_box_layout.properties | 10 -
...d_media.properties => fragmentation.properties} | 21 +-
.../main/properties/multi-column_layout.properties | 20 +-
.../module/main/properties/paged_media.properties | 7 -
.../editor/module/main/AlignmentModuleTest.java | 44 +
.../module/main/FlexibleBoxLayoutModuleTest.java | 1 +
.../editor/module/main/MultiColumnLayoutTest.java | 29 +-
.../src/org/netbeans/modules/css/lib/Css3.g | 4 +-
.../org/netbeans/modules/css/lib/Css3Lexer.java | 1162 +--
.../org/netbeans/modules/css/lib/Css3Parser.java | 8578 ++++++++++----------
.../css/lib/api/properties/PropertyCategory.java | 30 +-
.../modules/css/lib/Css3ParserScssTest.java | 140 +-
18 files changed, 5288 insertions(+), 4875 deletions(-)
create mode 100644
ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/alignment.properties
copy
ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/{paged_media.properties
=> fragmentation.properties} (65%)
create mode 100644
ide/css.editor/test/unit/src/org/netbeans/modules/css/editor/module/main/AlignmentModuleTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
