Skip to content

Commit 50575ec

Browse files
use stndrd media-query instead of custom class
1 parent 0d0b908 commit 50575ec

File tree

7 files changed

+10
-28
lines changed

7 files changed

+10
-28
lines changed

packages/devextreme-cli/src/templates/nextjs/application/src/app/layout.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { usePathname } from 'next/navigation';
44
import LoadPanel from 'devextreme-react/load-panel';
55
import { AuthProvider, useAuth} from '../contexts/auth';
66
import { NavigationProvider } from '../contexts/navigation';
7-
import { useScreenSizeClass } from '../utils/media-query';
87
import { ThemeContext, useThemeContext} from "../theme";
98

109
function Page({ children }) {
@@ -18,7 +17,6 @@ function Page({ children }) {
1817
}
1918

2019
export default function RootLayout({ children }) {
21-
const screenSizeClass = useScreenSizeClass();
2220
const themeContext = useThemeContext();
2321
const pathname = usePathname ();
2422

@@ -29,7 +27,7 @@ export default function RootLayout({ children }) {
2927
<ThemeContext.Provider value={themeContext}>
3028
<AuthProvider>
3129
<NavigationProvider>
32-
<div className={`app ${screenSizeClass}`}>
30+
<div className='app'>
3331
<Page key={pathname}>{children}</Page>
3432
</div>
3533
</NavigationProvider>

packages/devextreme-cli/src/templates/nextjs/application/src/components/footer/Footer.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
padding-bottom: 24px;
77
margin: 0 40px;
88

9-
.screen-x-small & {
9+
@media (max-width: 599.99px) {
1010
margin: 0 20px;
1111
}
1212
}

packages/devextreme-cli/src/templates/nextjs/application/src/components/header/Header.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ header {
1313
.dx-toolbar.header-toolbar .dx-toolbar-items-container .dx-toolbar-after {
1414
padding: 0 40px;
1515

16-
.screen-x-small & {
16+
@media (max-width: 599.99px) {
1717
padding: 0 20px;
1818
}
1919
}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ body {
4242
}
4343
}
4444

45-
.screen-x-small :not(.dx-card).content {
46-
padding: 20px;
45+
@media (max-width: 599.99px) {
46+
:not(.dx-card).content {
47+
padding: 20px;
48+
}
4749
}
4850

4951
.container {
@@ -68,7 +70,7 @@ body {
6870
.responsive-paddings {
6971
padding: 20px;
7072

71-
.screen-large & {
73+
@media (min-width: 1280px) {
7274
padding: 40px;
7375
}
7476
}

packages/devextreme-cli/src/templates/nextjs/application/src/layouts/side-nav-inner-toolbar/side-nav-inner-toolbar.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
77
background-color: var(--base-bg);
88

9-
.screen-x-small & {
9+
@media (max-width: 599.99px) {
1010
padding-left: 20px;
1111
}
1212

packages/devextreme-cli/src/templates/nextjs/application/src/layouts/single-card/single-card.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
flex-grow: 0;
1010
border-radius: 8px;
1111

12-
.screen-x-small & {
12+
@media (max-width: 599.99px) {
1313
width: 100%;
1414
height: 100%;
1515
border-radius: 0;

packages/devextreme-cli/src/templates/nextjs/application/src/utils/media-query.tsx

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,6 @@ export const useScreenSize = () => {
1919
return screenSize;
2020
};
2121

22-
export const useScreenSizeClass = () => {
23-
const screenSize = useScreenSize();
24-
25-
if (screenSize.isLarge) {
26-
return 'screen-large';
27-
}
28-
29-
if (screenSize.isMedium) {
30-
return 'screen-medium';
31-
}
32-
33-
if (screenSize.isSmall) {
34-
return 'screen-small';
35-
}
36-
37-
return 'screen-x-small';
38-
}
39-
4022
let handlers<%=#isTypeScript%>: Handle[]<%=/isTypeScript%> = [];
4123
let xSmallMedia = false;
4224
let smallMedia = false;

0 commit comments

Comments
 (0)