Skip to content

Commit 0a6da3b

Browse files
fix style after designer review
1 parent 6a725ff commit 0a6da3b

File tree

8 files changed

+32
-55
lines changed

8 files changed

+32
-55
lines changed

packages/devextreme-cli/src/templates/react/application/src/dx-styles.scss

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,20 @@ body {
1717
}
1818

1919
.app {
20-
background-color: var(--base-bg-darken-5);
2120
display: flex;
2221
height: 100%;
2322
width: 100%;
2423
}
2524

26-
background-color: var(--base-bg-darken-5);
27-
.dx-drawer-wrapper .dx-overlay-content {
28-
box-shadow: 0 4px 4px 0 var(--shadow-color-first), 0 1px 2px 0 var(--shadow-color-second);
29-
}
30-
3125
.content {
3226
line-height: 1.5;
3327
flex-grow: 1;
34-
padding: 40px;
28+
padding: 20px 40px;
3529

3630
h2 {
37-
font-size: 30px;
31+
font-size: 32px;
3832
margin: 0;
33+
line-height: 40px;
3934
}
4035

4136
.screen-x-small & {
@@ -90,3 +85,12 @@ body {
9085
}
9186

9287
}
88+
89+
.dx-theme-fluent {
90+
.dx-drawer-wrapper {
91+
.dx-drawer-panel-content,
92+
.dx-overlay-content {
93+
box-shadow: 0 4px 4px 0 var(--shadow-color-first), 0 1px 2px 0 var(--shadow-color-second);
94+
}
95+
}
96+
}

packages/devextreme-cli/src/templates/react/sample-pages/home/home.scss

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,3 @@
3737
fill: var(--plus-icon-color);
3838
}
3939
}
40-
41-
.screen-x-small .logos-container {
42-
svg {
43-
width: 100%;
44-
display: block;
45-
46-
&.plus {
47-
margin: 0;
48-
}
49-
}
50-
}

packages/devextreme-cli/src/templates/vue-v3/application/src/App.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ body {
9090
}
9191
9292
.app {
93-
background-color: var(--base-bg-darken-5);
9493
display: flex;
9594
height: 100%;
9695
width: 100%;

packages/devextreme-cli/src/templates/vue-v3/application/src/dx-styles.scss

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ $side-panel-min-width: 60px;
44
.content {
55
line-height: 1.5;
66
flex-grow: 1;
7-
padding: 40px;
7+
padding: 20px 40px;
88

99
h2 {
10-
font-size: 30px;
10+
font-size: 32px;
1111
margin: 0;
12+
line-height: 40px;
1213
}
1314

1415
.screen-x-small & {
@@ -68,8 +69,11 @@ $side-panel-min-width: 60px;
6869
}
6970

7071
.dx-theme-fluent {
71-
.dx-drawer-panel-content .dx-overlay-content {
72-
box-shadow: 0 4px 4px 0 var(--shadow-color-first), 0 1px 2px 0 var(--shadow-color-second);
72+
.dx-drawer-wrapper {
73+
.dx-drawer-panel-content,
74+
.dx-overlay-content {
75+
box-shadow: 0 4px 4px 0 var(--shadow-color-first), 0 1px 2px 0 var(--shadow-color-second);
76+
}
7377
}
7478
}
7579

packages/devextreme-cli/src/templates/vue-v3/sample-pages/home-page.vue

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -211,14 +211,4 @@
211211
fill: var(--plus-icon-color);
212212
}
213213
}
214-
215-
.screen-x-small .logos-container {
216-
svg {
217-
width: 100%;
218-
display: block;
219-
&.plus {
220-
margin: 0;
221-
}
222-
}
223-
}
224214
</style>

packages/devextreme-schematics/src/add-layout/files/src/app/__name__.component.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
:host {
2-
background-color: var(--base-bg-darken-5);
32
display: flex;
43
height: 100%;
54
width: 100%;

packages/devextreme-schematics/src/add-layout/files/src/dx-styles.scss

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,20 @@ html, body {
1616
}
1717

1818
.app {
19-
background-color: var(--base-bg-darken-5);
2019
display: flex;
2120
height: 100%;
2221
width: 100%;
2322
}
2423

25-
background-color: var(--base-bg-darken-5);
26-
27-
.dx-drawer-wrapper .dx-overlay-content {
28-
box-shadow: 0 4px 4px 0 var(--shadow-color-first), 0 1px 2px 0 var(--shadow-color-second);
29-
}
30-
3124
.content {
3225
line-height: 1.5;
3326
flex-grow: 1;
34-
padding: 40px;
27+
padding: 20px 40px;
3528

3629
h2 {
37-
font-size: 30px;
30+
font-size: 32px;
3831
margin: 0;
32+
line-height: 40px;
3933
}
4034

4135
.screen-x-small & {
@@ -89,3 +83,12 @@ html, body {
8983
}
9084
}
9185
}
86+
87+
.dx-theme-fluent {
88+
.dx-drawer-wrapper {
89+
.dx-drawer-panel-content,
90+
.dx-overlay-content {
91+
box-shadow: 0 4px 4px 0 var(--shadow-color-first), 0 1px 2px 0 var(--shadow-color-second);
92+
}
93+
}
94+
}

packages/devextreme-schematics/src/add-sample-views/files/pages/home/home.component.scss

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,3 @@
3838
fill: var(--plus-icon-color);
3939
}
4040
}
41-
42-
:host-context(.screen-x-small) .logos-container {
43-
svg {
44-
width: 100%;
45-
display: block;
46-
47-
&.plus {
48-
margin: 0;
49-
}
50-
}
51-
}

0 commit comments

Comments
 (0)