Fixes #1197 - bad css when missing base

eamodio · eamodio · commit 4313f1696f62 · 2020-11-22T16:21:09.000-05:00
diff --git a/src/webviews/apps/rebase/rebase.ts b/src/webviews/apps/rebase/rebase.ts
@@ -333,6 +333,7 @@ class RebaseEditor extends App<RebaseState> {
 				++tabIndex,
 			);
 			$container.appendChild($el);
+			$container.classList.add('entries--base');
 		}
 
 		document
diff --git a/src/webviews/apps/scss/rebase.scss b/src/webviews/apps/scss/rebase.scss
@@ -204,7 +204,8 @@ $entry-padding: 5px;
 		}
 	}
 
-	&:nth-last-child(2) {
+	.entries--base &:nth-last-of-type(2),
+	:not(.entries--base) &:nth-last-of-type(1) {
 		& select {
 			& > option[value='squash'],
 			& > option[value='fixup'] {

Original file line number	Diff line number	Diff line change
`@@ -333,6 +333,7 @@ class RebaseEditor extends App<RebaseState> {`
`333`	`333`	`++tabIndex,`
`334`	`334`	`);`
`335`	`335`	`$container.appendChild($el);`
	`336`	`+ $container.classList.add('entries--base');`
`336`	`337`	`}`
`337`	`338`
`338`	`339`	`document`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,8 @@ $entry-padding: 5px;`
`204`	`204`	`}`
`205`	`205`	`}`
`206`	`206`
`207`		`- &:nth-last-child(2) {`
	`207`	`+ .entries--base &:nth-last-of-type(2),`
	`208`	`+ :not(.entries--base) &:nth-last-of-type(1) {`
`208`	`209`	`& select {`
`209`	`210`	`& > option[value='squash'],`
`210`	`211`	`& > option[value='fixup'] {`