Skip to content

Commit

Permalink
fix merge conflict with delete button
Browse files Browse the repository at this point in the history
  • Loading branch information
drewvolz committed Feb 20, 2024
1 parent 451b15b commit b02a3be
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions ClassDumper/Views/FolderRowView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,13 @@ extension AppView {
DeleteFilesButton("Delete", folderKey: folder)
}

DeleteButton(for: folder)
.buttonStyle(BorderlessButtonStyle())
.foregroundColor(.red)

if deletionEnabled {
DeleteFilesButton("", folderKey: folderName)
DeleteFilesButton("", folderKey: folder)
.foregroundColor(.red)
.buttonStyle(BorderlessButtonStyle())
.labelStyle(IconOnlyLabelStyle())
}
}
}
}
.animation(.default, value: folderRows)
.listStyle(SidebarListStyle())
Expand Down

0 comments on commit b02a3be

Please sign in to comment.