Skip to content

Commit f0978d3

Browse files
committed
Harmonize design
1 parent 52ab205 commit f0978d3

29 files changed

Lines changed: 194 additions & 652 deletions

File tree

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/internals/tailwind/config.js

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/* Default config: https://github.com/tailwindlabs/tailwindcss/blob/master/stubs/defaultConfig.stub.js */
2+
3+
// TODO: move into @darekkay/styles and inherit
4+
15
module.exports = {
26
prefix: "",
37
important: false,
@@ -39,16 +43,16 @@ module.exports = {
3943

4044
// Typography
4145

42-
// Update styles/typography.scss as well
46+
// Update styles/_variables.scss as well
4347
fontSize: {
4448
0: "1rem",
4549
1: "1.2rem",
4650
2: "1.4rem",
47-
3: "1.8rem",
48-
4: "2rem",
49-
5: "2.5rem",
50-
6: "3rem",
51-
7: "4rem",
51+
3: "1.6rem",
52+
4: "1.8rem",
53+
5: "2rem",
54+
6: "2.4rem",
55+
7: "3rem",
5256
},
5357

5458
fontWeight: {
@@ -68,6 +72,13 @@ module.exports = {
6872
loose: "2",
6973
},
7074

75+
letterSpacing: {
76+
tighter: "-0.05em",
77+
tight: "-0.025em",
78+
normal: "0em",
79+
wide: "0.025em",
80+
},
81+
7182
// Spacing
7283

7384
spacing: {
@@ -98,6 +109,12 @@ module.exports = {
98109

99110
// Misc
100111

112+
boxShadow: {
113+
sm: "0 1px 2px 0 rgba(0, 0, 0, 0.05)",
114+
md: "0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06)",
115+
lg: "0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05)",
116+
xl: "0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04)",
117+
},
101118
cursor: {
102119
auto: "auto",
103120
default: "default",
@@ -150,12 +167,14 @@ module.exports = {
150167
lineHeight: [],
151168
textColor: [],
152169
backgroundColor: [],
170+
letterSpacing: [],
153171
textAlign: ["responsive"],
154172
textDecoration: ["hover", "focus"],
155173
textTransform: [],
156174

157175
// Misc
158176

177+
boxShadow: [],
159178
cursor: [],
160179
wordBreak: [],
161180
zIndex: [],
@@ -201,6 +220,7 @@ module.exports = {
201220

202221
// Misc
203222

223+
boxShadow: true,
204224
cursor: true,
205225
wordBreak: true,
206226
zIndex: true,
@@ -226,7 +246,6 @@ module.exports = {
226246
borderRadius: false,
227247
borderStyle: false,
228248
borderWidth: false,
229-
boxShadow: false,
230249
boxSizing: false,
231250
clear: false,
232251
divideColor: false,

app/src/common/translations/de.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"loading": "Lade...",
1010
"settings": "Einstellungen",
1111
"help": "Hilfe",
12-
"error": "Fehler",
12+
"error": "Unerwarteter Fehler",
1313
"documentation": "Dokumentation",
1414
"poweredBy": "Powered by <0>{{name}}</0>",
1515
"headline": "Überschrift",

app/src/common/translations/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"loading": "Loading...",
1212
"settings": "Settings",
1313
"help": "Help",
14-
"error": "Error",
14+
"error": "Unexpected error",
1515
"documentation": "Documentation",
1616
"poweredBy": "Powered by <0>{{name}}</0>",
1717
"headline": "Headline",

app/src/components/button/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const Button: React.FC<Props> = React.forwardRef<HTMLButtonElement, Props>(
3232
"justify-center",
3333
"rounded",
3434
"cursor-pointer",
35-
"text-3",
35+
"text-4",
3636
"no-underline",
3737
className
3838
)}

app/src/components/forms/text-area/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ const TextArea: React.FC<Props> = ({
1313
<Label text={label}>
1414
<textarea
1515
className={cn(
16-
"py-1 px-4 w-full h-full border rounded resize-none text-3",
16+
"py-1 px-4 w-full h-full border rounded resize-none",
1717
{ "bg-color-default": !className?.includes("bg-color-") },
18+
{ "text-4": !className?.includes("text-") },
1819
className
1920
)}
2021
onChange={(event) => {

app/src/components/header/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ const Header: React.FC<Props> = memo(
6868
icon="question"
6969
href="https://dashboard.darekkay.com/docs"
7070
/>
71-
<MenuSeparator />
7271
<MenuAction
7372
text={t("common.settings")}
7473
icon="cog"

app/src/components/menu/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const Menu: React.FC<Props> = ({
3636
<ReakitMenu
3737
{...menu}
3838
aria-label={title}
39-
className="z-20 min-w-250 bg-color-panel border outline-none no-focus"
39+
className="z-20 min-w-250 mt-2 overflow-hidden bg-color-panel border rounded-lg shadow-xl outline-none no-focus"
4040
>
4141
<MenuContext.Provider value={menu}>{children}</MenuContext.Provider>
4242
</ReakitMenu>

app/src/components/modal/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const Modal: React.FC<Props> = ({
3939
{...rest}
4040
>
4141
<div className="flex">
42-
{headline && <h2 className="text-3 font-bold mb-6">{headline}</h2>}
42+
{headline && <h2 className="text-4 font-bold mb-6">{headline}</h2>}
4343
<Button
4444
variant="unstyled"
4545
size="small"

app/src/components/section/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const Section: React.FC<Props> = ({ headline, children }) => {
99
return (
1010
<div>
1111
{headline && (
12-
<Headline level={3} className="mb-4 text-3 font-semibold">
12+
<Headline level={3} className="mb-4 text-4 font-semibold">
1313
{headline}
1414
</Headline>
1515
)}

0 commit comments

Comments
 (0)