Revert "Use fluent theme by default"

dxvladislavvolkov · dxvladislavvolkov · commit a1e42f35a9d3 · 2024-10-23T16:11:03.000+04:00
This reverts commit c4c4fd6.
diff --git a/packages/devextreme-cli/src/templates/react/application/src/components/side-navigation-menu/SideNavigationMenu.scss b/packages/devextreme-cli/src/templates/react/application/src/components/side-navigation-menu/SideNavigationMenu.scss
@@ -22,7 +22,6 @@
       .dx-treeview-item {
         padding-left: 0;
         flex-direction: row-reverse;
-        border-radius: 0;
 
         .dx-icon {
           width: $side-panel-min-width !important;
diff --git a/packages/devextreme-cli/src/templates/react/application/src/dx-styles.scss b/packages/devextreme-cli/src/templates/react/application/src/dx-styles.scss
@@ -100,9 +100,3 @@ html, body {
 * {
   box-sizing: border-box;
 }
-
-.dx-theme-fluent {
-  .dx-drawer-panel-content {
-    box-shadow: 0 4px 4px rgba(0, 0, 0, 0.12);
-  }
-}
diff --git a/packages/devextreme-cli/src/templates/react/application/src/themes/metadata.additional.json b/packages/devextreme-cli/src/templates/react/application/src/themes/metadata.additional.json
@@ -1,6 +1,6 @@
 {
   "items": [],
-  "baseTheme": "fluent.blue.light",
+  "baseTheme": "material.blue.light",
   "assetsBasePath": "../../../node_modules/devextreme/dist/css/",
   "outputColorScheme": "additional",
   "makeSwatch": true,
diff --git a/packages/devextreme-cli/src/templates/react/application/src/themes/metadata.base.json b/packages/devextreme-cli/src/templates/react/application/src/themes/metadata.base.json
@@ -1,6 +1,6 @@
 {
   "items": [],
-  "baseTheme": "fluent.blue.light",
+  "baseTheme": "material.blue.light",
   "assetsBasePath": "../../../node_modules/devextreme/dist/css/",
   "outputColorScheme": "base",
   "base": true
diff --git a/packages/devextreme-cli/src/templates/vue-v3/application/src/components/side-nav-menu.vue b/packages/devextreme-cli/src/templates/vue-v3/application/src/components/side-nav-menu.vue
@@ -132,7 +132,6 @@ export default {
       .dx-treeview-item {
         padding-left: 0;
         flex-direction: row-reverse;
-        border-radius: 0;
 
         .dx-icon {
           width: $side-panel-min-width !important;
diff --git a/packages/devextreme-cli/src/templates/vue-v3/application/src/dx-styles.scss b/packages/devextreme-cli/src/templates/vue-v3/application/src/dx-styles.scss
@@ -64,9 +64,3 @@
  }
 
 $side-panel-min-width: 60px;
-
-.dx-theme-fluent {
-  .dx-drawer-panel-content {
-    box-shadow: 0 4px 4px rgba(0, 0, 0, 0.12);
-  }
-}
diff --git a/packages/devextreme-cli/src/templates/vue-v3/application/src/themes/metadata.additional.json b/packages/devextreme-cli/src/templates/vue-v3/application/src/themes/metadata.additional.json
@@ -1,6 +1,6 @@
 {
   "items": [],
-  "baseTheme": "fluent.blue.light",
+  "baseTheme": "material.blue.light",
   "assetsBasePath": "../../../node_modules/devextreme/dist/css/",
   "outputColorScheme": "additional",
   "makeSwatch": true,
diff --git a/packages/devextreme-cli/src/templates/vue-v3/application/src/themes/metadata.base.json b/packages/devextreme-cli/src/templates/vue-v3/application/src/themes/metadata.base.json
@@ -1,6 +1,6 @@
 {
   "items": [],
-  "baseTheme": "fluent.blue.light",
+  "baseTheme": "material.blue.light",
   "assetsBasePath": "../../../node_modules/devextreme/dist/css/",
   "outputColorScheme": "base",
   "base": true
diff --git a/packages/devextreme-schematics/src/add-layout/files/src/app/shared/components/side-navigation-menu/side-navigation-menu.component.scss b/packages/devextreme-schematics/src/add-layout/files/src/app/shared/components/side-navigation-menu/side-navigation-menu.component.scss
@@ -22,7 +22,6 @@
       .dx-treeview-item {
         padding-left: 0;
         flex-direction: row-reverse;
-        border-radius: 0;
 
         .dx-icon {
           width: $side-panel-min-width !important;
diff --git a/packages/devextreme-schematics/src/add-layout/files/src/dx-styles.scss b/packages/devextreme-schematics/src/add-layout/files/src/dx-styles.scss
@@ -70,9 +70,3 @@ html, body {
 }
 
 $side-panel-min-width: 60px;
-
-.dx-theme-fluent {
-  .dx-drawer-panel-content {
-    box-shadow: 0 4px 4px rgba(0, 0, 0, 0.12);
-  }
-}
diff --git a/packages/devextreme-schematics/src/add-layout/files/src/themes/metadata.additional.json b/packages/devextreme-schematics/src/add-layout/files/src/themes/metadata.additional.json
@@ -1,6 +1,6 @@
 {
   "items": [],
-  "baseTheme": "fluent.blue.light",
+  "baseTheme": "material.blue.light",
   "assetsBasePath": "<%= path %>../../node_modules/devextreme/dist/css/",
   "outputColorScheme": "additional",
   "makeSwatch": true,
diff --git a/packages/devextreme-schematics/src/add-layout/files/src/themes/metadata.base.json b/packages/devextreme-schematics/src/add-layout/files/src/themes/metadata.base.json
@@ -1,6 +1,6 @@
 {
   "items": [],
-  "baseTheme": "fluent.blue.light",
+  "baseTheme": "material.blue.light",
   "assetsBasePath": "<%= path %>../../node_modules/devextreme/dist/css/",
   "outputColorScheme": "base",
   "base": true

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"items": [],`
`3`		`- "baseTheme": "fluent.blue.light",`
	`3`	`+ "baseTheme": "material.blue.light",`
`4`	`4`	`"assetsBasePath": "../../../node_modules/devextreme/dist/css/",`
`5`	`5`	`"outputColorScheme": "additional",`
`6`	`6`	`"makeSwatch": true,`
Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,3 @@`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`$side-panel-min-width: 60px;`
`67`		`-`
`68`		`-.dx-theme-fluent {`
`69`		`- .dx-drawer-panel-content {`
`70`		`- box-shadow: 0 4px 4px rgba(0, 0, 0, 0.12);`
`71`		`- }`
`72`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,3 @@ html, body {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`$side-panel-min-width: 60px;`
`73`		`-`
`74`		`-.dx-theme-fluent {`
`75`		`- .dx-drawer-panel-content {`
`76`		`- box-shadow: 0 4px 4px rgba(0, 0, 0, 0.12);`
`77`		`- }`
`78`		`-}`