Merge pull request #800 from atom/sm-stage-button

simurai · web-flow · commit e511b4996684 · 2017-05-15T11:32:14.000+09:00
Fix HunkView-stageButton border
diff --git a/styles/hunk-view.less b/styles/hunk-view.less
@@ -125,7 +125,7 @@
   .github-HunkView-line.is-selected .github-HunkView-lineNumber {
     border-color: mix(@button-border-color, @button-background-color-selected, 25%);
   }
-  .is-hunkMode .github-HunkView-stageButton {
+  .github-HunkView.is-selected.is-hunkMode .github-HunkView-stageButton {
     border-color: mix(@hunk-bg-color, @button-background-color-selected, 30%);
     &:hover  { background-color: mix(@hunk-bg-color, @button-background-color-selected, 10%); }
     &:active { background-color: @button-background-color-selected; }

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@`
`125`	`125`	`.github-HunkView-line.is-selected .github-HunkView-lineNumber {`
`126`	`126`	`border-color: mix(@button-border-color, @button-background-color-selected, 25%);`
`127`	`127`	`}`
`128`		`- .is-hunkMode .github-HunkView-stageButton {`
	`128`	`+ .github-HunkView.is-selected.is-hunkMode .github-HunkView-stageButton {`
`129`	`129`	`border-color: mix(@hunk-bg-color, @button-background-color-selected, 30%);`
`130`	`130`	`&:hover { background-color: mix(@hunk-bg-color, @button-background-color-selected, 10%); }`
`131`	`131`	`&:active { background-color: @button-background-color-selected; }`