@manamerge/mana-atomic-ui 1.0.151 → 1.0.152

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -18,7 +18,7 @@ import footer from "./davidWeb/molecules/footer";
18
18
  import cardTeaser from "./davidWeb/molecules/cardTeaser";
19
19
  import cardSimpleRender from "./davidWeb/molecules/cardSimpleRender";
20
20
  import cardBanner from "./davidWeb/molecules/cardBanner";
21
- import accordion from "./davidWeb/molecules/accordion";
21
+ import accordion from "./manamerge/molecules/accordion";
22
22
  import breakerTape from "./davidWeb/molecules/breakerTape";
23
23
 
24
24
  // Layouts
@@ -42,7 +42,6 @@ import fontsizes from "./davidWeb/miscellaneous/fontsizes";
42
42
  // import manamergeprideEmoji from "./davidWeb/images/emojis/manapride.png";
43
43
  // import manaEmoji from "./davidWeb/images/emojis/mana.png";
44
44
  import notificationArrow from "./davidWeb/images/icons/notificationArrow.svg";
45
-
46
45
  import navBarLogoDark from "./davidWeb/images/logo/icon-manaconf.svg";
47
46
  import navigationBackIcon from "./davidWeb/images/icons/navigation/back.svg";
48
47
  import navigationForwardIcon from "./davidWeb/images/icons/navigation/forward.svg";
