diff --git a/TODO.txt b/TODO.txt index 10b17757..1ac45c66 100644 --- a/TODO.txt +++ b/TODO.txt @@ -342,6 +342,3 @@ I notice we actually use the git cli in a lot of places. is there a git library [auto select studio/atlas] when things get added AFTER the fact because we send the git history hashes on connect rather than continiously, it auto-selects Studio for things that are being edited in real-time in the sync dialog how should we handle new files? because it could have been that someone just deleted it in studio. we can actually check if its a truly new file in Studio, like A but not staged! - -[merge visualizer] -we should make the outline green or something to show when everything is ready to go. maybe the accept button diff --git a/plugin/src/App/StatusPages/Confirming.lua b/plugin/src/App/StatusPages/Confirming.lua index 9db24a2f..b4e7f383 100644 --- a/plugin/src/App/StatusPages/Confirming.lua +++ b/plugin/src/App/StatusPages/Confirming.lua @@ -366,7 +366,7 @@ function ConfirmingPage:render() Accept = e(TextButton, { text = if hasChanges then "Accept" else "OK", - style = "Primary", + style = if allSelected then "Primary" else "Neutral", transparency = self.props.transparency, layoutOrder = 2, onClick = function()