devextreme-schematics 1.8.0 → 1.9.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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "devextreme-schematics",
3
- "version": "1.8.0",
3
+ "version": "1.9.0",
4
4
  "description": "DevExtreme schematics",
5
5
  "scripts": {
6
6
  "build": "tsc -p tsconfig.json",
@@ -22,9 +22,9 @@
22
22
  ],
23
23
  "schematics": "./src/collection.json",
24
24
  "dependencies": {
25
- "@angular-devkit/core": "^17.2.1",
26
- "@angular-devkit/schematics": "^17.2.1",
27
- "@schematics/angular": "^17.2.1"
25
+ "@angular-devkit/core": "^17.3.12",
26
+ "@angular-devkit/schematics": "^17.3.12",
27
+ "@schematics/angular": "^17.3.12"
28
28
  },
29
29
  "devDependencies": {
30
30
  "@types/jasmine": "~3.10.18",
@@ -35,5 +35,5 @@
35
35
  "tslint": "^5.20.1",
36
36
  "typescript": "~5.2.1"
37
37
  },
38
- "gitHead": "b1e11fb858e65b9b506bd0da0b1ec689d267c0e7"
38
+ "gitHead": "b2faf118853fd0ea9c7cc72100c2ab8a4de04812"
39
39
  }
@@ -39,7 +39,7 @@
39
39
  "dxversion": {
40
40
  "type": "string",
41
41
  "description": "The DevExtreme version",
42
- "default": "24.2.3"
42
+ "default": "24.2.5"
43
43
  },
