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.

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

fix(reset): fix reset specifying anchor color #7216

Merged
merged 22 commits into from
Dec 9, 2020
Merged

fix(reset): fix reset specifying anchor color #7216

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c572c43
fix(reset): fix reset specifying anchor color
Nov 3, 2020
4cd649c
token
Nov 3, 2020
3f612aa
deps
Nov 3, 2020
1cdedfd
Merge branch 'master' into reset
andreancardona Nov 4, 2020
19d5711
remove reset
Nov 19, 2020
c18b4ec
revert
Nov 19, 2020
e389289
Merge branch 'master' into reset
DusanMilko Nov 19, 2020
9b03966
Merge branch 'master' into reset
DusanMilko Nov 20, 2020
94504d7
Merge branch 'master' into reset
DusanMilko Nov 23, 2020
7d2fbdd
update
Nov 23, 2020
01b3a13
Merge branch 'master' into reset
DusanMilko Nov 23, 2020
bec6145
update
Dec 3, 2020
234ec59
Merge branch 'reset' of github.com:DusanMilko/carbon-components into …
Dec 3, 2020
a98ca04
Merge branch 'master' into reset
DusanMilko Dec 3, 2020
38a5c7b
Merge branch 'master' into reset
andreancardona Dec 8, 2020
b1c3400
Merge branch 'master' of github.com:carbon-design-system/carbon into …
joshblack Dec 8, 2020
0a7f757
chore(project): update snapshot
joshblack Dec 8, 2020
936b8a4
Update packages/type/scss/_reset.scss
tw15egan Dec 9, 2020
eb5da88
Merge branch 'master' into reset
DusanMilko Dec 9, 2020
7fef4dc
Merge branch 'master' into reset
DusanMilko Dec 9, 2020
b932848
Merge branch 'master' into reset
DusanMilko Dec 9, 2020
0302891
Merge branch 'master' into reset
joshblack Dec 9, 2020
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
2 changes: 1 addition & 1 deletion packages/components/src/globals/grid/__tests__/__snapshots__/grid-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ p {
letter-spacing: 0; }

a {
color: #0062ff; }
color: #0f62fe; }

em {
font-style: italic; }
Expand Down
8 changes: 7 additions & 1 deletion packages/type/scss/_reset.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,13 @@
}

a {
color: #0062ff;
@if global-variable-exists('carbon--theme') and
map-has-key($carbon--theme, 'link-01')
{
color: map-get($carbon--theme, 'link-01');
} @else {
color: #0062ff;
tw15egan marked this conversation as resolved.
Show resolved Hide resolved
}
}

em {
Expand Down