refs #6595 - PR2 - Resolve conflicts #144

Merged
alexm merged 250 commits from hyervoni-branch-PR-2 into dev 2024-01-11 12:22:28 +00:00
2 changed files with 1 additions and 5 deletions
Showing only changes of commit 2432496eaf - Show all commits
src
css
pages/Travel/Card

View File

@ -51,7 +51,3 @@ body.body--dark {
color: var(--vn-text);
border-radius: 8px;
}
.vn-secondary-button {
background-color: var(--vn-dark);
}

View File

@ -96,7 +96,7 @@ const tableColumnComponents = {
},
observation: {
component: (props) => (props.value ? QIcon : null),
props: () => ({ name: 'insert_drive_file', color: 'orange', size: '25px' }),
props: () => ({ name: 'insert_drive_file', color: 'primary', size: '25px' }),
},
};