Skip to content

Commit

Permalink
Merge branch 'prod'
Browse files Browse the repository at this point in the history
  • Loading branch information
cagataycivici committed Jun 1, 2023
2 parents 0475373 + ccd496e commit 229bb94
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 11 deletions.
8 changes: 4 additions & 4 deletions src/app/showcase/data/news.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"id": 53,
"content": "🚀 v15.4.3-lts and v14.2.6-lts are out!",
"linkText": "Learn More",
"linkHref": "https://primeng.org/lts",
"id": 55,
"content": "Summer Sale - Up to 50% Off at PrimeStore",
"linkText": "Buy Now",
"linkHref": "https://www.primefaces.org/store",
"backgroundStyle": "background-color:#3B82F6",
"textStyle": "color:#ffffff;font-weight:500",
"linkStyle": "color:#ffffff;font-weight:700",
Expand Down
6 changes: 3 additions & 3 deletions src/app/showcase/doc/theming/primeflexdoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import { Code } from '../../domain/code';
template: ` <section>
<app-docsectiontext [title]="title" [id]="id">
<p>
<a href="https://www.primefaces.org/primeflex/">PrimeFlex</a> is a lightweight responsive CSS utility library to accompany Prime UI libraries and static webpages as well. PrimeNG can be used with any CSS utility library like bootstrap
and tailwind however PrimeFlex has benefits like integration with PrimeNG themes usign CSS variables so that colors classes e.g. <i>bg-blue-500</i> receive the color code from the PrimeNG theme being used. PrimeNG follows the CSS
utility approach of PrimeFlex and currently does not provide an extended style property like <i>sx</i>. Same approach is also utilized in <a href="https://blocks.primeng.org">PrimeBlocks for PrimeNG</a> project as well.
<a href="https://primeflex.org/">PrimeFlex</a> is a lightweight responsive CSS utility library to accompany Prime UI libraries and static webpages as well. PrimeNG can be used with any CSS utility library like bootstrap and tailwind
however PrimeFlex has benefits like integration with PrimeNG themes usign CSS variables so that colors classes e.g. <i>bg-blue-500</i> receive the color code from the PrimeNG theme being used. PrimeNG follows the CSS utility approach
of PrimeFlex and currently does not provide an extended style property like <i>sx</i>. Same approach is also utilized in <a href="https://blocks.primeng.org">PrimeBlocks for PrimeNG</a> project as well.
</p>
</app-docsectiontext>
<div class="card flex flex-column md:flex-row md:justify-content-between row-gap-3">
Expand Down
2 changes: 1 addition & 1 deletion src/app/showcase/pages/landing/landing.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
</div>
</div>
</a>
<a href="https://primefaces.org/primeflex/" target="_blank">
<a href="https://primeflex.org/" target="_blank">
<div
class="hero-box w-10rem h-10rem md:w-12rem md:h-12rem animation flex ml-4 md:ml-0 align-items-center justify-content-center">
<div class="flex flex-column align-items-center">
Expand Down
8 changes: 6 additions & 2 deletions src/app/showcase/pages/uikit/uikit.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@
<div class="text-600 font-medium">For individual designers</div>
<hr class="my-3 mx-0 border-top-1 border-none surface-border" />
<div class="flex gap-3 flex-wrap">
<span class="text-2xl font-bold text-900">$99</span>
<span class="text-2xl font-bold text-600 line-through">$99</span>
<span class="text-2xl font-bold text-900">$49</span>
</div>
<hr class="my-3 mx-0 border-top-1 border-none surface-border" />
<ul class="list-none p-0 m-0 flex-grow-1 text-lg">
Expand Down Expand Up @@ -152,7 +153,10 @@
<div class="text-600 font-medium">For small teams</div>
<hr class="my-3 mx-0 border-top-1 border-none surface-border" />
<div class="flex gap-3 flex-wrap">
<span class="text-2xl font-bold text-900">$249</span>
<div class="flex gap-3 flex-wrap">
<span class="text-2xl font-bold text-600 line-through">$249</span>
<span class="text-2xl font-bold text-900">$149</span>
</div>
</div>
<hr class="my-3 mx-0 border-top-1 border-none surface-border" />
<ul class="list-none p-0 m-0 flex-grow-1 text-lg">
Expand Down
2 changes: 1 addition & 1 deletion src/assets/showcase/data/menu.json
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@
{
"name": "PrimeFlex CSS",
"icon": "pi pi-table",
"href": "https://www.primefaces.org/primeflex"
"href": "https://primeflex.org"
},
{
"name": "Support",
Expand Down

0 comments on commit 229bb94

Please sign in to comment.