@@ -1,38 +1,64 @@
1
+ import colors from "../miscellaneous/colorpalette";
2
+ import fontsizes from "../miscellaneous/fontsizes";
3
+
1
4
  const text = {
2
- "Text-light": {
3
- fontSize: "13px",
5
+ "Text-primary-light": {
6
+ vFontSize: fontsizes.xs,
4
7
  lineHeight: "18px",
5
8
  fontWeight: 300,
6
- color: "#13021f",
7
- margin: "0px"
9
+ vColor: colors.one.b,
10
+ margin: "0px",
11
+ fontFamily: "ManamergeGilmer"
8
12
  },
9
- "Text-regular": {
10
- fontSize: "15px",
13
+ "Text-primary-regular": {
14
+ vFontSize: fontsizes.sm,
11
15
  lineHeight: "25px",
12
16
  fontWeight: 400,
13
- color: "#13021f",
14
- margin: "0px"
17
+ vColor: colors.one.b,
18
+ margin: "0px",
19
+ fontFamily: "ManamergeGilmer"
15
20
  },
16
- "Text-medium": {
17
- fontSize: "17px",
21
+ "Text-primary-medium": {
22
+ vFontSize: fontsizes.md,
18
23
  lineHeight: "28px",
19
24
  fontWeight: 500,
20
- color: "#13021f",
21
- margin: "0px"
25
+ vColor: colors.one.b,
26
+ margin: "0px",
27
+ fontFamily: "ManamergeGilmer"
22
28
  },
23
- "Text-bold": {
24
- fontSize: "17px",
29
+ "Text-primary-bold": {
30
+ vFontSize: fontsizes.lg,
25
31
  lineHeight: "28px",
26
32
  fontWeight: 700,
27
- color: "#13021f",
28
- margin: "0px"
33
+ vColor: colors.one.b,
34
+ margin: "0px",
35
+ fontFamily: "ManamergeGilmer"
29
36
  },
30
- "Text-heavy": {
31
- fontSize: "17px",
37
+ "Text-primary-heavy": {
38
+ vFontSize: fontsizes.xl,
32
39
  lineHeight: "28px",
33
40
  fontWeight: 900,
34
- color: "#13021f",
35
- margin: "0px"
41
+ vColor: colors.one.b,
42
+ margin: "0px",
43
+ fontFamily: "ManamergeGilmer"
44
+ },
45
+
46
+ "Text-secondary-regular": {
47
+ vFontSize: fontsizes.sm,
48
+ lineHeight: "25px",
49
+ fontWeight: 400,
50
+ vColor: colors.one.h,
51
+ margin: "0px",
52
+ fontFamily: "Springwood"
53
+ },
54
+ "Text-secondary-italic": {
55
+ vFontSize: fontsizes.lg,
56
+ lineHeight: "25px",
57
+ fontWeight: 400,
58
+ fontStyle: "italic",
59
+ vColor: colors.one.h,
60
+ margin: "0px",
61
+ fontFamily: "Springwood"
36
62
  }
37
63
  };
38
64
 
@@ -324,40 +324,62 @@ export declare const DavidWebTheme: {
324
324
  };
325
325
  };
326
326
  text: {
327
- "Text-light": {
328
- fontSize: string;
327
+ "Text-primary-light": {
328
+ vFontSize: string;
329
329
  lineHeight: string;
330
330
  fontWeight: number;
331
- color: string;
331
+ vColor: string;
332
332
  margin: string;
333
+ fontFamily: string;
333
334
  };
334
- "Text-regular": {
335
- fontSize: string;
335
+ "Text-primary-regular": {
336
+ vFontSize: string;
336
337
  lineHeight: string;
337
338
  fontWeight: number;
338
- color: string;
339
+ vColor: string;
339
340
  margin: string;
341
+ fontFamily: string;
340
342
  };
341
- "Text-medium": {
342
- fontSize: string;
343
+ "Text-primary-medium": {
344
+ vFontSize: string;
343
345
  lineHeight: string;
344
346
  fontWeight: number;
345
- color: string;
347
+ vColor: string;
346
348
  margin: string;
349
+ fontFamily: string;
347
350
  };
348
- "Text-bold": {
349
- fontSize: string;
351
+ "Text-primary-bold": {
352
+ vFontSize: string;
350
353
  lineHeight: string;
351
354
  fontWeight: number;
352
- color: string;
355
+ vColor: string;
353
356
  margin: string;
357
+ fontFamily: string;
354
358
  };
355
- "Text-heavy": {
356
- fontSize: string;
359
+ "Text-primary-heavy": {
360
+ vFontSize: string;
357
361
  lineHeight: string;
358
362
  fontWeight: number;
359
- color: string;
363
+ vColor: string;
364
+ margin: string;
365
+ fontFamily: string;
366
+ };
367
+ "Text-secondary-regular": {
368
+ vFontSize: string;
369
+ lineHeight: string;
370
+ fontWeight: number;
371
+ vColor: string;
360
372
  margin: string;
373
+ fontFamily: string;
374
+ };
375
+ "Text-secondary-italic": {
376
+ vFontSize: string;
377
+ lineHeight: string;
378
+ fontWeight: number;
379
+ fontStyle: string;
380
+ vColor: string;
381
+ margin: string;
382
+ fontFamily: string;
361
383
  };
362
384
  };
363
385
  icon: {
@@ -1,38 +1,60 @@
1
1
  declare const text: {
2
- "Text-light": {
3
- fontSize: string;
2
+ "Text-primary-light": {
3
+ vFontSize: string;
4
4
  lineHeight: string;
5
5
  fontWeight: number;
6
- color: string;
6
+ vColor: string;
7
7
  margin: string;
8
+ fontFamily: string;
8
9
  };
9
- "Text-regular": {
10
- fontSize: string;
10
+ "Text-primary-regular": {
11
+ vFontSize: string;
11
12
  lineHeight: string;
12
13
  fontWeight: number;
13
- color: string;
14
+ vColor: string;
14
15
  margin: string;
16
+ fontFamily: string;
15
17
  };
16
- "Text-medium": {
17
- fontSize: string;
18
+ "Text-primary-medium": {
19
+ vFontSize: string;
18
20
  lineHeight: string;
19
21
  fontWeight: number;
20
- color: string;
22
+ vColor: string;
21
23
  margin: string;
24
+ fontFamily: string;
22
25
  };
23
- "Text-bold": {
24
- fontSize: string;
26
+ "Text-primary-bold": {
27
+ vFontSize: string;
25
28
  lineHeight: string;
26
29
  fontWeight: number;
27
- color: string;
30
+ vColor: string;
28
31
  margin: string;
32
+ fontFamily: string;
29
33
  };
30
- "Text-heavy": {
31
- fontSize: string;
34
+ "Text-primary-heavy": {
35
+ vFontSize: string;
32
36
  lineHeight: string;
33
37
  fontWeight: number;
34
- color: string;
38
+ vColor: string;
35
39
  margin: string;
40
+ fontFamily: string;
41
+ };
42
+ "Text-secondary-regular": {
43
+ vFontSize: string;
44
+ lineHeight: string;
45
+ fontWeight: number;
46
+ vColor: string;
47
+ margin: string;
48
+ fontFamily: string;
49
+ };
50
+ "Text-secondary-italic": {
51
+ vFontSize: string;
52
+ lineHeight: string;
53
+ fontWeight: number;
54
+ fontStyle: string;
55
+ vColor: string;
56
+ margin: string;
57
+ fontFamily: string;
36
58
  };
37
59
  };
38
60
  export default text;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@manamerge/mana-atomic-ui",
3
- "version": "1.0.151",
3
+ "version": "1.0.152",
4
4
  "description": "Mana Merge design system",
5
5
  "license": "ISC",
6
6
  "author": "MM",