Skip to content

Commit

Permalink
Merge pull request #1 from primefaces/master
Browse files Browse the repository at this point in the history
Bringing fork up to date
  • Loading branch information
JacobSiegle authored Aug 8, 2018
2 parents 1fc79a3 + 189a80d commit 1dfd259
Show file tree
Hide file tree
Showing 489 changed files with 17,699 additions and 7,225 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ 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

# e2e
/e2e/*.js
Expand Down
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,28 @@ PrimeNG is available at NPM, if you have an existing application run the followi

```
npm install primeng --save
npm install primeicons --save
```

#### Angular CLI Integration

Add PrimeNG and FontAwesome as a dependencies.
Add PrimeNG and PrimeIcons as a dependencies.

```
"dependencies": {
//...
"primeng": "^5.2.5",
"font-awesome": "^4.7.0"
"primeng": "^6.0.0.beta.1",
"primeicons": "^1.0.0-beta.6"
},
```

Configure required styles at the styles section, example below uses the Omega theme.

```
"styles": [
"../node_modules/font-awesome/css/font-awesome.min.css",
"../node_modules/primeng/resources/themes/omega/theme.css",
"../node_modules/primeng/resources/primeng.min.css",
"node_modules/primeng/resources/themes/omega/theme.css",
"node_modules/primeng/resources/primeng.min.css",
"node_modules/primeicons/primeicons.css",
//...
],
```
Expand Down
8 changes: 6 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"src/styles.css"
],
"scripts": [
"./node_modules/jquery/dist/jquery.slim.js",
"./node_modules/moment/moment.js",
"./node_modules/chart.js/dist/Chart.js",
"./node_modules/fullcalendar/dist/fullcalendar.js",
Expand Down Expand Up @@ -118,7 +117,12 @@
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "primeng:serve"
}
},
"configurations": {
"production": {
"devServerTarget": "primeng:serve:production"
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
Expand Down
1 change: 1 addition & 0 deletions exports/toast.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './components/toast/toast';
7 changes: 7 additions & 0 deletions exports/toast.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/* Shorthand */
"use strict";
function __export(m) {
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
}
Object.defineProperty(exports, "__esModule", { value: true });
__export(require("./components/toast/toast"));
1,918 changes: 977 additions & 941 deletions package-lock.json

Large diffs are not rendered by default.

41 changes: 20 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "primeng",
"version": "6.0.0-rc.1-SNAPSHOT",
"version": "6.1.1-SNAPSHOT",
"license": "MIT",
"scripts": {
"ng": "ng",
Expand All @@ -15,23 +15,22 @@
"url": "https://github.com/primefaces/primeng.git"
},
"devDependencies": {
"@angular/animations": "^6.0.2",
"@angular/common": "^6.0.2",
"@angular/compiler": "^6.0.2",
"@angular/core": "^6.0.2",
"@angular/forms": "^6.0.2",
"@angular/http": "^6.0.2",
"@angular/platform-browser": "^6.0.2",
"@angular/platform-browser-dynamic": "^6.0.2",
"@angular/router": "^6.0.2",
"@angular/animations": "^6.1.0",
"@angular/common": "^6.1.0",
"@angular/compiler": "^6.1.0",
"@angular/core": "^6.1.0",
"@angular/forms": "^6.1.0",
"@angular/http": "^6.1.0",
"@angular/platform-browser": "^6.1.0",
"@angular/platform-browser-dynamic": "^6.1.0",
"@angular/router": "^6.1.0",
"core-js": "^2.5.4",
"rxjs": "^6.0.0",
"zone.js": "^0.8.26",
"@angular/compiler-cli": "^6.0.2",
"@angular-devkit/build-angular": "~0.6.3",
"typescript": "~2.7.2",
"@angular/cli": "~6.0.3",
"@angular/language-service": "^6.0.2",
"zone.js": "~0.8.26",
"@angular-devkit/build-angular": "~0.7.0",
"@angular/cli": "~6.1.1",
"@angular/compiler-cli": "^6.1.0",
"@angular/language-service": "^6.1.0",
"@types/jasmine": "~2.8.6",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
Expand All @@ -40,16 +39,17 @@
"jasmine-spec-reporter": "~4.2.1",
"karma": "~1.7.1",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~1.4.2",
"karma-coverage-istanbul-reporter": "~2.0.0",
"karma-jasmine": "~1.1.1",
"karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.3.0",
"ts-node": "~5.0.1",
"tslint": "~5.9.1",
"typescript": "~2.7.2",
"chart.js": "2.7.1",
"del": "2.2.0",
"font-awesome": "4.7.0",
"fullcalendar": "^3.5.0",
"fullcalendar": "4.0.0-alpha",
"gulp": "^3.9.1",
"gulp-concat": "2.6.0",
"gulp-flatten": "^0.2.0",
Expand All @@ -58,11 +58,10 @@
"gulp-uglifycss": "1.0.6",
"install": "0.10.1",
"intl": "1.2.5",
"jquery": "3.2.1",
"moment": "2.18.1",
"moment": "2.19.3",
"prismjs": "1.6.0",
"quill": "1.1.8",
"web-animations-js": "2.3.1",
"primeicons": "1.0.0-beta.6"
"primeicons": "1.0.0-beta.10"
}
}
5 changes: 5 additions & 0 deletions src/app/components/accordion/accordion.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
padding: .5em;
}

.ui-accordion .ui-accordion-toggle-icon,
.ui-accordion .ui-accordion-header-text {
vertical-align: middle;
}

.ui-accordion .ui-accordion-content {
padding: 1em;
border-top: 0;
Expand Down
Loading

0 comments on commit 1dfd259

Please sign in to comment.