44
44
  "globalNgCliVersion": {
45
45
  "type":"string",
@@ -5,10 +5,11 @@
5
5
 
6
6
  .single-card {
7
7
  .dx-card {
8
- width: 330px;
8
+ width: 360px;
9
9
  margin: auto auto;
10
- padding: 40px;
10
+ padding: 24px;
11
11
  flex-grow: 0;
12
+ border-radius: 8px;
12
13
 
13
14
  :host-context(.screen-x-small) & {
14
15
  width: 100%;
@@ -21,18 +22,22 @@
21
22
  }
22
23
 
23
24
  .header {
24
- margin-bottom: 30px;
25
+ margin: 24px 0;
25
26
 
26
27
  .title {
27
28
  color: var(--base-text-color);
28
- line-height: 28px;
29
29
  font-weight: 500;
30
30
  font-size: 24px;
31
+ text-align: center;
32
+ line-height: 24px;
31
33
  }
32
34
 
33
35
  .description {
34
36
  color: var(--base-text-color-alpha-7);
35
- line-height: 18px;
37
+ line-height: 16px;
38
+ font-size: 12px;
39
+ margin-top: 32px;
40
+ text-align: center;
36
41
  }
37
42
  }
38
43
  }
@@ -34,23 +34,20 @@
34
34
  </dxo-button-options>
35
35
  </dxi-item>
36
36
 
37
- <dxi-item>
38
- <div class="login-link">
39
- Have an account? <a routerLink="/login">Sign In</a>
40
- </div>
41
- </dxi-item>
42
-
43
37
  <ng-container *dxTemplate="let item of 'createAccountTemplate'">
44
38
  <div>
45
39
  <span class="dx-button-text">
46
40
  <ng-container *ngIf="loading; else notLoading">
47
41
  <dx-load-indicator width="24px" height="24px" [visible]="true"></dx-load-indicator>
48
42
  </ng-container>
49
-
43
+
50
44
  <ng-template #notLoading>Create a new account</ng-template>
51
45
  </span>
52
46
  </div>
53
47
  </ng-container>
54
48
 
55
49
  </dx-form>
50
+ <div class="login-link">
51
+ Have an account? <a routerLink="/login">Sign In</a>
52
+ </div>
56
53
  </form>
@@ -1,8 +1,7 @@
1
1
  .create-account-form {
2
2
  .policy-info {
3
- margin: 10px 0;
4
3
  color: var(--base-text-color-alpha-7);
5
- font-size: 14px;
4
+ font-size: 12px;
6
5
  font-style: normal;
7
6
 
8
7
  a {
@@ -12,7 +11,9 @@
12
11
 
13
12
  .login-link {
14
13
  color: var(--base-accent);
15
- font-size: 16px;
14
+ font-size: 12px;
16
15
  text-align: center;
16
+ padding: 6px 0 32px 0;
17
+ border-bottom: 1px solid var(--border-color);
17
18
  }
18
19
  }
@@ -24,16 +24,6 @@
24
24
  </dxo-button-options>
25
25
  </dxi-item>
26
26
 
27
- <dxi-item>
28
- <div class="link">
29
- <a routerLink="/reset-password">Forgot password?</a>
30
- </div>
31
- </dxi-item>
32
-
33
- <dxi-item itemType="button">
34
- <dxo-button-options text="Create an account" width="100%" [onClick]="onCreateAccountClick"></dxo-button-options>
35
- </dxi-item>
36
-
37
27
  <ng-container *dxTemplate="let item of 'signInTemplate'">
38
28
  <div>
39
29
  <span class="dx-button-text">
@@ -46,4 +36,8 @@
46
36
  </ng-container>
47
37
 
48
38
  </dx-form>
39
+ <div class="link">
40
+ <a routerLink="/reset-password">Forgot password?</a>
41
+ </div>
42
+ <dx-button stylingMode="outlined" text="Create an account" width="100%" (click)="onCreateAccountClick()"></dx-button>
49
43
  </form>
@@ -1,16 +1,12 @@
1
1
  .login-form {
2
2
  .link {
3
3
  text-align: center;
4
- font-size: 16px;
4
+ font-size: 12px;
5
5
  font-style: normal;
6
-
7
- a {
8
- text-decoration: none;
9
- }
6
+ margin: 6px 0 50px;
10
7
  }
11
8
 
12
9
  ::ng-deep .form-text {
13
- margin: 10px 0;
14
10
  color: var(--base-text-color-alpha-7);
15
11
  }
16
12
  }
@@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common';
2
2
  import { Component, NgModule } from '@angular/core';
3
3
  import { Router, RouterModule } from '@angular/router';
4
4
  import { DxFormModule } from 'devextreme-angular/ui/form';
5
+ import { DxButtonModule } from 'devextreme-angular/ui/button';
5
6
  import { DxLoadIndicatorModule } from 'devextreme-angular/ui/load-indicator';
6
7
  import notify from 'devextreme/ui/notify';
7
8
  import { AuthService } from '../../services';
@@ -40,6 +41,7 @@ export class LoginFormComponent {
40
41
  CommonModule,
41
42
  RouterModule,
42
43
  DxFormModule,
44
+ DxButtonModule,
43
45
  DxLoadIndicatorModule
44
46
  ],
45
47
  declarations: [ LoginFormComponent ],
@@ -13,11 +13,6 @@
13
13
  [elementAttr]="{ class: 'submit-button' }">
14
14
  </dxo-button-options>
15
15
  </dxi-item>
16
- <dxi-item>
17
- <div class="login-link">
18
- Return to <a routerLink="/login">Sign In</a>
19
- </div>
20
- </dxi-item>
21
16
 
22
17
  <ng-container *dxTemplate="let item of 'resetPasswordTemplate'">
23
18
  <div>
@@ -31,4 +26,7 @@
31
26
  </ng-container>
32
27
 
33
28
  </dx-form>
29
+ <div class="login-link">
30
+ Return to <a routerLink="/login">Sign In</a>
31
+ </div>
34
32
  </form>
@@ -1,11 +1,12 @@
1
1
  .reset-password-form {
2
2
  ::ng-deep .submit-button {
3
- margin-top: 10px;
3
+ margin-top: 18px;
4
4
  }
5
5
 
6
6
  .login-link {
7
7
  color: var(--base-accent);
8
- font-size: 16px;
8
+ font-size: 12px;
9
9
  text-align: center;
10
+ margin-top: 6px;
10
11
  }
11
12
  }
@@ -24,6 +24,7 @@ html, body {
24
24
  display: flex;
25
25
  height: 100%;
26
26
  width: 100%;
27
+ min-width: 320px;
27
28
  }
28
29
 
29
30
  .content {
@@ -36,10 +37,10 @@ html, body {
36
37
  margin: 0;
37
38
  line-height: 40px;
38
39
  }
40
+ }
39
41
 
40
- .screen-x-small & {
41
- padding: 20px;
42
- }
42
+ .screen-x-small .content {
43
+ padding: 20px;
43
44
  }
44
45
 
45
46
  .container {
@@ -1,14 +1,28 @@
1
+ @use 'sass:meta';
2
+ @use 'sass:color';
3
+ @use 'sass:map';
4
+ @use "./themes/generated/variables.base.scss" as variablesBase;
5
+ @use "./themes/generated/variables.base.dark.scss" as variablesBaseDark;
6
+ @use "./themes/generated/variables.additional.scss" as variablesAdditional;
7
+ @use "./themes/generated/variables.additional.dark.scss" as variablesAdditionalDark;
8
+
9
+ @mixin theme-variables($theme-name) {
10
+ $theme: meta.module-variables($theme-name);
11
+ $base-text-color: map.get($theme, 'base-text-color');
12
+ $base-bg: map.get($theme, 'base-bg');
13
+
14
+ --base-text-color: #{$base-text-color};
15
+ --base-bg: #{$base-bg};
16
+ --base-bg-darken-5: #{color.adjust($base-bg, $lightness: -5%)};
17
+ --base-accent: #{map.get($theme, 'base-accent')};
18
+ --base-text-color-alpha-7: #{rgba($base-text-color, color.alpha($base-text-color) * 0.7)};
19
+ }
20
+
1
21
  :root {
2
- .dx-swatch-light, .dx-swatch-additional {
3
- @import "./themes/generated/variables.base.scss";
4
-
5
- --base-text-color: #{$base-text-color};
6
- --base-bg: #{$base-bg};
7
- --base-bg-darken-5: #{darken($base-bg, 5)};
8
- --base-accent: #{$base-accent};
9
- --base-text-color-alpha-7: #{rgba($base-text-color, alpha($base-text-color) * 0.7)};
10
- --footer-border-color: rgba(224, 224, 224, 1);
22
+ body {
23
+ @include theme-variables('variablesBase');
11
24
 
25
+ --footer-border-color: rgba(224, 224, 224, 1);
12
26
  --plus-icon-color: #242424;
13
27
  --devextreme-logo-color: #596C7D;
14
28
  --vue-logo-text-color: #35495E;
@@ -17,14 +31,12 @@
17
31
  --shadow-color-second: rgba(0, 0, 0, 0.12);
18
32
  }
19
33
 
20
- .dx-swatch-dark, .dx-swatch-additional-dark {
21
- @import "./themes/generated/variables.base.dark.scss";
34
+ .dx-swatch-additional {
35
+ @include theme-variables('variablesAdditional');
36
+ }
22
37
 
23
- --base-text-color: #{$base-text-color};
24
- --base-bg: #{$base-bg};
25
- --base-bg-darken-5: #{darken($base-bg, 5)};
26
- --base-accent: #{$base-accent};
27
- --base-text-color-alpha-7: #{rgba($base-text-color, alpha($base-text-color) * 0.7)};
38
+ .dx-swatch-dark {
39
+ @include theme-variables('variablesBaseDark');;
28
40
 
29
41
  --plus-icon-color: #fff;
30
42
  --devextreme-logo-color: #fff;
@@ -34,4 +46,8 @@
34
46
  --shadow-color-second: rgba(0, 0, 0, 0.24);
35
47
  --footer-border-color: rgba(97, 97, 97, 1);
36
48
  }
49
+
50
+ .dx-swatch-additional-dark {
51
+ @include theme-variables('variablesAdditionalDark');
52
+ }
37
53
  }
@@ -7,7 +7,7 @@
7
7
  "dxversion": {
8
8
  "type": "string",
9
9
  "description": "The DevExtreme version",
10
- "default": "24.2.3"
10
+ "default": "24.2.5"
11
11
  },
12
12
  "project": {
13
13
  "type": "string",
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.latestVersions = void 0;
4
4
  // TODO: implement
5
5
  exports.latestVersions = {
6
- 'devextreme': '24.2.3',
7
- 'devextreme-angular': '24.2.3',
6
+ 'devextreme': '24.2.5',
7
+ 'devextreme-angular': '24.2.5',
8
8
  'devextreme-cli': 'latest'
9
9
  };
10
10
  //# sourceMappingURL=latest-versions.js.map
@@ -1,6 +1,6 @@
1
1
  // TODO: implement
2
2
  export const latestVersions = {
3
- 'devextreme': '24.2.3',
4
- 'devextreme-angular': '24.2.3',
3
+ 'devextreme': '24.2.5',
4
+ 'devextreme-angular': '24.2.5',
5
5
  'devextreme-cli': 'latest'
6
6
  };