Merge branch 'main' into dfs-list-p

ionic-team · Oct 16, 2023 · ed39395 · ed39395
2 parents 578bbea + cb26814
commit ed39395
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/angular-standalone/base/src/global.scss b/angular-standalone/base/src/global.scss
@@ -16,7 +16,7 @@
 @import "@ionic/angular/css/normalize.css";
 @import "@ionic/angular/css/structure.css";
 @import "@ionic/angular/css/typography.css";
-@import '@ionic/angular/css/display.css';
+@import "@ionic/angular/css/display.css";
 
 /* Optional CSS utils that can be commented out */
 @import "@ionic/angular/css/padding.css";

diff --git a/angular/base/src/global.scss b/angular/base/src/global.scss
@@ -16,7 +16,7 @@
 @import "@ionic/angular/css/normalize.css";
 @import "@ionic/angular/css/structure.css";
 @import "@ionic/angular/css/typography.css";
-@import '@ionic/angular/css/display.css';
+@import "@ionic/angular/css/display.css";
 
 /* Optional CSS utils that can be commented out */
 @import "@ionic/angular/css/padding.css";

diff --git a/react-vite/base/.gitignore b/react-vite/base/.gitignore
@@ -9,7 +9,7 @@
 /coverage
 
 # production
-/build
+/dist
 
 # misc
 .DS_Store

diff --git a/react/base/.gitignore b/react/base/.gitignore
@@ -11,9 +11,6 @@
 # production
 /build
 
-# production - vite
-/dist 
-
 # misc
 .DS_Store
 .env.local
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ @@
     /coverage
     # production
-    /build
+    /dist
     # misc
     .DS_Store
@@ Expand Down @@