Skip to content

Fixes for dark mode #33014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 13, 2019
Merged

Fixes for dark mode #33014

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a90daee
Fixing the keyboard shortcut modal appearance in dark mode.
daveyholler Mar 12, 2019
2bc2c2c
Fixing the language server icon colors in dark mode.
daveyholler Mar 12, 2019
97e352b
Fixing the white background in markdown code blocks in dark mode (Cod…
daveyholler Mar 12, 2019
169d100
Fixing the file tree background color (Code repo issue #986)
daveyholler Mar 12, 2019
6e7f344
Updating file_tree snapshots.
daveyholler Mar 12, 2019
c3ad2b5
Using variables in the shortcuts.scss file, moving the language icon …
daveyholler Mar 12, 2019
b6427c0
Fixing a type error for an unused import.
daveyholler Mar 13, 2019
0b689d3
Merge remote-tracking branch 'upstream/feature/merge-code' into fixes…
daveyholler Mar 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 79 additions & 35 deletions x-pack/plugins/code/public/components/file_tree/__snapshots__/file_tree.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
Expand Down Expand Up @@ -178,7 +178,7 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
Expand Down Expand Up @@ -236,7 +236,7 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
Expand Down Expand Up @@ -297,7 +297,7 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
Expand Down Expand Up @@ -341,12 +341,16 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
>
pom.xml
<div
className="euiTextColor euiTextColor--default"
>
pom.xml
</div>
</div>
</span>
</div>
Expand Down Expand Up @@ -399,7 +403,7 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
Expand Down Expand Up @@ -463,7 +467,7 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
Expand Down Expand Up @@ -522,7 +526,7 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
Expand Down Expand Up @@ -585,7 +589,7 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
Expand Down Expand Up @@ -644,7 +648,7 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
Expand Down Expand Up @@ -703,7 +707,7 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
Expand Down Expand Up @@ -762,7 +766,7 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
Expand Down Expand Up @@ -821,7 +825,7 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
Expand Down Expand Up @@ -880,7 +884,7 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
Expand Down Expand Up @@ -924,12 +928,16 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
>
.gitattributes
<div
className="euiTextColor euiTextColor--default"
>
.gitattributes
</div>
</div>
</span>
</div>
Expand Down Expand Up @@ -968,12 +976,16 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
>
.gitignore
<div
className="euiTextColor euiTextColor--default"
>
.gitignore
</div>
</div>
</span>
</div>
Expand Down Expand Up @@ -1012,12 +1024,16 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
>
.travis.yml
<div
className="euiTextColor euiTextColor--default"
>
.travis.yml
</div>
</div>
</span>
</div>
Expand Down Expand Up @@ -1056,12 +1072,16 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
>
CONTRIBUTING.md
<div
className="euiTextColor euiTextColor--default"
>
CONTRIBUTING.md
</div>
</div>
</span>
</div>
Expand Down Expand Up @@ -1100,12 +1120,16 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
>
CONTRIBUTORS
<div
className="euiTextColor euiTextColor--default"
>
CONTRIBUTORS
</div>
</div>
</span>
</div>
Expand Down Expand Up @@ -1144,12 +1168,16 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
>
COPYING
<div
className="euiTextColor euiTextColor--default"
>
COPYING
</div>
</div>
</span>
</div>
Expand Down Expand Up @@ -1188,12 +1216,16 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
>
README.md
<div
className="euiTextColor euiTextColor--default"
>
README.md
</div>
</div>
</span>
</div>
Expand Down Expand Up @@ -1232,12 +1264,16 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
>
cycle_whitelist.txt
<div
className="euiTextColor euiTextColor--default"
>
cycle_whitelist.txt
</div>
</div>
</span>
</div>
Expand Down Expand Up @@ -1276,12 +1312,16 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
>
javadoc-stylesheet.css
<div
className="euiTextColor euiTextColor--default"
>
javadoc-stylesheet.css
</div>
</div>
</span>
</div>
Expand Down Expand Up @@ -1320,12 +1360,16 @@ exports[`render correctly 1`] = `
/>
</svg>
<span
className="sc-bdVaJa ePJeWw"
className="sc-bdVaJa gwdwEa"
>
<div
className="euiText euiText--small eui-displayInlineBlock euiText--constrainedWidth"
>
pom.xml
<div
className="euiTextColor euiTextColor--default"
>
pom.xml
</div>
</div>
</span>
</div>
Expand Down
7 changes: 3 additions & 4 deletions x-pack/plugins/code/public/components/file_tree/file_tree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import { EuiSideNavItem, MainRouteParams, PathTypes } from '../../common/types';
import { RootState } from '../../reducers';

const DirectoryNode = styled.span`
color: ${theme.euiColorFullShade};
margin-left: ${theme.euiSizeS};
vertical-align: middle;
`;
Expand Down Expand Up @@ -145,7 +144,7 @@ export class CodeFileTree extends React.Component<Props> {
>
<EuiIcon type="submodule" />
<DirectoryNode>
<EuiText size="s" grow={false} className="eui-displayInlineBlock">
<EuiText size="s" grow={false} color="default" className="eui-displayInlineBlock">
{node.name}
</EuiText>
</DirectoryNode>
Expand All @@ -165,7 +164,7 @@ export class CodeFileTree extends React.Component<Props> {
>
<EuiIcon type="symlink" />
<DirectoryNode>
<EuiText size="s" grow={false} className="eui-displayInlineBlock">
<EuiText size="s" grow={false} color="default" className="eui-displayInlineBlock">
{node.name}
</EuiText>
</DirectoryNode>
Expand All @@ -185,7 +184,7 @@ export class CodeFileTree extends React.Component<Props> {
>
<EuiIcon type="document" />
<DirectoryNode>
<EuiText size="s" grow={false} className="eui-displayInlineBlock">
<EuiText size="s" grow={false} color="default" className="eui-displayInlineBlock">
{node.name}
</EuiText>
</DirectoryNode>
Expand Down
6 changes: 6 additions & 0 deletions x-pack/plugins/code/public/components/main/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
}

.code-navigation__sidebar {
background-color: $euiColorLightestShade;
width: 16rem;
border-right: $euiBorderThin;
display: flex;
Expand Down Expand Up @@ -259,3 +260,8 @@
border-top: none;
}
}


.codeIcon__language path {
fill: $euiColorDarkestShade;
}
Loading