diff --git a/git-webui/release/share/git-webui/webui/css/git-webui.css b/git-webui/release/share/git-webui/webui/css/git-webui.css index 5215e78b..8dda4714 100644 --- a/git-webui/release/share/git-webui/webui/css/git-webui.css +++ b/git-webui/release/share/git-webui/webui/css/git-webui.css @@ -66,7 +66,7 @@ body { margin: -1rem -1rem -1rem auto; } #newBranchName { - background-color: inherit; + background-color: #333333; max-width: 12em; color: inherit; overflow: hidden; diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js index fe44ae34..97fb6201 100644 --- a/git-webui/release/share/git-webui/webui/js/git-webui.js +++ b/git-webui/release/share/git-webui/webui/js/git-webui.js @@ -2038,6 +2038,7 @@ webui.ChangedFilesView = function(workspaceView, type, label) { if(combinedFiles.length>0) confirmActionForUnavailableFile(combinedFiles, action); + workspaceView.update("stash"); } @@ -2046,8 +2047,6 @@ webui.ChangedFilesView = function(workspaceView, type, label) { var rmFiles = self.getFileList("D", undefined, 0, 1); var combinedFiles = files+" "+rmFiles; - console.log(combinedFiles); - if(combinedFiles.length != 0){ webui.git("stash push -- " + combinedFiles, function(output){ webui.showSuccess(output); @@ -2069,7 +2068,7 @@ webui.ChangedFilesView = function(workspaceView, type, label) { '</div>' + '</div>')[0]; if (type == "working-copy") { - var buttons = [{ name: "Stage", callback: self.processByAvailability }, { name: "Stash", callback: self.stash }, { name: "Cancel", callback: self.cancelByAvailability }]; + var buttons = [{ name: "Stage", callback: self.processByAvailability }, { name: "Stash", callback: self.stashByAvailability }, { name: "Cancel", callback: self.cancelByAvailability }]; } else { var buttons = [{ name: "Unstage", callback: self.processByAvailability }]; } diff --git a/git-webui/src/share/git-webui/webui/css/git-webui.less b/git-webui/src/share/git-webui/webui/css/git-webui.less index 2af5e7cc..0934056b 100644 --- a/git-webui/src/share/git-webui/webui/css/git-webui.less +++ b/git-webui/src/share/git-webui/webui/css/git-webui.less @@ -125,7 +125,7 @@ body { } #newBranchName { - background-color: inherit; + background-color: @gray-dark; max-width: 12em; color: inherit; overflow: hidden; diff --git a/git-webui/src/share/git-webui/webui/js/git-webui.js b/git-webui/src/share/git-webui/webui/js/git-webui.js index fe44ae34..97fb6201 100644 --- a/git-webui/src/share/git-webui/webui/js/git-webui.js +++ b/git-webui/src/share/git-webui/webui/js/git-webui.js @@ -2038,6 +2038,7 @@ webui.ChangedFilesView = function(workspaceView, type, label) { if(combinedFiles.length>0) confirmActionForUnavailableFile(combinedFiles, action); + workspaceView.update("stash"); } @@ -2046,8 +2047,6 @@ webui.ChangedFilesView = function(workspaceView, type, label) { var rmFiles = self.getFileList("D", undefined, 0, 1); var combinedFiles = files+" "+rmFiles; - console.log(combinedFiles); - if(combinedFiles.length != 0){ webui.git("stash push -- " + combinedFiles, function(output){ webui.showSuccess(output); @@ -2069,7 +2068,7 @@ webui.ChangedFilesView = function(workspaceView, type, label) { '</div>' + '</div>')[0]; if (type == "working-copy") { - var buttons = [{ name: "Stage", callback: self.processByAvailability }, { name: "Stash", callback: self.stash }, { name: "Cancel", callback: self.cancelByAvailability }]; + var buttons = [{ name: "Stage", callback: self.processByAvailability }, { name: "Stash", callback: self.stashByAvailability }, { name: "Cancel", callback: self.cancelByAvailability }]; } else { var buttons = [{ name: "Unstage", callback: self.processByAvailability }]; }