Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(ionic): update to v8 #1813

Merged
merged 5 commits into from
Apr 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
],
"styles": [
{
"input": "src/theme/variables.scss",
"input": "src/global.scss",
"inject": true
},
{
"input": "src/global.scss",
"input": "src/theme/variables.scss",
"inject": true
}
],
Expand Down Expand Up @@ -117,11 +117,11 @@
"karmaConfig": "src/karma.conf.js",
"styles": [
{
"input": "src/theme/variables.scss",
"input": "src/global.scss",
"inject": true
},
{
"input": "src/global.scss",
"input": "src/theme/variables.scss",
"inject": true
}
],
Expand Down
97 changes: 39 additions & 58 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@capacitor/keyboard": "4.1.1",
"@capacitor/splash-screen": "4.1.4",
"@capacitor/status-bar": "4.1.1",
"@ionic/angular": "^7.0.0",
"@ionic/angular": "^8.0.0",
"@ionic/storage-angular": "^4.0.0",
"cordova-plugin-inappbrowser": "5.0.0",
"core-js": "^3.6.4",
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ion-app [class.dark-theme]="dark">
<ion-app [class.ion-palette-dark]="dark">
<ion-split-pane contentId="main-content">

<ion-menu contentId="main-content">
Expand Down
8 changes: 0 additions & 8 deletions src/app/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,3 @@
/* stylelint-disable-next-line declaration-no-important */
display: none !important;
}

html {
/*
* For more information on dynamic font scaling, visit the documentation:
* https://ionicframework.com/docs/layout/dynamic-font-scaling
*/
--ion-dynamic-font: var(--ion-default-dynamic-font);
}
4 changes: 2 additions & 2 deletions src/app/pages/map/map.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export class MapPage implements AfterViewInit {
const appEl = this.doc.querySelector('ion-app');
let isDark = false;
let style = [];
if (appEl.classList.contains('dark-theme')) {
if (appEl.classList.contains('ion-palette-dark')) {
style = darkStyle;
}

Expand Down Expand Up @@ -66,7 +66,7 @@ export class MapPage implements AfterViewInit {
mutations.forEach((mutation) => {
if (mutation.attributeName === 'class') {
const el = mutation.target as HTMLElement;
isDark = el.classList.contains('dark-theme');
isDark = el.classList.contains('ion-palette-dark');
if (map && isDark) {
map.setOptions({styles: darkStyle});
} else if (map) {
Expand Down
30 changes: 21 additions & 9 deletions src/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
*/

/* Core CSS required for Ionic components to work properly */
@import "~@ionic/angular/css/core.css";
@import "@ionic/angular/css/core.css";

/* Basic CSS for apps built with Ionic */
@import "~@ionic/angular/css/normalize.css";
@import "~@ionic/angular/css/structure.css";
@import "~@ionic/angular/css/typography.css";
@import "@ionic/angular/css/normalize.css";
@import "@ionic/angular/css/structure.css";
@import "@ionic/angular/css/typography.css";

/* Optional CSS utils that can be commented out */
@import "~@ionic/angular/css/padding.css";
@import "~@ionic/angular/css/float-elements.css";
@import "~@ionic/angular/css/text-alignment.css";
@import "~@ionic/angular/css/text-transformation.css";
@import "~@ionic/angular/css/flex-utils.css";
@import "@ionic/angular/css/padding.css";
@import "@ionic/angular/css/float-elements.css";
@import "@ionic/angular/css/text-alignment.css";
@import "@ionic/angular/css/text-transformation.css";
@import "@ionic/angular/css/flex-utils.css";


/*
Expand All @@ -33,3 +33,15 @@
*/

@import "./app/app";


/**
* Ionic Dark Mode
* -----------------------------------------------------
* For more info, please see:
* https://ionicframework.com/docs/theming/dark-mode
*/

// @import "@ionic/angular/css/palettes/dark.always.css";
// @import "@ionic/angular/css/palettes/dark.system.css";
@import "@ionic/angular/css/palettes/dark.class.css";
Loading
Loading