Skip to content
Snippets Groups Projects
Commit d902ed63 authored by naji's avatar naji
Browse files

fix: resolve conflit

parent 58817777
No related branches found
No related tags found
6 merge requests!58compare branch,!54Comparaison de merge vers vitam-ui,!53Comparaison de merge vers vitam-ui,!52Voir difference entre les deux verion,!41MAJ: compare to vitam-ui,!29BreadCrumb
......@@ -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 {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment