diff --git a/angular/src/directives/proxies.ts b/angular/src/directives/proxies.ts index 4e58bf69b3..3c76469d93 100644 --- a/angular/src/directives/proxies.ts +++ b/angular/src/directives/proxies.ts @@ -280,7 +280,7 @@ export class IonHeader { proxyInputs(IonHeader, ['mode', 'translucent']); export declare interface IonIcon extends StencilComponents<'IonIcon'> {} -@Component({ selector: 'ion-icon', changeDetection: 0, template: '', inputs: ['ariaLabel', 'color', 'icon', 'ios', 'lazy', 'md', 'mode', 'name', 'size', 'src'] }) +@Component({ selector: 'ion-icon', changeDetection: 0, template: '', inputs: ['ariaLabel', 'color', 'flipRtl', 'icon', 'ios', 'lazy', 'md', 'mode', 'name', 'size', 'src'] }) export class IonIcon { protected el: HTMLElement; constructor(c: ChangeDetectorRef, r: ElementRef) { @@ -288,7 +288,7 @@ export class IonIcon { this.el = r.nativeElement; } } -proxyInputs(IonIcon, ['ariaLabel', 'color', 'icon', 'ios', 'lazy', 'md', 'mode', 'name', 'size', 'src']); +proxyInputs(IonIcon, ['ariaLabel', 'color', 'flipRtl', 'icon', 'ios', 'lazy', 'md', 'mode', 'name', 'size', 'src']); export declare interface IonImg extends StencilComponents<'IonImg'> {} @Component({ selector: 'ion-img', changeDetection: 0, template: '', inputs: ['alt', 'src'] }) diff --git a/core/package.json b/core/package.json index e690f7054d..523e152319 100644 --- a/core/package.json +++ b/core/package.json @@ -30,16 +30,16 @@ "loader/" ], "dependencies": { - "ionicons": "4.5.1" + "ionicons": "4.5.5" }, "devDependencies": { "@stencil/core": "0.17.0", "@stencil/sass": "0.1.1", "@stencil/utils": "latest", "@types/jest": "^23.3.13", + "@types/node": "10.12.18", "@types/puppeteer": "1.6.4", "@types/swiper": "4.4.1", - "@types/node": "10.12.18", "agadoo": "^1.0.0", "autoprefixer": "9.4.6", "aws-sdk": "^2.320.0", diff --git a/core/src/components/app/fonts/ionicons.scss b/core/src/components/app/fonts/ionicons.scss deleted file mode 100644 index 477e040b42..0000000000 --- a/core/src/components/app/fonts/ionicons.scss +++ /dev/null @@ -1,53 +0,0 @@ - -// Ionicons Icon Font CSS -// -------------------------- -// Ionicons CSS for Ionic's element -// ionicons-icons.scss has the icons and their unicode characters - -$ionicons-font-path: $font-path !default; - -@import "ionicons-icons"; -@import "ionicons-variables"; - - -@font-face { - font-family: "Ionicons"; - font-style: normal; - font-weight: normal; - src: url("#{$ionicons-font-path}/ionicons.woff2?v=#{$ionicons-version}") format("woff2"), - url("#{$ionicons-font-path}/ionicons.woff?v=#{$ionicons-version}") format("woff"), - url("#{$ionicons-font-path}/ionicons.ttf?v=#{$ionicons-version}") format("truetype"); -} - -ion-icon { - @include font-smoothing(); - - @include rtl() { - &[aria-label^="arrow"]::before, - &[flip-rtl]::before { - transform: scaleX(-1); - } - - &[unflip-rtl]::before { - transform: scaleX(1); - } - } - - display: inline-block; - - font-family: "Ionicons"; - font-style: normal; - font-variant: normal; - font-weight: normal; - - line-height: 1; - - text-rendering: auto; - text-transform: none; - - speak: none; - - &::before { - display: inline-block; - } -} diff --git a/core/src/components/back-button/back-button.tsx b/core/src/components/back-button/back-button.tsx index da593edaaa..5f55176344 100644 --- a/core/src/components/back-button/back-button.tsx +++ b/core/src/components/back-button/back-button.tsx @@ -72,13 +72,9 @@ export class BackButton implements ComponentInterface { render() { const defaultBackButtonText = this.mode === 'ios' ? 'Back' : null; + const backButtonIcon = this.icon != null ? this.icon : this.config.get('backButtonIcon', 'arrow-back'); const backButtonText = this.text != null ? this.text : this.config.get('backButtonText', defaultBackButtonText); - let backButtonIcon = this.icon != null ? this.icon : this.config.get('backButtonIcon', 'arrow-back'); - if (backButtonIcon === 'arrow-back' && document.dir === 'rtl') { - backButtonIcon = 'arrow-forward'; - } - return (