Skip to content

Commit

Permalink
QUV-1868: lint errors have been fixed.
Browse files Browse the repository at this point in the history
  • Loading branch information
jguede committed Nov 16, 2023
1 parent add8e11 commit 011ecf4
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 29 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,77 +13,82 @@ export interface StyledInternalDiffEditorProps
export const StyledInternalDiffEditor = styled(
StyledInternalEditor,
)<StyledInternalDiffEditorProps>`
${({bordered, originalEditable, readOnly, theme}) => css`
${({ bordered, originalEditable, readOnly, theme }) => css`
--border-radius: ${theme.alias.fields.shape.borderRadius};
--inner-border-radius: calc(var(--border-radius) - .1rem);
--inner-border-radius: calc(var(--border-radius) -0.1rem);
.monaco-diff-editor.side-by-side {
${bordered && 'border-radius: var(--border-radius);'}
// Left side of the diff editor
.editor.original {
box-shadow: none;
${!originalEditable && !readOnly &&
${!originalEditable &&
!readOnly &&
css`
.monaco-editor-background {
background-color: ${theme.alias.fields.color.background.base
.readonly};
}
`}
.monaco-editor {
${bordered &&
css`
border-radius: var(--inner-border-radius) 0 0 var(--inner-border-radius);
border-radius: var(--inner-border-radius) 0 0
var(--inner-border-radius);
.overflow-guard {
border-radius: var(--inner-border-radius) 0 0 var(--inner-border-radius);
border-radius: var(--inner-border-radius) 0 0
var(--inner-border-radius);
.lines-content.monaco-editor-background .view-overlays .line-delete {
left: calc(-1 * var(--line-numbers-spacing)) !important;
.lines-content.monaco-editor-background {
.view-overlays .line-delete {
left: calc(-1 * var(--line-numbers-spacing)) !important;
}
}
}
`}
}
}
// Right side of the diff editor
.editor.modified {
box-shadow: none;
border-left-width: ${theme.alias.fields.shape.borderSize.base};
border-left-style: solid;
border-left-color: ${theme.alias.fields.color.border.base.enabled};
.scrollbar {
right: .1rem !important;
right: 0.1rem !important;
}
.monaco-editor {
border-radius: 0;
.overflow-guard {
border-radius: 0;
.lines-content.monaco-editor-background .view-overlays .line-insert {
left: calc(-1 * var(--line-numbers-spacing)) !important;
.lines-content.monaco-editor-background {
.view-overlays .line-insert {
left: calc(-1 * var(--line-numbers-spacing)) !important;
}
}
}
}
}
// Difference area
.diffOverview {
border-left-width: ${theme.alias.fields.shape.borderSize.base};
border-left-style: solid;
border-left-color: ${theme.alias.fields.color.border.base.enabled};
background-color: ${theme.alias.color.background.feedback.neutral
.weaker};
// Hide diff viewport slider but keep the area clickable
.diffViewport {
opacity: 0 !important;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,23 @@ export const StyledInternalEditor = styled.div<StyledInternalEditorProps>`
css`
border-radius: var(--border-radius);
`}
.overflow-guard {
${bordered &&
css`
// -1 fills the gap between the internal border and external border
// -1 fills the gap between the internal border and external border
border-radius: calc(var(--border-radius) - 1px);
`}
}
// Base font color. Applies to non tokenized text - Smart Editor - Style
.mtk1 {
color: ${theme.alias.color.text.body.stronger};
}
// Cannot edit on read-only mode - Smart Editor - Style
// overflowingContentWidgets className
.monaco-editor-overlaymessage {
.message {
box-shadow: ${theme.alias.elevation.boxShadow.depth.activated};
Expand Down Expand Up @@ -108,9 +107,7 @@ export const StyledInternalEditor = styled.div<StyledInternalEditorProps>`
margin-left: calc(-1 * var(--line-numbers-spacing));
}
`}
// Scrollbar - Smart Editor - Style
.monaco-scrollable-element {
.scrollbar {
background-color: ${theme.alias.scrollbars.track.color.backdrop};
Expand Down Expand Up @@ -155,15 +152,15 @@ export const StyledInternalEditor = styled.div<StyledInternalEditorProps>`
// Minimap - Smart Editor - Style
.minimap {
transform: translateX(.6rem);
transform: translateX(0.6rem);
}
// Decorations overview ruler - Smart Editor - Style
.decorationsOverviewRuler {
width: var(--scrollbar-size) !important;
border-left: ${minimap &&
`1px solid ${theme.alias.color.border.separator.base.weak}`};
`1px solid ${theme.alias.color.border.separator.base.weak}`};
}
}
`}
Expand Down

0 comments on commit 011ecf4

Please sign in to comment.