Merge branch 'master' into PR6055

primefaces · Mar 18, 2024 · eb6cdad · eb6cdad
2 parents 0ed7712 + 2cf4c38
commit eb6cdad
Show file tree

Hide file tree

Showing 199 changed files with 26,740 additions and 5,538 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@ tsconfig.tsbuildinfo
 # misc
 .DS_Store
 *.pem
+*.code-workspace
 
 # debug
 npm-debug.log*

diff --git a/components/doc/accordion/theming/tailwinddoc.js b/components/doc/accordion/theming/tailwinddoc.js
@@ -34,7 +34,7 @@ const Tailwind = {
                     'dark:bg-gray-900 dark:border-blue-900/40 dark:text-white/80 dark:hover:bg-gray-800/80 dark:focus:shadow-[inset_0_0_0_0.2rem_rgba(147,197,253,0.5)]', // Dark mode
                     'hover:border-gray-300 hover:bg-gray-200 hover:text-gray-800', // Hover
                     'focus:outline-none focus:outline-offset-0 focus:shadow-[inset_0_0_0_0.2rem_rgba(191,219,254,1)]', // Focus
-                    { 'rounded-br-md rounded-bl-md': !context.active, 'rounded-br-0 rounded-bl-0 text-gray-800': context.active } // Condition
+                    { 'rounded-br-md rounded-bl-md': !context.selected, 'rounded-br-0 rounded-bl-0 text-gray-800': context.selected } // Condition
                 )
             }),
             headerIcon: 'inline-block mr-2',

diff --git a/components/doc/badge/severitydoc.js b/components/doc/badge/severitydoc.js
@@ -10,6 +10,8 @@ export function SeverityDoc(props) {
 <Badge value="4" severity="info"></Badge>
 <Badge value="12" severity="warning"></Badge>
 <Badge value="3" severity="danger"></Badge>
+<Badge value="7" severity="secondary"></Badge>
+<Badge value="5" severity="contrast"></Badge>
         `,
         javascript: `
 import React from 'react';
@@ -23,6 +25,8 @@ export default function SeverityDemo() {
             <Badge value="4" severity="info"></Badge >
             <Badge value="12" severity="warning"></Badge>
             <Badge value="3" severity="danger"></Badge>
+            <Badge value="7" severity="secondary"></Badge>
+            <Badge value="5" severity="contrast"></Badge>
         </div>
     );
 }
@@ -39,6 +43,8 @@ export default function SeverityDemo() {
             <Badge value="4" severity="info"></Badge >
             <Badge value="12" severity="warning"></Badge>
             <Badge value="3" severity="danger"></Badge>
+            <Badge value="7" severity="secondary"></Badge>
+            <Badge value="5" severity="contrast"></Badge>
         </div>
     );
 }
@@ -58,6 +64,8 @@ export default function SeverityDemo() {
                 <Badge value="4" severity="info"></Badge>
                 <Badge value="12" severity="warning"></Badge>
                 <Badge value="3" severity="danger"></Badge>
+                <Badge value="7" severity="secondary"></Badge>
+                <Badge value="5" severity="contrast"></Badge>
             </div>
             <DocSectionCode code={code} />
         </>
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,7 @@ tsconfig.tsbuildinfo @@
     # misc
     .DS_Store
     *.pem
+    *.code-workspace
     # debug
     npm-debug.log*
@@ Expand Down @@