@evotor-dev/ui-kit 6.5.0 → 6.6.0

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.
Files changed (74) hide show
  1. package/bundles/evotor-dev-ui-kit.umd.js +347 -206
  2. package/bundles/evotor-dev-ui-kit.umd.js.map +1 -1
  3. package/esm2015/lib/components/evo-autocomplete/components/evo-autocomplete.component.js +1 -1
  4. package/esm2015/lib/components/evo-badge/evo-badge.component.js +1 -1
  5. package/esm2015/lib/components/evo-banner/evo-banner.component.js +7 -10
  6. package/esm2015/lib/components/evo-banner/evo-banner.module.js +7 -11
  7. package/esm2015/lib/components/evo-button/components/evo-button/evo-button.component.js +92 -0
  8. package/esm2015/lib/components/evo-button/components/evo-button-old/evo-button-old.component.js +96 -0
  9. package/esm2015/lib/components/evo-button/constants/evo-button-themes-map.js +31 -0
  10. package/esm2015/lib/components/evo-button/evo-button.module.js +9 -14
  11. package/esm2015/lib/components/evo-button/public-api.js +4 -2
  12. package/esm2015/lib/components/evo-button/types/evo-button-color.js +2 -0
  13. package/esm2015/lib/components/evo-button/types/evo-button-shape.js +2 -0
  14. package/esm2015/lib/components/evo-button/types/evo-button-size.js +2 -0
  15. package/esm2015/lib/components/evo-button/types/evo-button-theme-params.js +2 -0
  16. package/esm2015/lib/components/evo-button/types/evo-button-theme.js +2 -0
  17. package/esm2015/lib/components/evo-button/types/index.js +6 -0
  18. package/esm2015/lib/components/evo-chip/evo-chip.component.js +1 -1
  19. package/esm2015/lib/components/evo-control-error/evo-control-error.component.js +1 -1
  20. package/esm2015/lib/components/evo-control-label/evo-control-label.component.js +1 -1
  21. package/esm2015/lib/components/evo-counter/evo-counter.component.js +1 -1
  22. package/esm2015/lib/components/evo-datepicker/evo-datepicker.component.js +1 -1
  23. package/esm2015/lib/components/evo-icon/evo-icon.component.js +15 -11
  24. package/esm2015/lib/components/evo-icon-button/evo-icon-button.component.js +1 -1
  25. package/esm2015/lib/components/evo-input/evo-input.component.js +1 -1
  26. package/esm2015/lib/components/evo-input-contenteditable/evo-input-contenteditable.component.js +1 -1
  27. package/esm2015/lib/components/evo-loader/evo-circular-loader.component.js +1 -1
  28. package/esm2015/lib/components/evo-loader/evo-loader.component.js +4 -1
  29. package/esm2015/lib/components/evo-modal/evo-modal.component.js +16 -7
  30. package/esm2015/lib/components/evo-popover/evo-popover.component.js +1 -1
  31. package/esm2015/lib/components/evo-segmented-bar/evo-segmented-bar/evo-segmented-bar.component.js +6 -5
  32. package/esm2015/lib/components/evo-segmented-bar/evo-segmented-bar-button/evo-segmented-bar-button.component.js +4 -1
  33. package/esm2015/lib/components/evo-segmented-bar/evo-segmented-bar.module.js +9 -24
  34. package/esm2015/lib/components/evo-select/evo-select.component.js +1 -1
  35. package/esm2015/lib/components/evo-sidebar/evo-sidebar-header/evo-sidebar-header.component.js +1 -1
  36. package/esm2015/lib/components/evo-submenu/evo-submenu.component.js +19 -16
  37. package/esm2015/lib/components/evo-submenu/evo-submenu.module.js +8 -18
  38. package/esm2015/lib/components/evo-switcher/evo-switcher.component.js +1 -1
  39. package/esm2015/lib/components/evo-textarea/evo-textarea.component.js +1 -1
  40. package/esm2015/lib/components/evo-upload/evo-upload.component.js +3 -3
  41. package/fesm2015/evotor-dev-ui-kit.js +306 -196
  42. package/fesm2015/evotor-dev-ui-kit.js.map +1 -1
  43. package/lib/components/evo-button/components/evo-button/evo-button.component.d.ts +24 -0
  44. package/lib/components/evo-button/{evo-button.component.d.ts → components/evo-button-old/evo-button-old.component.d.ts} +9 -3
  45. package/lib/components/evo-button/constants/evo-button-themes-map.d.ts +2 -0
  46. package/lib/components/evo-button/evo-button.module.d.ts +6 -4
  47. package/lib/components/evo-button/public-api.d.ts +3 -1
  48. package/lib/components/evo-button/types/evo-button-color.d.ts +5 -0
  49. package/lib/components/evo-button/types/evo-button-shape.d.ts +4 -0
  50. package/lib/components/evo-button/types/evo-button-size.d.ts +5 -0
  51. package/lib/components/evo-button/types/evo-button-theme-params.d.ts +5 -0
  52. package/lib/components/evo-button/types/evo-button-theme.d.ts +1 -0
  53. package/lib/components/evo-button/types/index.d.ts +5 -0
  54. package/lib/components/evo-icon/evo-icon.component.d.ts +7 -7
  55. package/lib/components/evo-modal/evo-modal.component.d.ts +10 -6
  56. package/package.json +1 -1
  57. package/styles/components/evo-button.scss +1 -1
  58. package/styles/components/evo-chip.scss +1 -3
  59. package/styles/components/evo-table.scss +9 -9
  60. package/styles/components/evo-title.scss +1 -1
  61. package/styles/globals.scss +15 -9
  62. package/styles/mixins/_evo-input-mixins.scss +74 -0
  63. package/styles/{partials/typography/_typography-caption-mixin.scss → mixins/_evo-text-caption-mixin.scss} +5 -5
  64. package/styles/{partials/typography/_typography-field-typo-mixin.scss → mixins/_evo-text-field-mixin.scss} +2 -2
  65. package/styles/{partials/typography/_typography-header-mixin.scss → mixins/_evo-text-header-mixin.scss} +17 -17
  66. package/styles/{partials/typography/_typography-header-mobile-mixin.scss → mixins/_evo-text-mobile-header-mixin.scss} +10 -10
  67. package/styles/{partials/typography/_typography-paragraph-mixin.scss → mixins/_evo-text-paragraph-mixin.scss} +5 -12
  68. package/styles/{partials/typography/_typography-subtitle-mixin.scss → mixins/_evo-text-subtitle-mixin.scss} +5 -5
  69. package/styles/mixins/_evo-text-tips-mixin.scss +9 -0
  70. package/styles/mixins/_media-mixins.scss +38 -0
  71. package/styles/mixins.scss +26 -142
  72. package/styles/partials/_typography.scss +37 -39
  73. package/esm2015/lib/components/evo-button/evo-button.component.js +0 -87
  74. /package/styles/partials/{fonts.scss → _fonts.scss} +0 -0
