Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/primefaces/primeng
Browse files Browse the repository at this point in the history
  • Loading branch information
mehmetcetin01140 committed Nov 28, 2023
2 parents c1148c2 + 65823e4 commit f48f392
Show file tree
Hide file tree
Showing 38 changed files with 366 additions and 456 deletions.
4 changes: 2 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"polyfills": ["zone.js"],
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": ["src/favicon.png", "src/assets"],
"assets": ["src/assets"],
"styles": ["src/styles.scss"],
"scripts": ["./node_modules/prismjs/prism.js", "./node_modules/prismjs/components/prism-typescript.js", "./node_modules/prismjs/components/prism-scss.js", "./node_modules/prismjs/components/prism-bash.js"],
"allowedCommonJsDependencies": ["chart.js", "xlsx", "jspdf-autotable", "file-saver", "jspdf", "quill", "core-js", "raf", "rgbcolor"]
Expand Down Expand Up @@ -92,7 +92,7 @@
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"assets": ["src/favicon.png", "src/assets"],
"assets": ["src/assets"],
"styles": ["src/styles.scss", "src/assets/components/themes/lara-light-blue/theme.css"],
"scripts": []
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/showcase/layout/config/app.config.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p-sidebar [visible]="isActive" (visibleChange)="onVisibleChange($event)" position="right"
styleClass="layout-config w-full sm:w-26rem layout-config">
styleClass="layout-config w-full sm:w-26rem">
<div class="p-2">
<section class="pb-4 flex align-items-center justify-content-between border-bottom-1 surface-border">
<span class="text-xl font-semibold">Scale</span>
Expand Down
7 changes: 3 additions & 4 deletions src/app/showcase/layout/doc/codeeditor/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import sdk from '@stackblitz/sdk';
import { getAngularApp } from './templates';
import { Props } from './templates';
import { Props, getAngularApp } from './templates';

const useCodeSandbox = (props: Props) => {
const { files } = getAngularApp(props);
Expand Down Expand Up @@ -38,7 +37,7 @@ const useStackBlitz = (props: Props) => {
title: title,
template: 'node',
description:
'PrimeNG is an open source UI library for Angular featuring a rich set of 90+ components, a theme designer, various theme alternatives such as Material, Bootstrap, Tailwind, premium templates and professional support. In addition, it integrates with PrimeBlock, which has 370+ ready to use UI blocks to build spectacular applications in no time.',
'PrimeNG is an open source UI library for Angular featuring a rich set of 80+ components, a theme designer, various theme alternatives such as Material, Bootstrap, Tailwind, premium templates and professional support. In addition, it integrates with PrimeBlock, which has 370+ ready to use UI blocks to build spectacular applications in no time.',
files: _files
};

Expand All @@ -50,4 +49,4 @@ const useStackBlitz = (props: Props) => {
sdk.openProject(project, options);
};

export { useStackBlitz, useCodeSandbox };
export { useCodeSandbox, useStackBlitz };
7 changes: 3 additions & 4 deletions src/app/showcase/layout/doc/codeeditor/templates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const app_dependencies = pkg ? pkg.devDependencies : {};
const PrimeNG = {
version: '17.0.0-beta.1',
description:
'PrimeNG is an open source UI library for Angular featuring a rich set of 90+ components, a theme designer, various theme alternatives such as Material, Bootstrap, Tailwind, premium templates and professional support. In addition, it integrates with PrimeBlock, which has 370+ ready to use UI blocks to build spectacular applications in no time.'
'PrimeNG is an open source UI library for Angular featuring a rich set of 80+ components, a theme designer, various theme alternatives such as Material, Bootstrap, Tailwind, premium templates and professional support. In addition, it integrates with PrimeBlock, which has 370+ ready to use UI blocks to build spectacular applications in no time.'
};

const getAppDependencies = () => {
Expand Down Expand Up @@ -343,8 +343,7 @@ const angular_json = `
"karmaConfig": "karma.conf.js",
"inlineStyleLanguage": "scss",
"assets": [
"src/assets",
"src/favicon.png"
"src/assets"
],
"stylePreprocessorOptions": {
"includePaths": [
Expand Down Expand Up @@ -682,7 +681,7 @@ export class AppModule {}`;
<link href="https://unpkg.com/primeflex/primeflex.css" rel="stylesheet" />
<link href="https://unpkg.com/primeicons/primeicons.css" rel="stylesheet" />
<link href="https://unpkg.com/[email protected]/dist/quill.snow.css" rel="stylesheet" />
<link rel="icon" type="image/x-icon" href="favicon.ico">
<link rel="icon" type="image/x-icon" href="https://primefaces.org/cdn/primeng/images/favicon.png">
</head>
<body>
<${selector}></${selector}>
Expand Down
Loading

1 comment on commit f48f392

@vercel
Copy link

@vercel vercel bot commented on f48f392 Nov 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.