Skip to content

feat(design, daffio, demo): create typography css variables and update usage in apps #4443

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

Open
xelaint wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat(design, daffio, demo): create typography css variables and update usage in apps #4443

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
2 changes: 1 addition & 1 deletion ...rc/app/content/home/components/home-callout-commerce/home-callout-commerce.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
align-items: center;
justify-content: center;
gap: 0.75rem;
font-size: daff.$font-size-sm;
font-size: var(--daff-font-size-sm);
border-radius: 2rem;
padding: 0.5rem 1rem;

Expand Down
2 changes: 1 addition & 1 deletion apps/daffio/src/app/core/footer/docs-footer/docs-footer.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

&__link,
&__copyright {
font-size: daff.$font-size-sm;
font-size: var(--daff-font-size-sm);
line-height: 1rem;
}

Expand Down
2 changes: 1 addition & 1 deletion apps/daffio/src/app/core/footer/footer/footer.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

:host {
display: block;
font-size: daff.$font-size-sm;
font-size: var(--daff-font-size-sm);
padding: 24px;

@include daff.breakpoint(big-tablet) {
Expand Down
2 changes: 1 addition & 1 deletion apps/daffio/src/app/core/header/components/header/header.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
align-items: center;
gap: 0.5rem;
color: currentColor;
font-size: daff.$font-size-base;
font-size: var(--daff-font-family-base);
font-weight: 500;
line-height: 64px;
padding: 0 1rem;
Expand Down
4 changes: 1 addition & 3 deletions apps/daffio/src/app/docs/api/components/api-item-label/api-item-label.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
@use '@daffodil/design/scss/utilities' as daff;

:host {
display: block;
border-radius: 0.25rem;
font-family: daff.$font-family-mono;
font-family: var(--daff-font-family-mono);
font-size: 0.625rem;
font-weight: 500;
line-height: 0.875rem;
Expand Down
6 changes: 3 additions & 3 deletions ...-notification/components/add-to-cart-notification/add-to-cart-notification.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

&__check-icon {
margin-right: 15px;
font-size: $font-size-md;
font-size: var(--daff-font-size-md);
}

&__close {
position: absolute;
top: 15px;
right: 25px;
font-size: $font-size-md;
font-size: var(--daff-font-size-md);
@include clickable();
}

Expand All @@ -45,7 +45,7 @@
}

> * {
font-size: $font-size-md;
font-size: var(--daff-font-size-md);
flex: 1;
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...components/add-to-cart-notification/components/product-added/product-added.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@

&__name {
@include clickable();
font-size: $font-size-md;
font-size: var(--daff-font-size-md);
font-weight: bold;
margin-bottom: 5px;
}

&__price {
font-size: $font-size-md;
font-size: var(--daff-font-size-md);
color: demo-theme.daff-color(demo-theme.$secondary);
margin-bottom: 15px;
}

&__info {
font-size: $font-size-sm;
font-size: var(--daff-font-size-sm);
line-height: 1.25rem;
}
}
2 changes: 1 addition & 1 deletion apps/demo/src/app/cart/components/cart-item-count/cart-item-count.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

.demo-cart-item-count {
color: daff-color($daff-neutral, 80);
font-size: $font-size-sm;
font-size: var(--daff-font-size-sm);
}
2 changes: 1 addition & 1 deletion apps/demo/src/app/cart/components/cart-item/cart-item.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

.demo-cart-item {
display: grid;
font-size: $font-size-sm;
font-size: var(--daff-font-size-sm);
column-gap: 20px;
row-gap: 15px;
grid-template-columns: 1fr 3fr;
Expand Down
2 changes: 1 addition & 1 deletion apps/demo/src/app/cart/components/cart-sidebar/cart-sidebar.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
margin: 25px 0 0;
justify-content: center;
width: 100%;
font-size: $font-size-md;
font-size: var(--daff-font-size-md);
}

&__cart-totals {
Expand Down
4 changes: 2 additions & 2 deletions apps/demo/src/app/cart/components/cart-summary/cart-summary.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
&__edit-cart {
grid-area: edit;
justify-self: right;
font-size: $font-size-sm;
font-size: var(--daff-font-size-sm);
text-decoration: underline;
@include clickable();

Expand All @@ -49,6 +49,6 @@
&__item-count {
float: right;
color: daff-color($daff-neutral, 80);
font-size: $font-size-sm;
font-size: var(--daff-font-size-sm);
}
}
4 changes: 2 additions & 2 deletions apps/demo/src/app/cart/components/minicart-item/minicart-item.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}

&__info {
font-size: $font-size-sm;
font-size: var(--daff-font-size-sm);
color: demo-theme.daff-color(demo-theme.$neutral, 90);
line-height: 1.25rem;
}
Expand All @@ -45,7 +45,7 @@
}

> * {
font-size: $font-size-sm;
font-size: var(--daff-font-size-sm);
color: demo-theme.daff-color(demo-theme.$neutral);
text-decoration: underline;

Expand Down
2 changes: 1 addition & 1 deletion apps/demo/src/app/checkout/components/payment/billing-summary/billing-summary.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use '@daffodil/design/scss/utilities' as *;

.demo-checkout-billing-summary {
font-size: $font-size-sm;
font-size: var(--daff-font-size-sm);

&__title {
font-weight: bold;
Expand Down
2 changes: 1 addition & 1 deletion apps/demo/src/app/checkout/components/payment/payment-form/payment-form.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

&__note {
text-align: center;
font-size: $font-size-sm;
font-size: var(--daff-font-size-sm);

@include breakpoint(big-tablet) {
text-align: left;
Expand Down
2 changes: 1 addition & 1 deletion apps/demo/src/app/checkout/components/payment/payment-summary/payment-summary.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use '@daffodil/design/scss/utilities' as *;

.demo-checkout-payment-summary {
font-size: $font-size-sm;
font-size: var(--daff-font-size-sm);
display: grid;
grid-template-columns: 4fr 1fr;
grid-template-areas:
Expand Down
6 changes: 3 additions & 3 deletions .../app/checkout/components/shipping-address/summary/shipping-address-summary.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use '@daffodil/design/scss/utilities' as *;

.demo-checkout-shipping-address-summary {
font-size: $font-size-sm;
font-size: var(--daff-font-size-sm);
display: grid;
grid-template-columns: 4fr 1fr;
grid-template-areas:
Expand All @@ -21,7 +21,7 @@
}

&__title {
font-size: 1rem;
font-size: var(--daff-font-size-base);
font-weight: bold;
margin-bottom: 15px;
text-transform: uppercase;
Expand All @@ -35,7 +35,7 @@
&__edit {
grid-area: edit;
display: block;
font-size: 0.875rem;
font-size: var(--daff-font-size-sm);
text-decoration: underline;
justify-self: end;
@include clickable();
Expand Down
2 changes: 1 addition & 1 deletion ...nts/shipping/shipping-options/components/shipping-options/shipping-options.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
}

&__invalid {
font-size: $font-size-sm;
font-size: var(--daff-font-size-sm);
color: $error;
}

Expand Down
4 changes: 2 additions & 2 deletions ...emo/src/app/checkout/components/shipping/shipping-summary/shipping-summary.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use '@daffodil/design/scss/utilities' as *;

.demo-checkout-shipping-summary {
font-size: $font-size-sm;
font-size: var(--daff-font-size-sm);
display: grid;
grid-template-columns: 4fr 1fr;
grid-template-areas:
Expand Down Expand Up @@ -35,7 +35,7 @@
&__edit {
grid-area: edit;
display: block;
font-size: 0.875rem;
font-size: var(--daff-font-size-sm);
text-decoration: underline;
justify-self: end;
@include clickable();
Expand Down
2 changes: 1 addition & 1 deletion apps/demo/src/app/core/sidebar/containers/sidebar/sidebar.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

&__close {
@include clickable();
font-size: $font-size-md;
font-size: var(--daff-font-size-md);
position: absolute;
right: 25px;
top: 25px;
Expand Down
2 changes: 1 addition & 1 deletion apps/demo/src/app/product/components/add-to-cart/add-to-cart.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
width: 100%;

button {
font-size: $font-size-md;
font-size: var(--daff-font-size-md);
width: 100%;
}
}
2 changes: 1 addition & 1 deletion apps/demo/src/app/product/components/product-card/product-card.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

&__details {
padding: 15px 15px 0;
font-size: $font-size-sm;
font-size: var(--daff-font-size-sm);
}

&__brand {
Expand Down
6 changes: 3 additions & 3 deletions apps/demo/src/app/product/components/product/product.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,18 @@

&__brand {
color: daff-color($daff-neutral, 80);
font-size: $font-size-md;
font-size: var(--daff-font-size-md);
font-weight: normal;
}

&__name {
font-size: $font-size-lg;
font-size: var(--daff-font-size-lg);
font-weight: bold;
padding: 5px 0;
}

&__price {
font-size: $font-size-md;
font-size: var(--daff-font-size-md);
}

&__qty {
Expand Down
2 changes: 1 addition & 1 deletion apps/demo/src/app/product/containers/best-sellers/best-sellers.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.demo-best-sellers {
&__title {
font-weight: bold;
font-size: $font-size-md;
font-size: var(--daff-font-size-md);
margin-bottom: 30px;
text-align: center;
text-transform: uppercase;
Expand Down
28 changes: 15 additions & 13 deletions libs/design/article/src/article/article.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
@use '../../../scss/layout';
@use 'stops-article-cascade' as *;

@mixin default-code-text() {
font-size: var(--daff-font-size-sm);
font-weight: 600;
line-height: 0.875rem;
}

.daff-article {
display: block;
overflow: hidden;
Expand All @@ -15,9 +21,7 @@
}

code {
font-size: 0.875rem;
font-weight: 600;
line-height: 0.875rem;
@include default-code-text();
}
}

Expand All @@ -27,9 +31,7 @@
overflow-wrap: break-word;

code {
font-size: 0.875rem;
font-weight: 600;
line-height: 0.875rem;
@include default-code-text();
}
}

Expand All @@ -43,7 +45,7 @@
font-weight: 400;

code {
font-size: 1rem;
font-size: var(--daff-font-size-base);
line-height: 1rem;
}

Expand All @@ -69,13 +71,13 @@
}

@include stopsArticleCascade(h3) {
font-size: 1.5rem;
font-size: var(--daff-font-size-lg);
line-height: 2rem;
margin-top: 2.5rem;
}

@include stopsArticleCascade(h4) {
font-size: 1.25rem;
font-size: var(--daff-font-size-md);
line-height: 1.5rem;
margin-top: 2rem;
}
Expand All @@ -88,7 +90,7 @@
}

@include stopsArticleCascade(h6) {
font-size: 1rem;
font-size: var(--daff-font-size-base);
font-weight: 600;
line-height: 1.5rem;
margin-top: 1.5rem;
Expand All @@ -113,21 +115,21 @@
code {
display: block;
line-height: 1.5rem;
font-size: t.$font-size-sm;
font-size: var(--daff-font-size-sm);
overflow-x: auto;
padding: 1.5rem;
}
}

code {
border-radius: 0.25rem;
font-size: t.$font-size-sm;
font-size: var(--daff-font-size-sm);
line-height: 1rem;
padding: 0.125rem 0.25rem;
}

&__meta {
font-size: t.$font-size-sm;
font-size: var(--daff-font-size-sm);
}

hr {
Expand Down
Loading
Loading