Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

D

design-system-lib
- Activity
- Members

Snippets Groups Projects

a6005130

Commit a6005130 authored 4 years ago by Tuukka Turu

Downloads
- Plain Diff

Merge latest master and fix conflict

parents 1110178b 4f631132

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

package.json 1 addition, 1 deletion

package.json
src/components.d.ts 1 addition, 0 deletions

src/components.d.ts
src/components/navigation/menu-language/menu-language.tsx 4 additions, 8 deletions

src/components/navigation/menu-language/menu-language.tsx
src/components/site-header/hy-desktop-menu-links/hy-desktop-menu-links.scss 18 additions, 10 deletions

...e-header/hy-desktop-menu-links/hy-desktop-menu-links.scss
src/components/site-header/hy-desktop-menu-links/hy-desktop-menu-links.tsx 38 additions, 8 deletions

...te-header/hy-desktop-menu-links/hy-desktop-menu-links.tsx
src/components/site-header/readme.md 6 additions, 0 deletions

src/components/site-header/readme.md
src/components/site-header/site-header.scss 4 additions, 1 deletion

src/components/site-header/site-header.scss
src/components/site-header/site-header.tsx 7 additions, 3 deletions

src/components/site-header/site-header.tsx

with 79 additions and 31 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment