Skip to content

Commit

Permalink
fix(icons): fix the ellipsis fill in ionicons (#20137)
Browse files Browse the repository at this point in the history
- update docs icon usage for Ionicons 5
- update tests to remove mode prefixed icons
- update tests to use the correct icons for Ionicons 5
- update to latest ionicons dev which fixes the ellipsis icon fill
  • Loading branch information
brandyscarney committed Jan 3, 2020
1 parent 02a46a1 commit 9318d24
Show file tree
Hide file tree
Showing 48 changed files with 217 additions and 233 deletions.
2 changes: 1 addition & 1 deletion core/package.json
Expand Up @@ -30,7 +30,7 @@
"loader/"
],
"dependencies": {
"ionicons": "^5.0.0-13",
"ionicons": "5.0.0-15",
"tslib": "^1.10.0"
},
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions core/src/components/button/test/toolbar/index.html
Expand Up @@ -40,7 +40,7 @@
</ion-buttons>
<ion-buttons slot="primary">
<ion-button color="secondary">
<ion-icon slot="icon-only" name="more"></ion-icon>
<ion-icon slot="icon-only" ios="ellipsis-horizontal" md="ellipsis-vertical"></ion-icon>
</ion-button>
</ion-buttons>
<ion-title>This is a long title with buttons. It just goes on and on my friend.</ion-title>
Expand All @@ -57,7 +57,7 @@
</ion-buttons>
<ion-buttons slot="primary">
<ion-button color="secondary">
<ion-icon slot="icon-only" name="more"></ion-icon>
<ion-icon slot="icon-only" ios="ellipsis-horizontal" md="ellipsis-vertical"></ion-icon>
</ion-button>
</ion-buttons>
<ion-title>This is a long title with buttons. It just goes on and on my friend.</ion-title>
Expand All @@ -74,7 +74,7 @@
</ion-buttons>
<ion-buttons slot="primary">
<ion-button fill="solid" color="secondary">
<ion-icon slot="icon-only" name="more"></ion-icon>
<ion-icon slot="icon-only" ios="ellipsis-horizontal" md="ellipsis-vertical"></ion-icon>
</ion-button>
</ion-buttons>
<ion-title>This is a long title with buttons. It just goes on and on my friend.</ion-title>
Expand All @@ -91,7 +91,7 @@
</ion-buttons>
<ion-buttons slot="primary">
<ion-button color="secondary">
<ion-icon slot="icon-only" name="more"></ion-icon>
<ion-icon slot="icon-only" ios="ellipsis-horizontal" md="ellipsis-vertical"></ion-icon>
</ion-button>
</ion-buttons>
<ion-title>Defaults</ion-title>
Expand All @@ -108,7 +108,7 @@
</ion-buttons>
<ion-buttons slot="primary">
<ion-button color="secondary" class="activated">
<ion-icon slot="icon-only" name="more"></ion-icon>
<ion-icon slot="icon-only" ios="ellipsis-horizontal" md="ellipsis-vertical"></ion-icon>
</ion-button>
</ion-buttons>
<ion-title>Defaults.activated</ion-title>
Expand Down
20 changes: 10 additions & 10 deletions core/src/components/buttons/readme.md
Expand Up @@ -30,7 +30,7 @@ The `<ion-buttons>` element can be positioned inside of the toolbar using a name
<ion-toolbar>
<ion-buttons slot="secondary">
<ion-button>
<ion-icon slot="icon-only" name="contact"></ion-icon>
<ion-icon slot="icon-only" name="person-circle"></ion-icon>
</ion-button>
<ion-button>
<ion-icon slot="icon-only" name="search"></ion-icon>
Expand All @@ -39,7 +39,7 @@ The `<ion-buttons>` element can be positioned inside of the toolbar using a name
<ion-title>Default Buttons</ion-title>
<ion-buttons slot="primary">
<ion-button color="secondary">
<ion-icon slot="icon-only" name="more"></ion-icon>
<ion-icon slot="icon-only" ios="ellipsis-horizontal" md="ellipsis-vertical"></ion-icon>
</ion-button>
</ion-buttons>
</ion-toolbar>
Expand Down Expand Up @@ -80,7 +80,7 @@ The `<ion-buttons>` element can be positioned inside of the toolbar using a name
<ion-toolbar>
<ion-buttons slot="secondary">
<ion-button>
<ion-icon slot="icon-only" name="contact"></ion-icon>
<ion-icon slot="icon-only" name="person-circle"></ion-icon>
</ion-button>
<ion-button>
<ion-icon slot="icon-only" name="search"></ion-icon>
Expand All @@ -89,7 +89,7 @@ The `<ion-buttons>` element can be positioned inside of the toolbar using a name
<ion-title>Default Buttons</ion-title>
<ion-buttons slot="primary">
<ion-button color="secondary">
<ion-icon slot="icon-only" name="more"></ion-icon>
<ion-icon slot="icon-only" ios="ellipsis-horizontal" md="ellipsis-vertical"></ion-icon>
</ion-button>
</ion-buttons>
</ion-toolbar>
Expand Down Expand Up @@ -148,7 +148,7 @@ export const ButtonsExample: React.FC = () => (
<IonToolbar>
<IonButtons slot="secondary">
<IonButton>
<IonIcon slot="icon-only" name="contact" />
<IonIcon slot="icon-only" name="person-circle" />
</IonButton>
<IonButton>
<IonIcon slot="icon-only" name="search" />
Expand All @@ -157,7 +157,7 @@ export const ButtonsExample: React.FC = () => (
<IonTitle>Default Buttons</IonTitle>
<IonButtons slot="primary">
<IonButton color="secondary">
<IonIcon slot="icon-only" name="more" />
<IonIcon slot="icon-only" ios="ellipsis-horizontal" md="ellipsis-vertical" />
</IonButton>
</IonButtons>
</IonToolbar>
Expand All @@ -173,7 +173,7 @@ export const ButtonsExample: React.FC = () => (
<IonMenuButton autoHide={false} />
</IonButtons>
</IonToolbar>

<IonToolbar>
<IonButtons collapse="true">
<IonButton>
Expand Down Expand Up @@ -201,7 +201,7 @@ export const ButtonsExample: React.FC = () => (
<ion-toolbar>
<ion-buttons slot="secondary">
<ion-button>
<ion-icon slot="icon-only" name="contact"></ion-icon>
<ion-icon slot="icon-only" name="person-circle"></ion-icon>
</ion-button>
<ion-button>
<ion-icon slot="icon-only" name="search"></ion-icon>
Expand All @@ -210,7 +210,7 @@ export const ButtonsExample: React.FC = () => (
<ion-title>Default Buttons</ion-title>
<ion-buttons slot="primary">
<ion-button color="secondary">
<ion-icon slot="icon-only" name="more"></ion-icon>
<ion-icon slot="icon-only" ios="ellipsis-horizontal" md="ellipsis-vertical"></ion-icon>
</ion-button>
</ion-buttons>
</ion-toolbar>
Expand All @@ -226,7 +226,7 @@ export const ButtonsExample: React.FC = () => (
<ion-menu-button autoHide="false"></ion-menu-button>
</ion-buttons>
</ion-toolbar>

<ion-toolbar>
<ion-buttons collapse="true">
<ion-button>
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/buttons/test/icon/index.html
Expand Up @@ -22,7 +22,7 @@
</ion-buttons>
<ion-buttons slot="primary">
<ion-button slot="icon-only">
<ion-icon name="more"></ion-icon>
<ion-icon ios="ellipsis-horizontal" md="ellipsis-vertical"></ion-icon>
</ion-button>
</ion-buttons>
</ion-toolbar>
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/buttons/usage/angular.md
Expand Up @@ -9,7 +9,7 @@
<ion-toolbar>
<ion-buttons slot="secondary">
<ion-button>
<ion-icon slot="icon-only" name="contact"></ion-icon>
<ion-icon slot="icon-only" name="person-circle"></ion-icon>
</ion-button>
<ion-button>
<ion-icon slot="icon-only" name="search"></ion-icon>
Expand All @@ -18,7 +18,7 @@
<ion-title>Default Buttons</ion-title>
<ion-buttons slot="primary">
<ion-button color="secondary">
<ion-icon slot="icon-only" name="more"></ion-icon>
<ion-icon slot="icon-only" ios="ellipsis-horizontal" md="ellipsis-vertical"></ion-icon>
</ion-button>
</ion-buttons>
</ion-toolbar>
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/buttons/usage/javascript.md
Expand Up @@ -9,7 +9,7 @@
<ion-toolbar>
<ion-buttons slot="secondary">
<ion-button>
<ion-icon slot="icon-only" name="contact"></ion-icon>
<ion-icon slot="icon-only" name="person-circle"></ion-icon>
</ion-button>
<ion-button>
<ion-icon slot="icon-only" name="search"></ion-icon>
Expand All @@ -18,7 +18,7 @@
<ion-title>Default Buttons</ion-title>
<ion-buttons slot="primary">
<ion-button color="secondary">
<ion-icon slot="icon-only" name="more"></ion-icon>
<ion-icon slot="icon-only" ios="ellipsis-horizontal" md="ellipsis-vertical"></ion-icon>
</ion-button>
</ion-buttons>
</ion-toolbar>
Expand Down
6 changes: 3 additions & 3 deletions core/src/components/buttons/usage/react.md
Expand Up @@ -23,7 +23,7 @@ export const ButtonsExample: React.FC = () => (
<IonToolbar>
<IonButtons slot="secondary">
<IonButton>
<IonIcon slot="icon-only" name="contact" />
<IonIcon slot="icon-only" name="person-circle" />
</IonButton>
<IonButton>
<IonIcon slot="icon-only" name="search" />
Expand All @@ -32,7 +32,7 @@ export const ButtonsExample: React.FC = () => (
<IonTitle>Default Buttons</IonTitle>
<IonButtons slot="primary">
<IonButton color="secondary">
<IonIcon slot="icon-only" name="more" />
<IonIcon slot="icon-only" ios="ellipsis-horizontal" md="ellipsis-vertical" />
</IonButton>
</IonButtons>
</IonToolbar>
Expand All @@ -48,7 +48,7 @@ export const ButtonsExample: React.FC = () => (
<IonMenuButton autoHide={false} />
</IonButtons>
</IonToolbar>

<IonToolbar>
<IonButtons collapse="true">
<IonButton>
Expand Down
6 changes: 3 additions & 3 deletions core/src/components/buttons/usage/vue.md
Expand Up @@ -10,7 +10,7 @@
<ion-toolbar>
<ion-buttons slot="secondary">
<ion-button>
<ion-icon slot="icon-only" name="contact"></ion-icon>
<ion-icon slot="icon-only" name="person-circle"></ion-icon>
</ion-button>
<ion-button>
<ion-icon slot="icon-only" name="search"></ion-icon>
Expand All @@ -19,7 +19,7 @@
<ion-title>Default Buttons</ion-title>
<ion-buttons slot="primary">
<ion-button color="secondary">
<ion-icon slot="icon-only" name="more"></ion-icon>
<ion-icon slot="icon-only" ios="ellipsis-horizontal" md="ellipsis-vertical"></ion-icon>
</ion-button>
</ion-buttons>
</ion-toolbar>
Expand All @@ -35,7 +35,7 @@
<ion-menu-button autoHide="false"></ion-menu-button>
</ion-buttons>
</ion-toolbar>

<ion-toolbar>
<ion-buttons collapse="true">
<ion-button>
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/card/test/translucent/index.html
Expand Up @@ -232,7 +232,7 @@ <h2>Card With An Inset Picture</h2>
</ion-col>
<ion-col class="ion-no-padding ion-text-right">
<ion-button fill="clear" size="small" color="dark">
<ion-icon slot="start" name="share-alt"></ion-icon>
<ion-icon slot="start" name="share"></ion-icon>
Share
</ion-button>
</ion-col>
Expand Down
18 changes: 9 additions & 9 deletions core/src/components/fab/readme.md
Expand Up @@ -21,21 +21,21 @@ Fabs are container elements that contain one or more fab buttons. They should be
<!-- fab placed to the bottom end -->
<ion-fab vertical="bottom" horizontal="end" slot="fixed">
<ion-fab-button>
<ion-icon name="arrow-dropleft"></ion-icon>
<ion-icon name="arrow-forward-circle"></ion-icon>
</ion-fab-button>
</ion-fab>

<!-- fab placed to the top start -->
<ion-fab vertical="top" horizontal="start" slot="fixed">
<ion-fab-button>
<ion-icon name="arrow-dropright"></ion-icon>
<ion-icon name="arrow-back-circle"></ion-icon>
</ion-fab-button>
</ion-fab>

<!-- fab placed to the bottom start -->
<ion-fab vertical="bottom" horizontal="start" slot="fixed">
<ion-fab-button>
<ion-icon name="arrow-dropup"></ion-icon>
<ion-icon name="arrow-up-circle"></ion-icon>
</ion-fab-button>
</ion-fab>

Expand Down Expand Up @@ -110,21 +110,21 @@ export const FabExample: React.FC = () => (
{/*-- fab placed to the bottom end --*/}
<IonFab vertical="bottom" horizontal="end" slot="fixed">
<IonFabButton>
<IonIcon name="arrow-dropleft" />
<IonIcon name="arrow-forward-circle" />
</IonFabButton>
</IonFab>

{/*-- fab placed to the top start --*/}
<IonFab vertical="top" horizontal="start" slot="fixed">
<IonFabButton>
<IonIcon name="arrow-dropright" />
<IonIcon name="arrow-back-circle" />
</IonFabButton>
</IonFab>

{/*-- fab placed to the bottom start --*/}
<IonFab vertical="bottom" horizontal="start" slot="fixed">
<IonFabButton>
<IonIcon name="arrow-dropup" />
<IonIcon name="arrow-up-circle" />
</IonFabButton>
</IonFab>

Expand Down Expand Up @@ -197,21 +197,21 @@ export const FabExample: React.FC = () => (
<!-- fab placed to the bottom end -->
<ion-fab vertical="bottom" horizontal="end" slot="fixed">
<ion-fab-button>
<ion-icon name="arrow-dropleft"></ion-icon>
<ion-icon name="arrow-forward-circle"></ion-icon>
</ion-fab-button>
</ion-fab>

<!-- fab placed to the top start -->
<ion-fab vertical="top" horizontal="start" slot="fixed">
<ion-fab-button>
<ion-icon name="arrow-dropright"></ion-icon>
<ion-icon name="arrow-back-circle"></ion-icon>
</ion-fab-button>
</ion-fab>

<!-- fab placed to the bottom start -->
<ion-fab vertical="bottom" horizontal="start" slot="fixed">
<ion-fab-button>
<ion-icon name="arrow-dropup"></ion-icon>
<ion-icon name="arrow-up-circle"></ion-icon>
</ion-fab-button>
</ion-fab>

Expand Down
6 changes: 3 additions & 3 deletions core/src/components/fab/usage/angular.md
Expand Up @@ -10,21 +10,21 @@
<!-- fab placed to the bottom end -->
<ion-fab vertical="bottom" horizontal="end" slot="fixed">
<ion-fab-button>
<ion-icon name="arrow-dropleft"></ion-icon>
<ion-icon name="arrow-forward-circle"></ion-icon>
</ion-fab-button>
</ion-fab>

<!-- fab placed to the top start -->
<ion-fab vertical="top" horizontal="start" slot="fixed">
<ion-fab-button>
<ion-icon name="arrow-dropright"></ion-icon>
<ion-icon name="arrow-back-circle"></ion-icon>
</ion-fab-button>
</ion-fab>

<!-- fab placed to the bottom start -->
<ion-fab vertical="bottom" horizontal="start" slot="fixed">
<ion-fab-button>
<ion-icon name="arrow-dropup"></ion-icon>
<ion-icon name="arrow-up-circle"></ion-icon>
</ion-fab-button>
</ion-fab>

Expand Down
6 changes: 3 additions & 3 deletions core/src/components/fab/usage/javascript.md
Expand Up @@ -10,21 +10,21 @@
<!-- fab placed to the bottom end -->
<ion-fab vertical="bottom" horizontal="end" slot="fixed">
<ion-fab-button>
<ion-icon name="arrow-dropleft"></ion-icon>
<ion-icon name="arrow-forward-circle"></ion-icon>
</ion-fab-button>
</ion-fab>

<!-- fab placed to the top start -->
<ion-fab vertical="top" horizontal="start" slot="fixed">
<ion-fab-button>
<ion-icon name="arrow-dropright"></ion-icon>
<ion-icon name="arrow-back-circle"></ion-icon>
</ion-fab-button>
</ion-fab>

<!-- fab placed to the bottom start -->
<ion-fab vertical="bottom" horizontal="start" slot="fixed">
<ion-fab-button>
<ion-icon name="arrow-dropup"></ion-icon>
<ion-icon name="arrow-up-circle"></ion-icon>
</ion-fab-button>
</ion-fab>

Expand Down

0 comments on commit 9318d24

Please sign in to comment.