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
@cetincakiroglu
cetincakiroglu committed Dec 6, 2023
2 parents d095ed2 + bf44a99 commit 7dda91d
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 15 deletions.
9 changes: 4 additions & 5 deletions src/app/showcase/data/news.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"id": 59,
"content": "🎉 Black Friday Sale! Up to 50% Off",
"linkText": "Buy Now",
"linkHref": "https://www.primefaces.org/store"
"id": 60,
"content": "Sakai Free Admin Template",
"linkText": "View Demo",
"linkHref": "https://primefaces.org/sakai-ng"
}

14 changes: 8 additions & 6 deletions src/app/showcase/pages/lts/lts.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,11 @@
<hr class="my-3 mx-0 border-top-1 border-none surface-border" />
<div class="flex gap-3 flex-wrap">
<div class="flex gap-3 flex-wrap">
<span class="text-2xl font-medium text-600 line-through">$249</span>
<span class="text-2xl font-bold text-900">$149</span>
<<<<<<< HEAD <span class="text-2xl font-medium text-600 line-through">$249</span>
<span class="text-2xl font-bold text-900">$149</span>
=======
<span class="text-2xl font-bold text-900">$249</span>
>>>>>>> prod
</div>
</div>
<hr class="my-3 mx-0 border-top-1 border-none surface-border" />
Expand All @@ -186,7 +189,7 @@
</li>
</ul>
<hr class="mb-3 mx-0 border-top-1 border-none surface-border mt-auto" />
<a href="https://www.primefaces.org/store/uikit.xhtml" pRipple
<a href="https://www.primefaces.org/store/lts.xhtml" pRipple
class="bg-blue-500 text-white hover:bg-blue-400 p-3 w-full border-round text-center transition-colors transition-duration-300 font-bold">Buy
Now</a>
</div>
Expand All @@ -201,8 +204,7 @@
<hr class="my-3 mx-0 border-top-1 border-none surface-border" />
<div class="flex gap-3 flex-wrap">
<div class="flex gap-3 flex-wrap">
<span class="text-2xl font-medium text-600 line-through">$990</span>
<span class="text-2xl font-bold text-900">$490</span>
<span class="text-2xl font-bold text-900">$990</span>
</div>
</div>
<hr class="my-3 mx-0 border-top-1 border-none surface-border" />
Expand All @@ -229,7 +231,7 @@
</li>
</ul>
<hr class="mb-3 mx-0 border-top-1 border-none surface-border" />
<a href="https://www.primefaces.org/store/uikit.xhtml" pRipple
<a href="https://www.primefaces.org/store/lts.xhtml" pRipple
class="bg-purple-500 text-white hover:bg-purple-400 p-3 w-full border-round text-center transition-colors transition-duration-300 font-bold">Buy
Now</a>
</div>
Expand Down
6 changes: 6 additions & 0 deletions src/app/showcase/pages/team/team.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@ <h1>Meet the Team</h1>
<span class="mb-2 text-xl font-bold">Burak Sağlam</span>
<span>Front-End Developer</span>
</div>
<div class="flex flex-column align-items-center flex-auto">
<img src="https://primefaces.org/cdn/primeng/images/team/taner.jpg" class="border-circle mb-4"
alt="Taner Engin" />
<span class="mb-2 text-xl font-bold">Taner Engin</span>
<span>Front-End Developer</span>
</div>
</div>
</div>
</div>
6 changes: 2 additions & 4 deletions src/app/showcase/pages/uikit/uikit.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,7 @@
<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-medium text-600 line-through">$99</span>
<span class="text-2xl font-bold text-900">$49</span>
<span class="text-2xl font-bold text-900">$99</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 @@ -208,8 +207,7 @@
<hr class="my-3 mx-0 border-top-1 border-none surface-border" />
<div class="flex gap-3 flex-wrap">
<div class="flex gap-3 flex-wrap">
<span class="text-2xl font-medium text-600 line-through">$249</span>
<span class="text-2xl font-bold text-900">$149</span>
<span class="text-2xl font-bold text-900">$249</span>
</div>
</div>
<hr class="my-3 mx-0 border-top-1 border-none surface-border" />
Expand Down

1 comment on commit 7dda91d

@vercel
Copy link

@vercel vercel bot commented on 7dda91d Dec 6, 2023

Choose a reason for hiding this comment

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

Deployment failed with the following error:

The value for maxDuration must be between 1 second and 10 seconds, in order to increase this limit upgrade your plan: https://vercel.com/pricing

Please sign in to comment.