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

fix: adjust breadcrumb and typography #1110

Merged
merged 11 commits into from
Jun 20, 2024
Merged

fix: adjust breadcrumb and typography #1110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ec5bdd5
Merge branch 'master' of github.com:ocean-ds/ocean-web
danimuller20 Apr 16, 2024
dd449a5
Merge branch 'master' of github.com:ocean-ds/ocean-web
danimuller20 Apr 18, 2024
db5e3fe
Merge branch 'master' of github.com:ocean-ds/ocean-web
danimuller20 May 15, 2024
5d5a933
Merge branch 'master' of github.com:ocean-ds/ocean-web
danimuller20 May 16, 2024
9374583
Merge branch 'master' of github.com:ocean-ds/ocean-web
danimuller20 Jun 11, 2024
6a6bf59
Merge branch 'master' of github.com:ocean-ds/ocean-web
danimuller20 Jun 14, 2024
745da9d
Merge branch 'master' of github.com:ocean-ds/ocean-web
danimuller20 Jun 17, 2024
58939ae
Merge branch 'master' of github.com:ocean-ds/ocean-web
danimuller20 Jun 18, 2024
0ec2aff
Merge branch 'master' of github.com:ocean-ds/ocean-web
danimuller20 Jun 19, 2024
fb8429c
Merge branch 'master' of github.com:ocean-ds/ocean-web
danimuller20 Jun 20, 2024
584c4ce
fix: fix typography and breadcrumbs
danimuller20 Jun 20, 2024
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
5 changes: 3 additions & 2 deletions packages/ocean-core/src/components/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
font-family: $font-family-base;
font-size: $font-size-sm;
font-weight: $font-weight-bold;
line-height: $line-height-comfy;
}

&__description {
Expand All @@ -84,7 +85,7 @@
}

&__captionbold {
color: $color_interface_dark_up;
color: $color-interface-dark-down;
font-family: $font-family-base;
font-size: $font-size-xxxs;
font-weight: $font-weight-medium;
Expand All @@ -96,7 +97,7 @@
font-family: $font-family-base;
font-size: $font-size-xxxs;
font-weight: $font-weight-bold;
letter-spacing: 2.8px;
letter-spacing: 1.8px;
line-height: $line-height-comfy;
text-transform: uppercase;
}
Expand Down
7 changes: 7 additions & 0 deletions packages/ocean-core/src/components/breadcrumb.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.ods-breadcrumb {
align-items: center;
display: flex;
font-family: $font-family-base;
font-size: $font-size-xxxs;
gap: 4px;
padding: 6px 0;

Expand All @@ -23,11 +25,16 @@
border: transparent;
outline: 1px solid transparent;
padding: 0;

svg {
color: $color-interface-dark-down;
}
}

span,
button,
a {
background-color: transparent;
color: $color-interface-dark-up;
font-family: $font-family-base;
font-size: $font-size-xxxs;
Expand Down
Loading