Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
da4833e
Stuff
Thunear Nov 5, 2024
6da0a67
Sync
Thunear Nov 5, 2024
344f33d
Merge branch 'next' into chore/themebuilder-v2
Thunear Nov 6, 2024
f092cd4
More stuff
Thunear Nov 7, 2024
73d9a5e
Added color functionality
Thunear Nov 11, 2024
22db994
Merge branch 'next' into chore/themebuilder-v2
Thunear Nov 11, 2024
f2180cc
Update Components.tsx
Thunear Nov 11, 2024
8ddb6b8
Removed toolbar
Thunear Nov 11, 2024
a87a960
Update index.ts
Thunear Nov 11, 2024
2bf964d
Added list grid
Thunear Nov 11, 2024
e41e420
Update ColorPreview.module.css
Thunear Nov 11, 2024
8e9cfd2
Stuff
Thunear Nov 11, 2024
e739fb0
Update ColorPane.module.css
Thunear Nov 11, 2024
bbb1afe
Update Color.module.css
Thunear Nov 11, 2024
394e58d
Fixes
Thunear Nov 12, 2024
af494df
Fix type
Thunear Nov 12, 2024
a0f2971
More stuff
Thunear Nov 13, 2024
dd287c6
Stuff
Thunear Nov 13, 2024
2c35287
Spacing
Thunear Nov 13, 2024
8e612f2
sync
Thunear Nov 13, 2024
9b5b664
Sync
Thunear Nov 18, 2024
b4e0d2b
Stuff
Thunear Nov 18, 2024
1763190
Merge branch 'next' into chore/themebuilder-v2
Thunear Nov 18, 2024
3e63d78
Stuff
Thunear Nov 18, 2024
392e607
Update ColorPreview.module.css
Thunear Nov 18, 2024
3f060f6
Some fixes
Thunear Nov 18, 2024
a326572
Sync
Thunear Nov 18, 2024
90013ad
Added tab nav between colors
Thunear Nov 21, 2024
ce1da29
Merge branch 'next' into chore/themebuilder-v2
Thunear Nov 21, 2024
d34db46
Update ThemeWrapper.tsx
Thunear Nov 21, 2024
ef541d3
Updated CLI code snippet with colors
Thunear Nov 22, 2024
1efddea
Update Sidebar.tsx
Thunear Nov 22, 2024
03f51bb
Merge branch 'next' into chore/themebuilder-v2
Thunear Nov 22, 2024
b551e33
Fix linting errors
Thunear Nov 22, 2024
df5af00
Update TokenModal.tsx
Thunear Nov 22, 2024
8586c77
Update TokenModal.tsx
Thunear Nov 22, 2024
f22ca8a
sync
Thunear Nov 24, 2024
68df302
Stuff
Thunear Nov 25, 2024
d54bc99
Update page.tsx
Thunear Nov 25, 2024
dd0503d
Update page.tsx
Thunear Nov 25, 2024
d2bc562
Update ColorPage.tsx
Thunear Nov 25, 2024
6ae0f35
Stuff
Thunear Nov 25, 2024
4548655
Update RadiusPage.tsx
Thunear Nov 25, 2024
a38a0b6
Sync
Thunear Nov 25, 2024
2087574
Merge branch 'next' into chore/themebuilder-v2
Thunear Nov 25, 2024
151121f
Update FinishPage.tsx
Thunear Nov 25, 2024
b460728
Stuff
Thunear Nov 26, 2024
e91a83c
Stuff
Thunear Nov 27, 2024
e502f72
Update BorderRadius.tsx
Thunear Nov 27, 2024
dcfc54c
Update BorderRadius.module.css
Thunear Nov 27, 2024
b92be43
correct import
Barsnes Dec 6, 2024
23f08f6
Merge branch 'next' into chore/themebuilder-v2
Barsnes Dec 6, 2024
e0f9ef2
token modal language
Barsnes Dec 6, 2024
92da14c
make params work
Barsnes Dec 9, 2024
748e579
Merge branch 'next' into chore/themebuilder-v2
Barsnes Dec 9, 2024
36c34c7
update default colors
Barsnes Dec 9, 2024
73bcce5
example modal
Barsnes Dec 9, 2024
82b5205
new modal
Barsnes Dec 9, 2024
110898b
more spacing on step 2
Barsnes Dec 9, 2024
655a04a
size and spacing
Barsnes Dec 9, 2024
20711d4
correct text
Barsnes Dec 9, 2024
fce987d
import and sizing-8
Barsnes Dec 9, 2024
fe30312
misc and last
Barsnes Dec 9, 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
10 changes: 9 additions & 1 deletion apps/_components/src/CodeSnippet/CodeSnippet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,15 @@ const plugins = [
];

