From ff5d229003f12aef486f58e684a7f7c7f87d685d Mon Sep 17 00:00:00 2001 From: Baptiste Toulemonde <toulemonde@cines.fr> Date: Mon, 12 Apr 2021 15:22:46 +0200 Subject: [PATCH] style(liste-profil): modification classes --- .../list-profile/list-profile.component.html | 12 ++++-------- .../pastis/src/app/profile/profile.module.ts | 4 +++- ui/ui-frontend/projects/pastis/src/sass/styles.scss | 13 ++++++++++--- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/list-profile/list-profile.component.html b/ui/ui-frontend/projects/pastis/src/app/profile/list-profile/list-profile.component.html index 3ff5498f0..ce35f53e0 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/list-profile/list-profile.component.html +++ b/ui/ui-frontend/projects/pastis/src/app/profile/list-profile/list-profile.component.html @@ -17,13 +17,13 @@ </div> <!-- The input search --> - <div class="search-and-create-container"> + <div class="d-flex align-items-center px-1"> <p class="pastis-font-h5">Créer et gérer des profils d’archivage</p><br> <div class="button-container"> <!--Button save profile--> <div style="width: 50%"> - <input placeholder="Recherche un profil par son intitulé" class="filter-input-text"> + <vitamui-common-search-bar placeholder="Recherche un profil par son intitulé" ></vitamui-common-search-bar> <button mat-button mat-icon-button class="btn-search "> <mat-icon style="color:white; vertical-align: text-bottom;">search</mat-icon> @@ -32,9 +32,7 @@ <!--Button create profile --> <button *ngIf="true" class="btn primary"> - <span class="btn-icon-left" > - <mat-icon>add</mat-icon> - </span> + <i class="vitamui-icon vitamui-icon-plus mr-3 ng-star-inserted"></i> <span style="align-items: center; margin:auto;">créer un nouveau profil</span> </button> @@ -42,9 +40,7 @@ <!--Button import profile --> <button class="btn secondary" (click)="fileInput.click()"> - <span class="btn-icon-left"> - <mat-icon svgIcon="import-icon"></mat-icon> - </span> + <i class="vitamui-icon vitamui-icon-telecharger mr-3 ng-star-inserted"></i> <span style="align-items: center; margin:auto;">importer un profil</span> <input #fileInput type="file" class="buttons" accept=".json, .rng" ng2FileSelect style="display:none;" diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/profile.module.ts b/ui/ui-frontend/projects/pastis/src/app/profile/profile.module.ts index b828a4dec..749947714 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/profile.module.ts +++ b/ui/ui-frontend/projects/pastis/src/app/profile/profile.module.ts @@ -56,6 +56,7 @@ import { NoticeComponent } from '../notice/notice.component'; import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import {UserActionsModule} from '../user-actions/user-actions.module'; import {FormsModule} from "@angular/forms"; +import { VitamUICommonModule } from 'ui-frontend-common'; @NgModule({ @@ -70,7 +71,8 @@ import {FormsModule} from "@angular/forms"; PastisMaterialModule, UserActionsModule, MatSlideToggleModule, - FormsModule + FormsModule, + VitamUICommonModule, ], exports: [CreateProfileComponent,EditProfileComponent,ListProfileComponent,NoticeComponent], providers:[], diff --git a/ui/ui-frontend/projects/pastis/src/sass/styles.scss b/ui/ui-frontend/projects/pastis/src/sass/styles.scss index 983e3647c..c071e3822 100644 --- a/ui/ui-frontend/projects/pastis/src/sass/styles.scss +++ b/ui/ui-frontend/projects/pastis/src/sass/styles.scss @@ -1,3 +1,10 @@ -@import '~ui-frontend-common/sass/icons/vitamui-icons.css'; -@import '~ui-frontend-common/sass/theme'; -@import '~ui-frontend-common/sass/fonts/font-styles.css'; \ No newline at end of file +@import "~ui-frontend-common/sass/icons/vitamui-icons.css"; +@import "~ui-frontend-common/sass/theme"; +@import '~bootstrap/scss/bootstrap-grid'; + +@import '~ui-frontend-common/sass/fonts/font-styles.css'; + + + +@import '../../../../dist/sass/icons/vitamui-icons.css'; +@import '../../../../dist/sass/styles'; \ No newline at end of file -- GitLab