Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	apps/showcase/package.json
#	pnpm-lock.yaml
  • Loading branch information
Abdelillah Aissani committed Oct 24, 2024
2 parents dbe6d2c + b752717 commit 219b91a
Show file tree
Hide file tree
Showing 240 changed files with 12,516 additions and 2,284 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
run: |
pnpm run security:check
- name: Unit Tests Check
if: ${{ success() }}
run: |
npm run test:unit
# - name: Unit Tests Check
# if: ${{ success() }}
# run: |
# npm run test:unit
6 changes: 6 additions & 0 deletions apps/showcase/assets/menu/menu.json
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,12 @@
}
]
},
{
"name": "Forms",
"icon": "pi pi-check-circle",
"to": "/forms",
"badge": "NEW"
},
{
"name": "Pass Through",
"icon": "pi pi-directions",
Expand Down
13 changes: 7 additions & 6 deletions apps/showcase/assets/styles/layout/_doc.scss
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,12 @@

> .navbar-item {
.navbar-item-content {
border-left: 1px solid var(--border-color);
padding-left: .25rem;
border-inline-start: 1px solid var(--border-color);
padding-inline-start: .25rem;
transition: all .2s;

&:hover {
border-left-color: var(--hover-border-color);
border-inline-start-color: var(--hover-border-color);
}
}
}
Expand All @@ -201,11 +201,12 @@

button {
font-size: 1rem;
text-align: left;
text-align: start;
background: transparent;
margin: 0;
border: 0 none;
padding: 0.25rem 1rem 0.25rem 1rem;
padding-block: 0.25rem;
padding-inline: 1rem;
color: var(--text-secondary-color);
white-space: nowrap;
min-width: 0;
Expand Down Expand Up @@ -243,7 +244,7 @@

.navbar-item {
.navbar-item-content {
padding-left: 1rem;
padding-inline-start: 1rem;
}
}
}
Expand Down
24 changes: 14 additions & 10 deletions apps/showcase/assets/styles/layout/_sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
flex-direction: column;
padding: 0 0 0 0;
flex: 0 0 250px;
margin-right: 4rem;
margin-inline-end: 4rem;
overflow: auto;

.logo {
Expand All @@ -18,7 +18,8 @@
}

nav {
padding: 0 1rem 0 0;
padding: 0;
padding-inline-end: 1rem;
margin: 0;
flex-grow: 1;
}
Expand Down Expand Up @@ -56,7 +57,7 @@
width: 2rem;
height: 2rem;
border-radius: 6px;
margin-right: .5rem;
margin-inline-end: .5rem;
border: 1px solid var(--border-color);
display: inline-flex;
align-items: center;
Expand All @@ -73,7 +74,7 @@

.menu-toggle-icon {
color: var(--text-secondary-color);
margin-left: auto;
margin-inline-start: auto;
}

&:hover {
Expand Down Expand Up @@ -105,18 +106,20 @@
overflow: hidden;

ol {
margin: 0 0 0 1rem;
margin: 0;
margin-inline-start: 1rem;
padding: .25rem 0;
list-style: none;

li {
a {
border-left: 1px solid var(--border-color);
border-inline-start: 1px solid var(--border-color);
transition: all .2s;
font-weight: 450;
display: flex;
align-items: center;
padding: .5rem .5rem .5rem 1rem;
padding: .5rem;
padding-inline-start: 1rem;
color: var(--text-secondary-color);
transition: outline-color 0.2s, border-color .2s;
outline-color: transparent;
Expand All @@ -130,7 +133,7 @@

&.router-link-active {
color: var(--primary-text-color);
border-left-color: var(--primary-text-color);
border-inline-start-color: var(--primary-text-color);
}
}

Expand All @@ -153,7 +156,7 @@

.p-tag {
position: absolute;
right: 0;
inset-inline-end: 0;
top: 50%;
transform: translateY(-50%);

Expand All @@ -165,7 +168,8 @@

.menu-child-category {
display: flex;
padding: .5rem .5rem .5rem 0;
padding: .5rem;
padding-inline-start: 0;
font-size: .875rem;
font-weight: 600;
letter-spacing: 1px;
Expand Down
22 changes: 11 additions & 11 deletions apps/showcase/assets/styles/layout/_topbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

.layout-topbar-logo-container {
width: 250px;
margin-right: 4rem;
margin-inline-end: 4rem;
}

.layout-topbar-logo,
Expand Down Expand Up @@ -52,7 +52,7 @@
width: 25px;
}
}

.menu-button {
display: none;
}
Expand Down Expand Up @@ -84,21 +84,21 @@
outline-color: transparent;
background-color: var(--card-background);
cursor: pointer;

@include focus-visible();

&:hover {
border-color: var(--primary-color);
}

i, span {
color: var(--text-color);
}
}

.config-item {
background-color: var(--primary-color);

i {
color: var(--primary-contrast-color);
}
Expand All @@ -107,15 +107,15 @@
.config-panel {
position: absolute;
top: calc(100% + 2px);
right: 0;
inset-inline-end: 0;
width: 18rem;
padding: .75rem;
background-color: var(--overlay-background);
border-radius: 6px;
border: 1px solid var(--border-color);
transform-origin: top;
box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);

.config-panel-content {
display: flex;
flex-direction: column;
Expand All @@ -135,7 +135,7 @@
display: flex;
gap: .5rem;
flex-wrap: wrap;

button {
border: none;
width: 1.25rem;
Expand All @@ -147,7 +147,7 @@
outline-width: 2px;
outline-style: solid;
outline-offset: 1px;

&.active-color {
outline-color: var(--primary-color);
}
Expand Down Expand Up @@ -218,4 +218,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion apps/showcase/components/doc/DocApiSection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export default {
interfaces = this.findOtherInterfaces(values, docName);
}
const types = APIDocs[moduleName]['types'];
const types = APIDocs[moduleName]?.['types'];
const services = modelValues; // (TerminalService && ConfirmationService && ToastService)
Expand Down
1 change: 1 addition & 0 deletions apps/showcase/components/doc/codeeditor/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const core_dependencies = {
primevue: pkg.version || PrimeVue.version || 'latest',
'@primevue/themes': pkg.version || PrimeVue.version || 'latest',
'@primevue/auto-import-resolver': pkg.version || PrimeVue.version || 'latest',
'@primevue/form': pkg.version || PrimeVue.version || 'latest',
primeicons: app_dependencies['primeicons'] || 'latest',
tailwindcss: app_dependencies['tailwindcss'] || 'latest',
autoprefixer: app_dependencies['autoprefixer'] || 'latest',
Expand Down
1 change: 0 additions & 1 deletion apps/showcase/components/landing/samples/CustomersApp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ export default {
selectedRows: []
};
},
methods: {
displayPopover(event) {
this.hidePopover();
Expand Down
Loading

0 comments on commit 219b91a

Please sign in to comment.