type CodeSnippetProps = {
language?: 'css' | 'html' | 'ts' | 'markdown' | 'json' | 'shell' | 'tsx';
language?:
| 'css'
| 'html'
| 'ts'
| 'markdown'
| 'json'
| 'shell'
| 'tsx'
| 'bash';
children: string;
} & React.HTMLAttributes<HTMLDivElement>;

Expand Down
2 changes: 1 addition & 1 deletion apps/_components/src/Container/Container.module.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.container {
max-width: var(--grid-max-width, 1620px);
max-width: var(--grid-max-width, 1450px);
margin: 0 auto;
width: 100%;
padding-left: var(--grid-padding, 16px);
Expand Down
12 changes: 8 additions & 4 deletions apps/_components/src/Header/Header.module.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.header {
height: 106px;
height: 100px;
display: flex;
align-items: center;
position: relative;
Expand All @@ -12,6 +12,10 @@
}
}

.header.transparentHeader {
background-color: transparent;
}

.container {
display: flex;
align-items: center;
Expand Down Expand Up @@ -49,10 +53,10 @@
}

.tag {
background-color: var(--ds-global-purple-5);
background-color: var(--ds-global-purple-4);
border-radius: 4px;
padding: 7px 10px;
font-size: 18px;
padding: 4px 10px;
font-size: 16px;
font-weight: 500;
}

Expand Down
8 changes: 7 additions & 1 deletion apps/_components/src/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ type HeaderProps = {
betaTag?: boolean;
skipLink?: boolean;
themeSwitcher?: boolean;
transparentBackground?: boolean;
};

