Skip to content

Commit

Permalink
primeng: fix first admin tests
Browse files Browse the repository at this point in the history
Co-Authored-by: Johnny Mariéthoz <[email protected]>
Co-Authored-by: Bertrand Zuchuat <[email protected]>
  • Loading branch information
jma and Garfield-fr committed Jan 7, 2025
1 parent e503b06 commit 2138e64
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 10 deletions.
6 changes: 3 additions & 3 deletions projects/admin/src/app/app.component.html

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<p-toast>
<ng-template let-message pTemplate="message">
<div class="flex flex-column align-items-start" style="flex: 1">
<div class="font-medium text-lg my-3 text-900">
<div class="font-medium text-lg text-900">
{{ message.summary }}
</div>
<p [innerHtml]="message.detail"></p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<p-menubar [model]="items">
<p-menubar [model]="items" [autoDisplay]="false">
<ng-template pTemplate="item" let-item let-root="root">
<a
pRipple
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<p-menubar [model]="items" [autoHide]="true">
<p-menubar [model]="items" [autoDisplay]="false">
<ng-template pTemplate="item" let-item let-root="root">
@if (item.routerLink && !item.url) {
<span
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import { CirculationLogsComponent } from './circulation-logs.component';
id="{{ resourceType }}-circulation-history"
[label]="'Circulation history'|translate"
outlined
severity="secondary"
[permissions]="[permissions.CIRC_ADMIN, permissions.OPLG_SEARCH]"
[operator] = permissionOperator.AND
(onClick)="openDialog()"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
icon="fa fa-history"
id="{{ resourceType }}-operation-history"
[label]="'Operation history'|translate"
severity="secondary"
outlined
[permissions]="permissions.OPLG_SEARCH"
(onClick)="openDialog()"
Expand Down
7 changes: 5 additions & 2 deletions projects/admin/src/app/routes/patrons-route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,14 @@ export class PatronsRoute extends BaseRoute implements RouteInterface {
{
label: _('Relevance'),
value: 'bestmatch',
defaultQuery: true
defaultQuery: true,
defaultNoQuery: true,
icon: 'fa fa-sort-amount-desc'
},
{
label: _('Name'),
value: 'full_name'
value: 'full_name',
icon: 'fa fa-sort-alpha-asc'
}
],
showFacetsIfNoResults: true
Expand Down
11 changes: 9 additions & 2 deletions projects/admin/src/app/scss/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"Helvetica Neue", Helvetica, Arial, sans-serif;
--font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI",
Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 0.875rem;
font-size: 1rem;
}

@layer rero-ils-ui, primeng;
Expand All @@ -40,8 +40,15 @@
@import '../record/detail-view/document-detail-view/holding/holding.component.scss';
}

@layer rero-ils-ui {
@layer rero-ils-ui {
body {
margin:0;
}
}

.p-accordion-header, .p-panel-header {
@extend .surface-100;
a {
background: transparent;
}
}

0 comments on commit 2138e64

Please sign in to comment.