Skip to content

Commit 77881c7

Browse files
authored
Background color fix (#99)
* Automatically refresh the list of files in Working Copy after stashing * Fixes light background color issue on IE * Uncomment necessary code Co-authored-by: Sarmishta Velury <[email protected]>
1 parent 2b8bbf1 commit 77881c7

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

git-webui/release/share/git-webui/webui/css/git-webui.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ body {
6666
margin: -1rem -1rem -1rem auto;
6767
}
6868
#newBranchName {
69-
background-color: inherit;
69+
background-color: #333333;
7070
max-width: 12em;
7171
color: inherit;
7272
overflow: hidden;

git-webui/release/share/git-webui/webui/js/git-webui.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2038,6 +2038,7 @@ webui.ChangedFilesView = function(workspaceView, type, label) {
20382038

20392039
if(combinedFiles.length>0)
20402040
confirmActionForUnavailableFile(combinedFiles, action);
2041+
workspaceView.update("stash");
20412042

20422043
}
20432044

@@ -2046,8 +2047,6 @@ webui.ChangedFilesView = function(workspaceView, type, label) {
20462047
var rmFiles = self.getFileList("D", undefined, 0, 1);
20472048
var combinedFiles = files+" "+rmFiles;
20482049

2049-
console.log(combinedFiles);
2050-
20512050
if(combinedFiles.length != 0){
20522051
webui.git("stash push -- " + combinedFiles, function(output){
20532052
webui.showSuccess(output);
@@ -2069,7 +2068,7 @@ webui.ChangedFilesView = function(workspaceView, type, label) {
20692068
'</div>' +
20702069
'</div>')[0];
20712070
if (type == "working-copy") {
2072-
var buttons = [{ name: "Stage", callback: self.processByAvailability }, { name: "Stash", callback: self.stash }, { name: "Cancel", callback: self.cancelByAvailability }];
2071+
var buttons = [{ name: "Stage", callback: self.processByAvailability }, { name: "Stash", callback: self.stashByAvailability }, { name: "Cancel", callback: self.cancelByAvailability }];
20732072
} else {
20742073
var buttons = [{ name: "Unstage", callback: self.processByAvailability }];
20752074
}

git-webui/src/share/git-webui/webui/css/git-webui.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ body {
125125
}
126126

127127
#newBranchName {
128-
background-color: inherit;
128+
background-color: @gray-dark;
129129
max-width: 12em;
130130
color: inherit;
131131
overflow: hidden;

git-webui/src/share/git-webui/webui/js/git-webui.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2038,6 +2038,7 @@ webui.ChangedFilesView = function(workspaceView, type, label) {
20382038

20392039
if(combinedFiles.length>0)
20402040
confirmActionForUnavailableFile(combinedFiles, action);
2041+
workspaceView.update("stash");
20412042

20422043
}
20432044

@@ -2046,8 +2047,6 @@ webui.ChangedFilesView = function(workspaceView, type, label) {
20462047
var rmFiles = self.getFileList("D", undefined, 0, 1);
20472048
var combinedFiles = files+" "+rmFiles;
20482049

2049-
console.log(combinedFiles);
2050-
20512050
if(combinedFiles.length != 0){
20522051
webui.git("stash push -- " + combinedFiles, function(output){
20532052
webui.showSuccess(output);
@@ -2069,7 +2068,7 @@ webui.ChangedFilesView = function(workspaceView, type, label) {
20692068
'</div>' +
20702069
'</div>')[0];
20712070
if (type == "working-copy") {
2072-
var buttons = [{ name: "Stage", callback: self.processByAvailability }, { name: "Stash", callback: self.stash }, { name: "Cancel", callback: self.cancelByAvailability }];
2071+
var buttons = [{ name: "Stage", callback: self.processByAvailability }, { name: "Stash", callback: self.stashByAvailability }, { name: "Cancel", callback: self.cancelByAvailability }];
20732072
} else {
20742073
var buttons = [{ name: "Unstage", callback: self.processByAvailability }];
20752074
}

0 commit comments

Comments
 (0)