diff --git a/x-pack/plugins/code/public/components/file_tree/__snapshots__/file_tree.test.tsx.snap b/x-pack/plugins/code/public/components/file_tree/__snapshots__/file_tree.test.tsx.snap index 6884be1d85678..ddf540ee4b816 100644 --- a/x-pack/plugins/code/public/components/file_tree/__snapshots__/file_tree.test.tsx.snap +++ b/x-pack/plugins/code/public/components/file_tree/__snapshots__/file_tree.test.tsx.snap @@ -119,7 +119,7 @@ exports[`render correctly 1`] = ` />
- pom.xml +
+ pom.xml +
@@ -399,7 +403,7 @@ exports[`render correctly 1`] = ` />
- .gitattributes +
+ .gitattributes +
@@ -968,12 +976,16 @@ exports[`render correctly 1`] = ` />
- .gitignore +
+ .gitignore +
@@ -1012,12 +1024,16 @@ exports[`render correctly 1`] = ` />
- .travis.yml +
+ .travis.yml +
@@ -1056,12 +1072,16 @@ exports[`render correctly 1`] = ` />
- CONTRIBUTING.md +
+ CONTRIBUTING.md +
@@ -1100,12 +1120,16 @@ exports[`render correctly 1`] = ` />
- CONTRIBUTORS +
+ CONTRIBUTORS +
@@ -1144,12 +1168,16 @@ exports[`render correctly 1`] = ` />
- COPYING +
+ COPYING +
@@ -1188,12 +1216,16 @@ exports[`render correctly 1`] = ` />
- README.md +
+ README.md +
@@ -1232,12 +1264,16 @@ exports[`render correctly 1`] = ` />
- cycle_whitelist.txt +
+ cycle_whitelist.txt +
@@ -1276,12 +1312,16 @@ exports[`render correctly 1`] = ` />
- javadoc-stylesheet.css +
+ javadoc-stylesheet.css +
@@ -1320,12 +1360,16 @@ exports[`render correctly 1`] = ` />
- pom.xml +
+ pom.xml +
diff --git a/x-pack/plugins/code/public/components/file_tree/file_tree.tsx b/x-pack/plugins/code/public/components/file_tree/file_tree.tsx index 4386269007700..7f05c7334b830 100644 --- a/x-pack/plugins/code/public/components/file_tree/file_tree.tsx +++ b/x-pack/plugins/code/public/components/file_tree/file_tree.tsx @@ -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; `; @@ -145,7 +144,7 @@ export class CodeFileTree extends React.Component { > - + {node.name} @@ -165,7 +164,7 @@ export class CodeFileTree extends React.Component { > - + {node.name} @@ -185,7 +184,7 @@ export class CodeFileTree extends React.Component { > - + {node.name} diff --git a/x-pack/plugins/code/public/components/main/main.scss b/x-pack/plugins/code/public/components/main/main.scss index 8bb3290a11e71..c58fea6e1e51f 100644 --- a/x-pack/plugins/code/public/components/main/main.scss +++ b/x-pack/plugins/code/public/components/main/main.scss @@ -26,6 +26,7 @@ } .code-navigation__sidebar { + background-color: $euiColorLightestShade; width: 16rem; border-right: $euiBorderThin; display: flex; @@ -259,3 +260,8 @@ border-top: none; } } + + +.codeIcon__language { + fill: $euiColorDarkestShade; +} diff --git a/x-pack/plugins/code/public/components/shared/icons.tsx b/x-pack/plugins/code/public/components/shared/icons.tsx index 9e4e51eef97ac..1cbbc368a3b8d 100644 --- a/x-pack/plugins/code/public/components/shared/icons.tsx +++ b/x-pack/plugins/code/public/components/shared/icons.tsx @@ -11,7 +11,7 @@ export const TypeScriptIcon = () => ( ( { return (
{this.renderModifier(s)} - {s.key} - {s.help} + {s.key} + {s.help}
); }); @@ -205,7 +181,7 @@ class ShortcutsComponent extends React.Component { private renderModifier(hotKey: HotKey) { if (hotKey.modifier) { const modifiers = hotKey.modifier.get(this.os) || []; - return modifiers.map(m => {this.showModifier(m)}); + return modifiers.map(m =>
{this.showModifier(m)}
); } else { return null; } diff --git a/x-pack/plugins/code/public/index.scss b/x-pack/plugins/code/public/index.scss index 75f7470991ab4..c93e05784ede5 100644 --- a/x-pack/plugins/code/public/index.scss +++ b/x-pack/plugins/code/public/index.scss @@ -13,4 +13,5 @@ @import "./components/admin_page/sidebar.scss"; @import "./style/markdown.scss"; +@import "./style/shortcuts.scss"; @import "./components/symbol_tree/symbol_tree.scss"; diff --git a/x-pack/plugins/code/public/style/markdown.scss b/x-pack/plugins/code/public/style/markdown.scss index 0e9d834738c9d..01ceb042f0348 100644 --- a/x-pack/plugins/code/public/style/markdown.scss +++ b/x-pack/plugins/code/public/style/markdown.scss @@ -4,4 +4,8 @@ color: $euiColorPrimary; text-decoration: underline; } -} \ No newline at end of file +} + +.markdown-body .highlight pre, .markdown-body pre { + background-color: $euiColorLightestShade;; +} diff --git a/x-pack/plugins/code/public/style/shortcuts.scss b/x-pack/plugins/code/public/style/shortcuts.scss new file mode 100644 index 0000000000000..64c427d05a760 --- /dev/null +++ b/x-pack/plugins/code/public/style/shortcuts.scss @@ -0,0 +1,23 @@ +.codeShortcuts__key { + background: $euiColorEmptyShade; + border: $euiBorderThin; + box-sizing: border-box; + box-shadow: 0px 2px 0px $euiColorLightestShade; + border-radius: $euiSizeXS; + width: $euiSizeL; + min-width: $euiSizeL; + height: $euiSizeL; + display: inline-block; + text-align: center; + margin: $euiSizeXS; + line-height: $euiSizeL; + text-transform: uppercase; + font-size: $euiFontSizeS; +} + +.codeShortcuts__help-text { + line-height: $euiSizeL; + font-size: $euiFontSizeS; + margin-left: $euiSizeL / 2; + color: $euiColorDarkestShade; +}