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(navigation-logo): Increase font-size of heading with no description #7081

Merged
merged 18 commits into from
Jun 28, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
45b06a8
feat(navigation-logo): Increase font-size of heading with no description
macandcheese Jun 1, 2023
8afd160
Merge branch 'master' into macandcheese/7080-navigation-logo-font-size
macandcheese Jun 2, 2023
7a9742a
Merge branch 'master' into macandcheese/7080-navigation-logo-font-size
macandcheese Jun 7, 2023
2446e68
Merge branch 'master' into macandcheese/7080-navigation-logo-font-size
macandcheese Jun 9, 2023
48906b9
Merge branch 'master' into macandcheese/7080-navigation-logo-font-size
macandcheese Jun 13, 2023
20422fa
Merge branch 'master' into macandcheese/7080-navigation-logo-font-size
macandcheese Jun 15, 2023
fd3f5c6
Merge branch 'master' into macandcheese/7080-navigation-logo-font-size
macandcheese Jun 20, 2023
8faa86c
Merge branch 'master' into macandcheese/7080-navigation-logo-font-size
macandcheese Jun 21, 2023
ef659c9
Merge branch 'master' into macandcheese/7080-navigation-logo-font-size
macandcheese Jun 22, 2023
da3cc94
Merge branch 'master' into macandcheese/7080-navigation-logo-font-size
macandcheese Jun 26, 2023
8fa1f0b
Merge branch 'master' into macandcheese/7080-navigation-logo-font-size
macandcheese Jun 27, 2023
688122c
Merge branch 'master' into macandcheese/7080-navigation-logo-font-size
macandcheese Jun 27, 2023
b0b2404
Merge branch 'master' into macandcheese/7080-navigation-logo-font-size
macandcheese Jun 27, 2023
5705a27
Merge branch 'master' into macandcheese/7080-navigation-logo-font-size
macandcheese Jun 28, 2023
1782269
Merge branch 'master' into macandcheese/7080-navigation-logo-font-size
macandcheese Jun 28, 2023
b28cf49
Merge branch 'master' into macandcheese/7080-navigation-logo-font-size
macandcheese Jun 28, 2023
2b7f154
Merge branch 'master' into macandcheese/7080-navigation-logo-font-size
macandcheese Jun 28, 2023
bdfdaeb
Merge branch 'master' into macandcheese/7080-navigation-logo-font-size
macandcheese Jun 28, 2023
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
4 changes: 4 additions & 0 deletions src/components/navigation-logo/navigation-logo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@
font-medium;
}

.standalone {
@apply text-1;
}

.description {
@apply text-color-2 truncate;
font-size: var(--calcite-font-size--1);
Expand Down
9 changes: 8 additions & 1 deletion src/components/navigation-logo/navigation-logo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,14 @@ export class CalciteNavigationLogo implements LoadableComponent {
{(heading || description) && (
<div class={CSS.container}>
{heading && (
<span aria-label={this.heading} class={CSS.heading} key={CSS.heading}>
<span
aria-label={this.heading}
class={{
[CSS.heading]: true,
[CSS.standalone]: !this.description
}}
key={CSS.heading}
>
{heading}
</span>
)}
Expand Down
3 changes: 2 additions & 1 deletion src/components/navigation-logo/resources.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ export const CSS = {
heading: "heading",
description: "description",
anchor: "anchor",
image: "image"
image: "image",
standalone: "standalone"
};