Skip to content
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.

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

feat(theme): add link02 token #7770

Merged
merged 5 commits into from
Feb 10, 2021
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@
border-bottom: 1px solid $hover-ui;
}

.#{$prefix}--data-table tbody tr:hover td .#{$prefix}--link,
.#{$prefix}--data-table tbody tr:hover th .#{$prefix}--link {
color: $link-02;
}

.#{$prefix}--data-table th,
.#{$prefix}--data-table td {
text-align: left;
Expand Down Expand Up @@ -219,6 +224,10 @@
}
}

.#{$prefix}--data-table--selected .#{$prefix}--link {
color: $link-02;
}

.#{$prefix}--data-table--compact td.#{$prefix}--table-column-menu,
.#{$prefix}--data-table--short td.#{$prefix}--table-column-menu {
height: rem(24px);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ Array [
"layout06",
"layout07",
"link01",
"link02",
"magenta",
"magenta10",
"magenta100",
Expand Down
15 changes: 8 additions & 7 deletions packages/react/src/components/DataTable/stories/shared.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

import React from 'react';
import { action } from '@storybook/addon-actions';
import Link from '../../Link';

export const rows = [
{
Expand All @@ -15,7 +16,7 @@ export const rows = [
port: 3000,
rule: 'Round robin',
attached_groups: 'Kevin’s VM Groups',
status: 'Disabled',
status: <Link>Disabled</Link>,
},
{
id: 'b',
Expand All @@ -24,7 +25,7 @@ export const rows = [
port: 443,
rule: 'Round robin',
attached_groups: 'Maureen’s VM Groups',
status: 'Starting',
status: <Link>Starting</Link>,
},
{
id: 'c',
Expand All @@ -33,7 +34,7 @@ export const rows = [
port: 80,
rule: 'DNS delegation',
attached_groups: 'Andrew’s VM Groups',
status: 'Active',
status: <Link>Active</Link>,
},
{
id: 'd',
Expand All @@ -42,7 +43,7 @@ export const rows = [
port: 3000,
rule: 'Round robin',
attached_groups: 'Marc’s VM Groups',
status: 'Disabled',
status: <Link>Disabled</Link>,
},
{
id: 'e',
Expand All @@ -51,7 +52,7 @@ export const rows = [
port: 443,
rule: 'Round robin',
attached_groups: 'Mel’s VM Groups',
status: 'Starting',
status: <Link>Starting</Link>,
},
{
id: 'f',
Expand All @@ -60,7 +61,7 @@ export const rows = [
port: 80,
rule: 'DNS delegation',
attached_groups: 'Ronja’s VM Groups',
status: 'Active',
status: <Link>Active</Link>,
},
];

Expand Down
3 changes: 3 additions & 0 deletions packages/themes/metadata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ tokens:
role:
- Primary links
- Ghost button
- name: link02
role:
- Secondary link color for lower contrast backgrounds
- name: field01
role:
- Default input fields
Expand Down
1 change: 1 addition & 0 deletions packages/themes/src/g10.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export const icon02 = gray70;
export const icon03 = white;

export const link01 = blue60;
export const link02 = blue70;

export const inverseLink = blue40;

Expand Down
1 change: 1 addition & 0 deletions packages/themes/src/g100.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export const icon02 = gray30;
export const icon03 = white;

export const link01 = blue40;
export const link02 = blue30;

export const inverseLink = blue60;

Expand Down
1 change: 1 addition & 0 deletions packages/themes/src/g90.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ export const icon02 = gray30;
export const icon03 = white;

export const link01 = blue40;
export const link02 = blue30;

export const inverseLink = blue60;

Expand Down
2 changes: 2 additions & 0 deletions packages/themes/src/tokens.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const colors = [
'icon03',

'link01',
'link02',

'inverseLink',

Expand Down Expand Up @@ -187,6 +188,7 @@ export const unstable__meta = {
'text05',
'textError',
'link01',
'link02',
'icon01',
'icon02',
'icon03',
Expand Down
1 change: 1 addition & 0 deletions packages/themes/src/v9.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export const icon02 = '#5a6872';
export const icon03 = white;

export const link01 = '#3d70b2';
export const link02 = '#3d70b2';

export const inverseLink = '#5596e6';

Expand Down
1 change: 1 addition & 0 deletions packages/themes/src/white.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export const icon02 = gray70;
export const icon03 = white;

export const link01 = blue60;
export const link02 = blue70;

export const inverseLink = blue40;

Expand Down