Skip to content

feat: dark theme improvements #26

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 1 commit into from
Jun 12, 2019
Merged

feat: dark theme improvements #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/components/SchemaRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { MarkdownViewer } from '@stoplight/markdown-viewer';
import { IRowRendererOptions, TreeStore } from '@stoplight/tree-list';
import { Colors, Icon, Popover } from '@stoplight/ui-kit';
import { Icon, Popover } from '@stoplight/ui-kit';
import * as cn from 'classnames';
import * as React from 'react';

Expand Down Expand Up @@ -80,14 +80,14 @@ export const SchemaRow: React.FunctionComponent<ISchemaRow> = ({ node, treeStore
<Icon
iconSize={ICON_SIZE}
icon={treeStore.isNodeExpanded(node) ? 'caret-down' : 'caret-right'}
color={Colors.GRAY1}
className="text-darken-9 dark:text-lighten-9"
/>
</div>
)}

{schemaNode.divider && (
<div className="flex items-center w-full absolute" style={{ top: -9, height: 1 }}>
<div className="text-darken-7 dark:text-lighten-7 uppercase text-xs pr-2 -ml-4">{schemaNode.divider}</div>
<div className="text-darken-7 dark:text-lighten-8 uppercase text-xs pr-2 -ml-4">{schemaNode.divider}</div>
<div className="flex-1 bg-darken-5 dark:bg-lighten-5" style={{ height: 1 }} />
</div>
)}
Expand All @@ -105,18 +105,18 @@ export const SchemaRow: React.FunctionComponent<ISchemaRow> = ({ node, treeStore
</a>
) : null}

{node.canHaveChildren && <div className="ml-2 text-darken-7 dark:text-lighten-6">{`{${childrenCount}}`}</div>}
{node.canHaveChildren && <div className="ml-2 text-darken-7 dark:text-lighten-7">{`{${childrenCount}}`}</div>}

{'pattern' in schemaNode && schemaNode.pattern ? (
<div className="ml-2 text-darken-7 dark:text-lighten-6 truncate">(pattern property)</div>
<div className="ml-2 text-darken-7 dark:text-lighten-7 truncate">(pattern property)</div>
) : null}

{description && (
<Popover
boundary="window"
interactionKind="hover"
className="ml-2 flex-1 truncate flex items-baseline"
target={<div className="text-darken-7 dark:text-lighten-6 w-full truncate">{description}</div>}
target={<div className="text-darken-7 dark:text-lighten-7 w-full truncate">{description}</div>}
targetClassName="text-darken-7 dark:text-lighten-6 w-full truncate"
content={
<div className="p-5" style={{ maxHeight: 500, maxWidth: 400 }}>
Expand Down
14 changes: 7 additions & 7 deletions src/components/Types.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,17 @@ Types.displayName = 'JsonSchemaViewer.Types';
* HELPERS
*/
export const PropertyTypeColors: Dictionary<string, IType['type']> = {
object: 'text-blue-6',
object: 'text-blue-6 dark:text-blue-4',
any: 'text-blue-5',
array: 'text-green-6',
array: 'text-green-6 dark:text-green-4',
allOf: 'text-orange-5',
oneOf: 'text-orange-5',
anyOf: 'text-orange-5',
oneOf: 'text-orange-5',
null: 'text-orange-5',
integer: 'text-red-7',
number: 'text-red-7',
integer: 'text-red-7 dark:text-red-6',
number: 'text-red-7 dark:text-red-6',
boolean: 'text-red-4',
binary: 'text-green-4',
string: 'text-green-7',
$ref: 'text-purple-6',
string: 'text-green-7 dark:text-green-5',
$ref: 'text-purple-6 dark:text-purple-4',
};