/**
Expand Down Expand Up @@ -63,6 +64,7 @@ const Header = ({
betaTag,
skipLink = true,
themeSwitcher = false,
transparentBackground = false,
}: HeaderProps) => {
const [open, setOpen] = useState(false);
const [isHamburger, setIsHamburger] = useState(false);
Expand Down Expand Up @@ -107,7 +109,11 @@ const Header = ({
<SkipLink href='#main'>Hopp til hovedinnhold</SkipLink>
) : null}
<header
className={cl(classes.header, isHamburger && classes.hamburger)}
className={cl(
classes.header,
isHamburger && classes.hamburger,
transparentBackground && classes.transparentHeader,
)}
ref={headerRef}
>
<div className={classes.container}>
Expand Down
50 changes: 49 additions & 1 deletion apps/theme/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,54 @@ code {
border-radius: 2px;
}

[data-theme='two'] {
--ds-color-accent-base-default: #740c7e;
--ds-color-accent-text-subtle: #93429b;
--ds-color-base-default: #740c7e;
--ds-color-accent-surface-hover: #6c0b75 !important;
}

[data-color-scheme='dark'][data-theme='two'] {
--ds-color-accent-base-default: #c79dcb;
--ds-color-accent-text-subtle: #c294c6;
--ds-color-base-default: #c79dcb;
--ds-color-accent-surface-hover: #6c0b75 !important;
}

.panelContainer {
display: flex;
}

.panelLeft {
display: flex;
flex-direction: column;
gap: 12px;
width: 420px;
padding: 28px;
border-right: 1px solid var(--ds-color-neutral-border-subtle);
position: relative;
}

.panelRight {
display: grid;
grid-template-columns: repeat(1, 1fr);
grid-auto-rows: min-content;
width: 100%;
gap: 12px;
padding: 28px;
background-color: var(--ds-color-neutral-background-subtle);
border-radius: 0 8px 8px 0;
}

.panelBottom {
left: 0;
right: 0;
bottom: 0;
padding: 28px;
position: absolute;
border-top: 1px solid var(--ds-color-neutral-border-subtle);
}

.content {
min-height: 100vh;
min-height: 100svh;
}
14 changes: 10 additions & 4 deletions apps/theme/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import type { Metadata } from 'next';
import './globals.css';

import '@digdir/designsystemet-css';
import '@digdir/designsystemet-theme';
import 'react-color-palette/css';
import './globals.css';
import { EnvelopeClosedIcon } from '@navikt/aksel-icons';
import { Figma, Footer, Github, Header, Slack } from '@repo/components';

import { ThemeWrapper } from '../components/ThemeWrapper/ThemeWrapper';

export const metadata: Metadata = {
title: 'Temabygger - Designsystemet',
description: 'Bygg ditt eget tema med designsystemet',
Expand Down Expand Up @@ -67,9 +71,11 @@ export default function RootLayout({
return (
<html lang='no'>
<body>
<Header menu={menu} betaTag />
<div className='content'>{children}</div>
<Footer centerLinks={centerLinks} rightLinks={rightLinks} />
<ThemeWrapper>
<Header menu={menu} betaTag transparentBackground={true} />
<div className='content'>{children}</div>
<Footer centerLinks={centerLinks} rightLinks={rightLinks} />
</ThemeWrapper>
</body>
</html>
);
Expand Down
137 changes: 24 additions & 113 deletions apps/theme/app/page.module.css
Original file line number Diff line number Diff line change
@@ -1,134 +1,45 @@
.main {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
margin-top: 4px;
margin-bottom: 100px;
font-size: 18px;
}

.container {
max-width: 1600px;
margin: 0 auto;
width: 100%;
background: linear-gradient(180deg, rgba(255, 255, 255, 0.2) 25%, rgba(30, 152, 245, 0.2) 55%);
margin-top: -106px;
padding-top: 106px;
}

.colors {
display: flex;
}

.top {
display: flex;
[data-color-scheme='dark'] .main {
background: linear-gradient(180deg, rgba(0, 28, 54, 1) 20%, rgba(30, 152, 245, 0.2) 45%);
}

.swatchContainer {
border: 1px solid #c0c0c0;
height: 260px;
width: 495px;
padding: 20px;
margin-right: 32px;
border-radius: 4px;
gap: 20px;
display: flex;
flex-direction: column;
}

.tom {
display: flex;
align-items: center;
gap: 16px;
font-size: 16px;
}

.swatch {
height: 30px;
width: 30px;
border-radius: 50%;
}

.swatch:hover {
cursor: pointer;
}

.swatches {
display: flex;
align-items: center;
gap: 10px;
div[data-color-scheme='light'][data-theme='two'] .main {
background: linear-gradient(180deg, rgba(255, 255, 255, 0.2) 20.33%, rgba(116, 12, 126, 0.2) 57.04%);
}

.box {
display: flex;
align-items: end;
justify-content: center;
gap: 32px;
padding: 12px 80px 40px;
border-radius: 8px;
div[data-color-scheme='dark'][data-theme='two'] .main {
background: linear-gradient(180deg, #131c27 20.33%, #280f36 57.04%);
}

.title {
.header {
width: 600px;
margin: 0 auto;
text-align: center;
margin-bottom: 36px;
font-size: 32px;
font-weight: 500;
margin-top: 0;
}

.test2 {
display: flex;
align-items: center;
justify-content: center;
margin-top: var(--ds-spacing-2);
}

.test {
margin-bottom: 16px;
font-size: 21px;
border-radius: 2px;
font-weight: 400;
color: rgb(104, 104, 104);
letter-spacing: 0.5px;
.heading {
margin-top: var(--ds-spacing-1);
}

.tokens {
margin-top: 40px;
.desc {
margin-top: var(--ds-spacing-5);
}

.tokens h3 {
font-size: 18px;
font-weight: 500;
margin-bottom: 8px;
}

.tokens h2 {
font-size: 22px;
margin-bottom: 0;
}

.token {
font-size: 16px;
}

.token div {
margin-bottom: 6px;
}

.brandRow {
margin-top: 24px;
}

.contrastSection {
.btnGroup {
display: flex;
gap: 20px;
align-items: center;
gap: 2px;
height: 52px;
width: 85px;
font-size: 16px;
}

.contrastSection svg {
color: #c90000;
justify-content: center;
margin-top: var(--ds-spacing-7);
}

.contrastSectionSuccess svg {
color: #090;
.headerText {
color: var(--ds-color-accent-base-default);
font-weight: 600;
}
Loading