From d902ed633490820d912f89251b119caa52612ac0 Mon Sep 17 00:00:00 2001
From: naji <naji@cines.fr>
Date: Fri, 4 Jun 2021 14:36:37 +0200
Subject: [PATCH] fix: resolve conflit
---
.../file-tree-metadata.component.scss | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss
index 833245f84..2cb75db82 100644
--- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss
+++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss
@@ -39,7 +39,7 @@ td {
// Inital content text
.mat-select-value {
vertical-align: middle;
- color: map-get($colors, 'grey-600');
+ color: var(--vitamui-grey-600);
@extend .text-text-normal;
@extend .pastis-dropdown-text-button1-enabled;
}
@@ -60,9 +60,9 @@ td {
}
.mat-select-value-text {
- @extend .pastis-font-roboto-medium;
+ //@extend .text-text-medium;
vertical-align: middle;
- margin-left: 25px;
+ margin: 13px 10px 13px 15px;
max-width: 200px;
}
@@ -276,7 +276,7 @@ tr:hover .pastis-btn-appear {
.pastis-btn-metadata-options {
@extend .pastis-btn-rounded-mini-neutral-enabled;
- border: 1px solid map-get($colors, 'primary-700') !important;
+ border: 1px solid var(--vitamui-primary-700) !important;
float: right;
width: 40px;
height: 40px;
@@ -285,21 +285,21 @@ tr:hover .pastis-btn-appear {
.pastis-btn-metadata-options-active {
@extend .pastis-btn-rounded-mini-neutral-enabled;
- background: map-get($colors, 'primary-100' );
+ background: var(--vitamui-primary-100);
position: absolute !important;
margin-left: 5px !important;
width: 40px;
height: 40px;
- border: 1px solid map-get($colors, 'primary-700') !important;
+ border: 1px solid var(--vitamui-primary-700) !important;
}
.pastis-ico-menu-active {
- color: map-get($colors , 'primary-500' ) !important;
+ color: var(--vitamui-primary-500) !important;
}
.pastis-ico-menu-inactive {
- @extend .pastis-primary-500;
+ color: var(--vitamui-primary);
}
.pastis-table-container {
--
GitLab