This commit is contained in:
Nate Butler 2022-09-28 16:03:00 -04:00
parent d0c50b4fbf
commit 48dcc465f2

View File

@ -1,5 +1,6 @@
import { fontWeights } from "../common"; import { fontWeights } from "../common";
import { ColorScheme, Elevation, Layer, StyleSets } from "../themes/common/colorScheme"; import { ColorScheme, Elevation, Layer, StyleSets } from "../themes/common/colorScheme";
import { withOpacity } from "../utils/color";
import { import {
background, background,
border, border,
@ -133,11 +134,11 @@ export default function editor(colorScheme: ColorScheme) {
return { return {
textColor: syntax.primary.color, textColor: syntax.primary.color,
background: background(layer), background: background(layer),
activeLineBackground: background(layer, "variant"), activeLineBackground: background(layer, "on"),
highlightedLineBackground: background(layer, "variant"), highlightedLineBackground: background(layer, "on"),
codeActions: { codeActions: {
indicator: foreground(layer, "variant"), indicator: foreground(layer, "variant"),
verticalScale: 0.618 verticalScale: 0.55
}, },
diffBackgroundDeleted: background(layer, "negative"), diffBackgroundDeleted: background(layer, "negative"),
diffBackgroundInserted: background(layer, "positive"), diffBackgroundInserted: background(layer, "positive"),
@ -146,8 +147,8 @@ export default function editor(colorScheme: ColorScheme) {
errorColor: foreground(layer, "negative"), errorColor: foreground(layer, "negative"),
gutterBackground: background(layer), gutterBackground: background(layer),
gutterPaddingFactor: 3.5, gutterPaddingFactor: 3.5,
lineNumber: foreground(layer), lineNumber: foreground(layer, "disabled"),
lineNumberActive: foreground(layer, "active"), lineNumberActive: foreground(layer),
renameFade: 0.6, renameFade: 0.6,
unnecessaryCodeFade: 0.5, unnecessaryCodeFade: 0.5,
selection: colorScheme.players[0], selection: colorScheme.players[0],
@ -164,26 +165,26 @@ export default function editor(colorScheme: ColorScheme) {
background: background(elevation.above.top), background: background(elevation.above.top),
cornerRadius: 8, cornerRadius: 8,
padding: 4, padding: 4,
margin: {
left: -14,
},
border: border(elevation.above.top), border: border(elevation.above.top),
shadow: elevation.above.shadow, shadow: elevation.above.shadow,
matchHighlight: elevation.above.ramps.blue(0.5).hex(),
item: autocompleteItem, item: autocompleteItem,
hoveredItem: { hoveredItem: {
...autocompleteItem, ...autocompleteItem,
background: background(elevation.above.top, "hovered"), background: background(elevation.above.top, "hovered"),
}, },
margin: {
left: -14,
},
matchHighlight: elevation.above.ramps.blue(0.5).hex(),
selectedItem: { selectedItem: {
...autocompleteItem, ...autocompleteItem,
background: background(elevation.above.top, "active"), background: withOpacity(background(elevation.above.top, "active"), 0.2),
}, },
}, },
diagnosticHeader: { diagnosticHeader: {
background: background(elevation.middle), background: background(elevation.middle),
iconWidthFactor: 1.5, iconWidthFactor: 1.5,
textScaleFactor: 0.857, // NateQ: Will we need dynamic sizing for text? If so let's create tokens for these. textScaleFactor: 0.857,
border: border(elevation.middle, { border: border(elevation.middle, {
bottom: true, bottom: true,
top: true, top: true,