@@ -0,0 +1,24 @@
1
+ import { ElementRef } from '@angular/core';
2
+ import { EvoButtonColor, EvoButtonSize, EvoButtonTheme } from '../../types';
3
+ import * as i0 from "@angular/core";
4
+ export declare class EvoButtonComponent {
5
+ private readonly elRef;
6
+ size: EvoButtonSize;
7
+ color: EvoButtonColor;
8
+ /**
9
+ * `theme` is a complex prop, that sets a number of inner parameters, described in `EvoButtonThemeParams`
10
+ */
11
+ set theme(value: EvoButtonTheme);
12
+ set disabled(value: boolean);
13
+ set loading(value: boolean);
14
+ private shape;
15
+ private _isOutline;
16
+ private _isDisabled;
17
+ private _isLoading;
18
+ constructor(elRef: ElementRef);
19
+ get isLoading(): boolean;
20
+ get buttonClasses(): string[];
21
+ get buttonStyles(): Record<string, string>;
22
+ static ɵfac: i0.ɵɵFactoryDeclaration<EvoButtonComponent, never>;
23
+ static ɵcmp: i0.ɵɵComponentDeclaration<EvoButtonComponent, "button[evoButton], a[evoButton]", never, { "size": "size"; "color": "color"; "theme": "theme"; "disabled": "disabled"; "loading": "loading"; }, {}, never, ["*"]>;
24
+ }
@@ -1,9 +1,15 @@
1
1
  import { ElementRef } from '@angular/core';
