Skip to content

Commit

Permalink
fix: merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
mnenie committed Aug 3, 2024
2 parents 2f751cc + a1e7684 commit de797c1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/features/kanban/ui/add-column/AddColumn.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ const open = () => {
padding: 0.8rem;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
font-weight: 500;
transition: none !important;
transform: none !important;
}
.desc {
Expand Down
2 changes: 2 additions & 0 deletions src/features/kanban/ui/add-column/FormCreation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ const createColumn = handleSubmit((values) => {
.form_container {
display: grid;
gap: 24px;
transition: none !important;
transform: none !important;
.field {
display: grid;
Expand Down

0 comments on commit de797c1

Please sign in to comment.