Merge pull request #3 from primefaces/master

Sync fork
primefaces · Oct 2, 2018 · 6b470f8 · 6b470f8
2 parents 0b14f68 + cf753ac
commit 6b470f8
Show file tree

Hide file tree

Showing 143 changed files with 23,189 additions and 13,058 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,9 +40,8 @@ testem.log
 /src/assets/components/themes/**/*.css
 /src/assets/components/themes/**/*.map
 !/src/assets/components/themes/bootstrap/theme.css
-!/src/assets/components/themes/nova-light/theme.css
-!/src/assets/components/themes/nova-dark/theme.css
-!/src/assets/components/themes/nova-colored/theme.css
+!/src/assets/components/themes/nova-*/theme.css
+!/src/assets/components/themes/luna-*/theme.css
 
 # e2e
 /e2e/*.js

diff --git a/angular.json b/angular.json
@@ -27,6 +27,7 @@
                 "node_modules/fullcalendar/dist/fullcalendar.min.css",
                 "node_modules/quill/dist/quill.snow.css",
                 "node_modules/primeicons/primeicons.css",
+                "node_modules/primeflex/primeflex.css",
                 "node_modules/font-awesome/css/font-awesome.min.css",
                 "src/styles.css"
               ],

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "primeng",
-    "version": "6.1.3-SNAPSHOT",
+    "version": "6.1.5-SNAPSHOT",
     "license": "MIT",
     "scripts": {
         "ng": "ng",
@@ -62,6 +62,7 @@
         "prismjs": "1.6.0",
         "quill": "1.1.8",
         "web-animations-js": "2.3.1",
-        "primeicons": "1.0.0-beta.10"
+        "primeicons": "1.0.0-beta.10",
+        "primeflex": "1.0.0-rc.1"
     }
 }