2
2
  import * as i0 from "@angular/core";
3
+ /**
4
+ * @deprecated use EvoButtonComponent
5
+ */
3
6
  export declare enum EvoButtonSizes {
4
7
  small = "small",
5
8
  large = "large"
6
9
  }
10
+ /**
11
+ * @deprecated use EvoButtonColor with EvoButtonTheme
12
+ */
7
13
  export declare enum EvoButtonStyles {
8
14
  lined = "lined",
9
15
  darkblue = "darkblue",
@@ -13,7 +19,7 @@ export declare enum EvoButtonStyles {
13
19
  purple = "purple",
14
20
  red = "red"
15
21
  }
16
- export declare class EvoButtonComponent {
22
+ export declare class EvoButtonOldComponent {
17
23
  private elRef;
18
24
  color: EvoButtonStyles;
19
25
  size: EvoButtonSizes;
@@ -28,6 +34,6 @@ export declare class EvoButtonComponent {
28
34
  get totalStyles(): {
29
35
  [styleKey: string]: any;
30
36
  };
31
- static ɵfac: i0.ɵɵFactoryDeclaration<EvoButtonComponent, never>;
32
- static ɵcmp: i0.ɵɵComponentDeclaration<EvoButtonComponent, "evo-button, button[evo-button]", never, { "color": "color"; "size": "size"; "disabled": "disabled"; "loading": "loading"; }, {}, never, ["*"]>;
37
+ static ɵfac: i0.ɵɵFactoryDeclaration<EvoButtonOldComponent, never>;
38
+ static ɵcmp: i0.ɵɵComponentDeclaration<EvoButtonOldComponent, "evo-button, button[evo-button]", never, { "color": "color"; "size": "size"; "disabled": "disabled"; "loading": "loading"; }, {}, never, ["*"]>;
33
39
  }
@@ -0,0 +1,2 @@
1
+ import { EvoButtonTheme, EvoButtonThemeParams } from '../types';
2
+ export declare const EVO_BUTTON_THEMES_MAP: Map<EvoButtonTheme, EvoButtonThemeParams>;
@@ -1,9 +1,11 @@
1
1
  import * as i0 from "@angular/core";
2
- import * as i1 from "./evo-button.component";
3
- import * as i2 from "@angular/common";
4
- import * as i3 from "../../evo-ui-kit.module";
2
+ import * as i1 from "./components/evo-button/evo-button.component";
3
+ import * as i2 from "./components/evo-button-old/evo-button-old.component";
4
+ import * as i3 from "@angular/common";
5
+ import * as i4 from "../../evo-ui-kit.module";
6
+ import * as i5 from "../evo-loader/evo-loader.module";
5
7
  export declare class EvoButtonModule {
6
8
  static ɵfac: i0.ɵɵFactoryDeclaration<EvoButtonModule, never>;
7
- static ɵmod: i0.ɵɵNgModuleDeclaration<EvoButtonModule, [typeof i1.EvoButtonComponent], [typeof i2.CommonModule, typeof i3.EvoUiKitModule], [typeof i1.EvoButtonComponent]>;
9
+ static ɵmod: i0.ɵɵNgModuleDeclaration<EvoButtonModule, [typeof i1.EvoButtonComponent, typeof i2.EvoButtonOldComponent], [typeof i3.CommonModule, typeof i4.EvoUiKitModule, typeof i5.EvoLoaderModule], [typeof i1.EvoButtonComponent, typeof i2.EvoButtonOldComponent]>;
8
10
  static ɵinj: i0.ɵɵInjectorDeclaration<EvoButtonModule>;
9
11
  }
@@ -1,2 +1,4 @@
1
1
  export * from './evo-button.module';
2
- export * from './evo-button.component';
2
+ export * from './components/evo-button-old/evo-button-old.component';
3
+ export * from './components/evo-button/evo-button.component';
4
+ export * from './types';
@@ -0,0 +1,5 @@
1
+ import { EvoColor } from '../../../common/types';
2
+ /**
3
+ * Sync with $evo-button-colors SCSS variable
4
+ */
5
+ export declare type EvoButtonColor = Extract<EvoColor, 'secondary' | 'success' | 'bonus' | 'link' | 'error' | 'white' | 'primary' | 'text'> | 'custom';
@@ -0,0 +1,4 @@
1
+ /**
2
+ * Sync with $evo-button-shapes SCSS variable
3
+ */
4
+ export declare type EvoButtonShape = 'rounded' | 'rectangle' | 'semi-rectangle';
@@ -0,0 +1,5 @@
1
+ import { EvoSize } from '../../../common/types';
2
+ /**
3
+ * Sync with $evo-button-sizes SCSS variable
4
+ */
5
+ export declare type EvoButtonSize = Extract<EvoSize, 'small' | 'normal' | 'large'>;
@@ -0,0 +1,5 @@
1
+ import { EvoButtonShape } from './index';
2
+ export declare type EvoButtonThemeParams = {
3
+ shape: EvoButtonShape;
4
+ isOutline: boolean;
5
+ };
@@ -0,0 +1 @@
1
+ export declare type EvoButtonTheme = 'rounded-solid' | 'rounded-outline' | 'rectangle-outline' | 'semi-rectangle-solid';
@@ -0,0 +1,5 @@
1
+ export * from './evo-button-color';
2
+ export * from './evo-button-size';
3
+ export * from './evo-button-shape';
4
+ export * from './evo-button-theme';
5
+ export * from './evo-button-theme-params';
@@ -1,20 +1,20 @@
1
- import { OnInit } from '@angular/core';
2
1
  import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
3
2
  import { EvoIconsLibrary } from './classes/evo-icons-library';
4
3
  import * as i0 from "@angular/core";
5
- export declare class EvoIconComponent implements OnInit {
6
- private sanitizer;
7
- private iconsService;
8
- shape: string;
4
+ export declare class EvoIconComponent {
5
+ private readonly sanitizer;
6
+ private readonly iconsService;
7
+ set shape(shape: string);
8
+ get shape(): string;
9
9
  svgWidth: number;
10
10
  svgHeight: number;
11
11
  svgViewBox: string;
12
- get viewBox(): string;
13
12
  content: SafeHtml;
13
+ get viewBox(): string;
14
14
  hostClass: boolean;
15
15
  get classes(): string[];
16
+ private _shape;
16
17
  constructor(sanitizer: DomSanitizer, iconsService: EvoIconsLibrary);
17
- ngOnInit(): void;
18
18
  static ɵfac: i0.ɵɵFactoryDeclaration<EvoIconComponent, never>;
19
19
  static ɵcmp: i0.ɵɵComponentDeclaration<EvoIconComponent, "evo-icon", never, { "shape": "shape"; "svgWidth": "svgWidth"; "svgHeight": "svgHeight"; "svgViewBox": "svgViewBox"; }, {}, never, never>;
20
20
  }
@@ -1,6 +1,7 @@
1
1
  import { ElementRef, OnDestroy, OnInit } from '@angular/core';
2
2
  import { EvoModalService, EvoModalState } from './evo-modal.service';
3
- import { Observable } from 'rxjs';
3
+ import { Observable, Subscription } from 'rxjs';
4
+ import { EvoButtonColor, EvoButtonTheme } from '../evo-button';
4
5
  import * as i0 from "@angular/core";
5
6
  export declare enum EvoModalCloseTargets {
6
7
  BACKGROUND = "background",
@@ -9,14 +10,17 @@ export declare enum EvoModalCloseTargets {
9
10
  ESC = "escape"
10
11
  }
11
12
  export declare class EvoModalComponent implements OnInit, OnDestroy {
12
- private modalService;
13
- private elRef;
13
+ private readonly modalService;
14
+ private readonly elRef;
14
15
  get id(): string;
15
16
  set id(id: string);
16
17
  titleText: string;
17
18
  acceptText: string;
18
- acceptButtonColor: string;
19
+ acceptButtonColor: EvoButtonColor;
20
+ acceptButtonTheme: EvoButtonTheme;
19
21
  declineText: string;
22
+ declineButtonColor: EvoButtonColor;
23
+ declineButtonTheme: EvoButtonTheme;
20
24
  asyncAccept: () => Observable<any>;
21
25
  modalState: EvoModalState;
22
26
  isAcceptLoading: boolean;
@@ -29,9 +33,9 @@ export declare class EvoModalComponent implements OnInit, OnDestroy {
29
33
  ngOnInit(): void;
30
34
  ngOnDestroy(): void;
31
35
  onBackgroundClick($event: any): void;
32
- handleOnClose(agreement: boolean, closeTarget: EvoModalCloseTargets): import("rxjs").Subscription;
36
+ handleOnClose(agreement: boolean, closeTarget: EvoModalCloseTargets): Subscription;
33
37
  private subscribeModalEvents;
34
38
  private initKeyboardListener;
35
39
  static ɵfac: i0.ɵɵFactoryDeclaration<EvoModalComponent, never>;
36
- static ɵcmp: i0.ɵɵComponentDeclaration<EvoModalComponent, "evo-modal", never, { "id": "id"; "titleText": "titleText"; "acceptText": "acceptText"; "acceptButtonColor": "acceptButtonColor"; "declineText": "declineText"; "asyncAccept": "asyncAccept"; }, {}, never, ["evo-icon", "*"]>;
40
+ static ɵcmp: i0.ɵɵComponentDeclaration<EvoModalComponent, "evo-modal", never, { "id": "id"; "titleText": "titleText"; "acceptText": "acceptText"; "acceptButtonColor": "acceptButtonColor"; "acceptButtonTheme": "acceptButtonTheme"; "declineText": "declineText"; "declineButtonColor": "declineButtonColor"; "declineButtonTheme": "declineButtonTheme"; "asyncAccept": "asyncAccept"; }, {}, never, ["evo-icon", "*"]>;
37
41
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@evotor-dev/ui-kit",
3
- "version": "6.5.0",
3
+ "version": "6.6.0",
4
4
  "peerDependencies": {
5
5
  "@angular/common": ">=12.0.0 <13.0.0",
6
6
  "@angular/core": ">=12.0.0 <13.0.0",
@@ -13,7 +13,7 @@ $dot-size: 10px;
13
13
  color: $color-white;
14
14
  font-weight: 500;
15
15
  font-size: 16px;
16
- font-family: var(--font-secondary);
16
+ font-family: var(--evo-font-secondary);
17
17
  line-height: 1;
18
18
  white-space: nowrap;
19
19
  text-align: center;
@@ -19,9 +19,7 @@
19
19
  overflow: hidden;
20
20
  color: $color-link;
21
21
 
22
- font-weight: 600;
23
- font-size: 14px;
24
- line-height: 24px;
22
+ @include evo-text-paragraph(p4);
25
23
 
26
24
  background-color: $color-background-grey;
27
25
 
@@ -1,11 +1,11 @@
1
- @import "../mixins";
1
+ @import '../mixins';
2
2
 
3
3
  @mixin table {
4
4
  display: table;
5
5
  width: 100%;
6
6
  }
7
7
 
8
- @mixin table-row {
8
+ @mixin table-row($hover: true) {
9
9
  display: table-row;
10
10
  padding: 16px;
11
11
 
@@ -13,14 +13,14 @@
13
13
  background-color: $color-background-grey;
14
14
  }
15
15
 
16
-
17
- &:hover {
18
- background-color: $color-highlight;
19
- }
20
-
21
- &_head {
16
+ @if $hover == true {
22
17
  &:hover {
23
- background: none;
18
+ background-color: $color-highlight;
19
+ }
20
+ &_head {
21
+ &:hover {
22
+ background: none;
23
+ }
24
24
  }
25
25
  }
26
26
  }
@@ -3,7 +3,7 @@
3
3
  .evo-title {
4
4
  color: $color-text;
5
5
  font-weight: 700;
6
- font-family: var(--font-secondary);
6
+ font-family: var(--evo-font-secondary);
7
7
 
8
8
  &_h1 {
9
9
  @include h1;
@@ -1,41 +1,47 @@
1
- @import "variables";
1
+ @import 'variables';
2
2
 
3
3
  * {
4
4
  box-sizing: border-box;
5
5
  }
6
6
 
7
7
  body {
8
- --font: 'Noto Sans', #{$font-fallback};
9
- --font-secondary: #{$font-secondary};
8
+ --evo-font: #{$font};
9
+ --evo-font-secondary: #{$font-secondary};
10
10
 
11
11
  min-width: 320px;
12
12
  overflow-x: hidden;
13
13
  color: $color-text;
14
14
  font-weight: 400;
15
15
  font-size: 14px;
16
- font-family: var(--font);
16
+ font-family: var(--evo-font);
17
17
  line-height: 1.4;
18
18
  background-color: $color-white;
19
19
  -moz-osx-font-smoothing: grayscale;
20
20
  -webkit-font-smoothing: antialiased;
21
21
  }
22
22
 
23
- input, button, select, textarea {
23
+ input,
24
+ button,
25
+ select,
26
+ textarea {
24
27
  font-size: inherit;
25
28
  font-family: inherit;
26
- line-height: inherit
29
+ line-height: inherit;
27
30
  }
28
31
 
29
- a, button {
32
+ a,
33
+ button {
30
34
  outline: none !important;
31
35
  }
32
36
 
33
37
  a {
34
38
  color: $color-link;
35
39
  cursor: pointer !important;
36
- transition: color .3s;
40
+ transition: color 0.3s;
37
41
 
38
- &, &:hover, &:focus {
42
+ &,
43
+ &:hover,
44
+ &:focus {
39
45
  text-decoration: none;
40
46
  }
41
47
  }
@@ -0,0 +1,74 @@
1
+ @import '../variables';
2
+
3
+ /**
4
+ * size: normal | small
5
+ * theme: default | rounded
6
+ */
7
+ @mixin evo-input($size: normal, $theme: default) {
8
+ --evo-input-height: 48px;
9
+ --evo-input-border-radius: 4px;
10
+ --evo-input-font-size: 16px;
11
+
12
+ @if ($size == small) {
13
+ @if ($theme == default) {
14
+ --evo-input-height: 32px;
15
+ } @else if ($theme == rounded) {
16
+ --evo-input-font-size: 14px;
17
+ --evo-input-height: 40px;
18
+ }
19
+ }
20
+
21
+ @if ($theme == rounded) {
22
+ --evo-input-border-radius: 256px;
23
+ }
24
+
25
+ display: flex;
26
+ align-items: center;
27
+ height: var(--evo-input-height);
28
+ color: $color-text;
29
+ font-weight: normal;
30
+ font-size: var(--evo-input-font-size);
31
+ font-family: var(--evo-font);
32
+ white-space: nowrap;
33
+ background-color: $color-white;
34
+ border: 1px solid $color-disabled;
35
+ border-radius: var(--evo-input-border-radius);
36
+ outline: none;
37
+ transition: color 0.3s, box-shadow 0.3s, background 0.3s, border 0.3s;
38
+ }
39
+
40
+ @mixin evo-input-focused {
41
+ border: solid 1px $color-secondary-lighter;
42
+ }
43
+
44
+ @mixin evo-input-disabled {
45
+ color: $color-disabled-text !important;
46
+ background-color: $color-background-grey-light !important;
47
+ border: 1px solid $color-disabled-light !important;
48
+ cursor: default;
49
+ pointer-events: none;
50
+ }
51
+
52
+ /**
53
+ * @deprecated
54
+ */
55
+ @mixin evo-input-valid {
56
+ }
57
+
58
+ @mixin evo-input-invalid {
59
+ border-color: $color-error !important;
60
+ }
61
+
62
+ @mixin evo-input-states {
63
+ &_focused {
64
+ @include evo-input-focused;
65
+ }
66
+
67
+ &_disabled {
68
+ @include evo-input-disabled;
69
+ }
70
+
71
+ &_invalid {
72
+ @include evo-input-invalid;
73
+ }
74
+ }
@@ -1,13 +1,13 @@
1
1
  @use "sass:list";
2
2
 
3
- $evo-caption-styles: c1, c2, c3;
3
+ $evo-text-caption-styles: c1, c2, c3;
4
4
 
5
- @mixin evo-caption($style) {
6
- @if not list.index($evo-caption-styles, $style) {
7
- @error "#{$style} is not a valid caption style. Use one of #{$evo-caption-styles}";
5
+ @mixin evo-text-caption($style) {
6
+ @if not list.index($evo-text-caption-styles, $style) {
7
+ @error "#{$style} is not a valid caption style. Use one of #{$evo-text-caption-styles}";
8
8
  }
9
9
 
10
- font-family: var(--font);
10
+ font-family: var(--evo-font);
11
11
  font-style: normal;
12
12
 
13
13
  @if $style == c1 {
@@ -2,12 +2,12 @@
2
2
 
3
3
  $evo-field-typo-styles: label, placeholder, placeholder-bold, hint, error;
4
4
 
5
- @mixin evo-field-typo($style) {
5
+ @mixin evo-text-field($style) {
6
6
  @if not list.index($evo-field-typo-styles, $style) {
7
7
  @error "#{$style} is not a valid field typo style. Use one of #{$evo-field-typo-styles}";
8
8
  }
9
9
 
10
- font-family: var(--font);
10
+ font-family: var(--evo-font);
11
11
  font-style: normal;
12
12
 
13
13
  @if $style == label {
@@ -1,15 +1,15 @@
1
1
  @use "sass:list";
2
- @import "../../mixins";
3
- @import "./typography-header-mobile-mixin";
2
+ @import 'media-mixins';
3
+ @import 'evo-text-mobile-header-mixin';
4
4
 
5
- $evo-header-styles: h1, h2, h3, h4, h5;
5
+ $evo-text-header-styles: h1, h2, h3, h4, h5;
6
6
 
7
- @mixin evo-header($style, $noMobile: false) {
8
- @if not list.index($evo-header-styles, $style) {
9
- @error "#{$style} is not a valid header style. Use one of #{$evo-header-styles}";
7
+ @mixin evo-text-header($style, $autoMobile: true) {
8
+ @if not list.index($evo-text-header-styles, $style) {
9
+ @error "#{$style} is not a valid header style. Use one of #{$evo-text-header-styles}";
10
10
  }
11
11
 
12
- font-family: var(--font-secondary);
12
+ font-family: var(--evo-font-secondary);
13
13
  font-style: normal;
14
14
  font-weight: 700;
15
15
 
@@ -17,45 +17,45 @@ $evo-header-styles: h1, h2, h3, h4, h5;
17
17
  font-size: 36px;
18
18
  line-height: 44px;
19
19
 
20
- @if not $noMobile {
20
+ @if $autoMobile {
21
21
  @include media-mobile {
22
- @include evo-header-mobile(h1-mobile);
22
+ @include evo-text-mobile-header(h1);
23
23
  }
24
24
  }
25
25
  } @else if $style == h2 {
26
26
  font-size: 30px;
27
27
  line-height: 38px;
28
28
 
29
- @if not $noMobile {
29
+ @if $autoMobile {
30
30
  @include media-mobile {
31
- @include evo-header-mobile(h2-mobile);
31
+ @include evo-text-mobile-header(h2);
32
32
  }
33
33
  }
34
34
  } @else if $style == h3 {
35
35
  font-size: 24px;
36
36
  line-height: 32px;
37
37
 
38
- @if not $noMobile {
38
+ @if $autoMobile {
39
39
  @include media-mobile {
40
- @include evo-header-mobile(h3-mobile);
40
+ @include evo-text-mobile-header(h3);
41
41
  }
42
42
  }
43
43
  } @else if $style == h4 {
44
44
  font-size: 18px;
45
45
  line-height: 26px;
46
46
 
47
- @if not $noMobile {
47
+ @if $autoMobile {
48
48
  @include media-mobile {
49
- @include evo-header-mobile(h4-mobile);
49
+ @include evo-text-mobile-header(h4);
50
50
  }
51
51
  }
52
52
  } @else if $style == h5 {
53
53
  font-size: 16px;
54
54
  line-height: 24px;
55
55
 
56
- @if not $noMobile {
56
+ @if $autoMobile {
57
57
  @include media-mobile {
58
- @include evo-header-mobile(h5-mobile);
58
+ @include evo-text-mobile-header(h5);
59
59
  }
60
60
  }
61
61
  }
@@ -1,32 +1,32 @@
1
1
  @use "sass:list";
2
2
 
3
- $evo-header-mobile-styles: h1-mobile, h2-mobile, h3-mobile, h4-mobile, h5-mobile;
3
+ $evo-text-mobile-header-styles: h1, h2, h3, h4, h5;
4
4
 
5
- @mixin evo-header-mobile($style) {
6
- @if not list.index($evo-header-mobile-styles, $style) {
7
- @error "#{$style} is not a valid header mobile style. Use one of #{$evo-header-mobile-styles}";
5
+ @mixin evo-text-mobile-header($style) {
6
+ @if not list.index($evo-text-mobile-header-styles, $style) {
7
+ @error "#{$style} is not a valid header mobile style. Use one of #{$evo-text-mobile-header-styles}";
8
8
  }
9
9
 
10
- font-family: var(--font-secondary);
10
+ font-family: var(--evo-font-secondary);
11
11
  font-style: normal;
12
12
 
13
- @if $style == h1-mobile {
13
+ @if $style == h1 {
14
14
  font-weight: 700;
15
15
  font-size: 30px;
16
16
  line-height: 38px;
17
- } @else if $style == h2-mobile {
17
+ } @else if $style == h2 {
18
18
  font-weight: 700;
19
19
  font-size: 24px;
20
20
  line-height: 32px;
21
- } @else if $style == h3-mobile {
21
+ } @else if $style == h3 {
22
22
  font-weight: 700;
23
23
  font-size: 20px;
24
24
  line-height: 28px;
25
- } @else if $style == h4-mobile {
25
+ } @else if $style == h4 {
26
26
  font-weight: 700;
27
27
  font-size: 16px;
28
28
  line-height: 24px;
29
- } @else if $style == h5-mobile {
29
+ } @else if $style == h5 {
30
30
  font-weight: 700;
31
31
  font-size: 14px;
32
32
  line-height: 22px;
@@ -1,14 +1,13 @@
1
1
  @use "sass:list";
2
- @import "../../variables";
3
2
 
4
- $evo-paragraph-styles: p1, p2, p3, p4, p5, tips;
3
+ $evo-text-paragraph-styles: p1, p2, p3, p4, p5, tips;
5
4
 
6
- @mixin evo-paragraph($style) {
7
- @if not list.index($evo-paragraph-styles, $style) {
8
- @error "#{$style} is not a valid paragraph style. Use one of #{$evo-paragraph-styles}";
5
+ @mixin evo-text-paragraph($style) {
6
+ @if not list.index($evo-text-paragraph-styles, $style) {
7
+ @error "#{$style} is not a valid paragraph style. Use one of #{$evo-text-paragraph-styles}";
9
8
  }
10
9
 
11
- font-family: var(--font);
10
+ font-family: var(--evo-font);
12
11
  font-style: normal;
13
12
 
14
13
  @if $style == p1 {
@@ -31,11 +30,5 @@ $evo-paragraph-styles: p1, p2, p3, p4, p5, tips;
31
30
  font-size: 16px;
32
31
  line-height: 24px;
33
32
  font-weight: 600;
34
- } @else if $style == tips {
35
- font-size: 12px;
36
- line-height: 18px;
37
- font-weight: 400;
38
- font-style: italic;
39
- color: $color-text-grey;
40
33
  }
41
34
  }
@@ -1,13 +1,13 @@
1
1
  @use "sass:list";
2
2
 
3
- $evo-subtitle-styles: s1, s2;
3
+ $evo-text-subtitle-styles: s1, s2;
4
4
 
5
- @mixin evo-subtitle($style) {
6
- @if not list.index($evo-subtitle-styles, $style) {
7
- @error "#{$style} is not a valid caption style. Use one of #{$evo-subtitle-styles}";
5
+ @mixin evo-text-subtitle($style) {
6
+ @if not list.index($evo-text-subtitle-styles, $style) {
7
+ @error "#{$style} is not a valid caption style. Use one of #{$evo-text-subtitle-styles}";
8
8
  }
9
9
 
10
- font-family: var(--font);
10
+ font-family: var(--evo-font);
11
11
  font-style: normal;
12
12
  font-size: 18px;
13
13
  line-height: 26px;
@@ -0,0 +1,9 @@
1
+ @use "sass:list";
2
+
3
+ @mixin evo-text-tips() {
4
+ font-family: var(--evo-font);
5
+ font-size: 12px;
6
+ line-height: 18px;
7
+ font-weight: 400;
8
+ font-style: italic;
9
+ }