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

Jump to bottom

refactor(action): large component needs to match figma design #2786

Merged
merged 8 commits into from Sep 3, 2021
Merged

refactor(action): large component needs to match figma design #2786

Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e6d6622
refactor(action) large component needs to match figma design
justinhough Aug 11, 2021
718ba6c
refactor(action): large component
justinhough Aug 11, 2021
9b70c43
font size adjustments per #2864
justinhough Aug 30, 2021
efa06ea
Merge branch 'master' into justinhough/2458-action-match-figma
justinhough Aug 30, 2021
bc69136
font normal and margin adjust on button
justinhough Sep 1, 2021
b29cf44
font-normal on all size scales
justinhough Sep 2, 2021
d867e7d
rtl margin left
justinhough Sep 3, 2021
9b1a160
Merge branch 'master' into justinhough/2458-action-match-figma
justinhough Sep 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
50 changes: 40 additions & 10 deletions src/components/calcite-action/calcite-action.scss
View file
Open in desktop
Expand Up @@ -64,16 +64,31 @@
}
}

:host([scale="s"]) .button {
@apply p-2;
:host([scale="s"]) {
.button {
@apply font-normal p-2 text--2h;
}
.button--text-visible .icon-container {
@apply mr-2;
}
asangma marked this conversation as resolved.
Show resolved Hide resolved
}

:host([scale="m"]) .button {
@apply p-4;
:host([scale="m"]) {
.button {
@apply font-normal p-4 text--1h;
}
.button--text-visible .icon-container {
@apply mr-3;
}
}

:host([scale="l"]) .button {
@apply p-5 text--1h;
:host([scale="l"]) {
.button {
@apply font-normal p-5 text-0h;
}
.button--text-visible .icon-container {
@apply mr-4;
}
}

:host([alignment="center"]) .button {
Expand Down Expand Up @@ -107,22 +122,37 @@
@apply w-full;

.icon-container {
@apply m-0 mr-3;
@apply m-0;
}
.text-container--visible {
@apply m-0 mr-2;
}
}

.button--text-visible.calcite--rtl {
.icon-container {
@apply m-0 ml-3;
}
.text-container--visible {
@apply m-0 ml-2;
}
}

:host([scale="s"]) {
.button--text-visible.calcite--rtl .icon-container {
@apply m-0 ml-2;
}
}

:host([scale="m"]) {
.button--text-visible.calcite--rtl .icon-container {
@apply m-0 ml-3;
}
}

:host([scale="l"]) {
.button--text-visible.calcite--rtl .icon-container {
@apply m-0 ml-4;
}
}

:host([active]) .button,
:host([active]) .button:hover,
:host([active]) .button:focus,
Expand Down