javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 19:57:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(icon): update to latest ionicons for working colors and sizes

Browse Source 
references #14013 references ionic-team/ionicons#524
This commit is contained in:
Brandy Carney
2018-02-15 15:56:12 -05:00
parent 646bd47ce2
commit e8cd91f45e
8 changed files with 8 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/package-lock.json generated
View File

@ -4471,9 +4471,9 @@
"dev": true "dev": true
}, },
"ionicons": { "ionicons": {
"version": "4.0.0-13", "version": "4.0.0-14",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-4.0.0-13.tgz", "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-4.0.0-14.tgz",
"integrity": "sha512-tlr5pA0WjQkQCa5f0D9be8okT/aFGlwFwyKh5O9fQhs0JVkSy8sMeuPcdxMqiRuDjFp37QREwTu+SSWuMuPviQ==", "integrity": "sha512-GERHOhMosrPZaiIhawYHJV+DYBdLQTjT4vT3GW0LtchqiG5HVcuaUnjg2ovjXjV4I8NXvdHic5x/uRuB9gF+Fg==",
"dev": true "dev": true
}, },
"is": { "is": {

2
packages/core/package.json
View File

@ -16,7 +16,7 @@
"chai": "^4.1.2", "chai": "^4.1.2",
"chromedriver": "^2.33.2", "chromedriver": "^2.33.2",
"glob": "^7.1.2", "glob": "^7.1.2",
"ionicons": "4.0.0-13", "ionicons": "4.0.0-14",
"jest": "^21.2.1", "jest": "^21.2.1",
"mocha": "^4.0.1", "mocha": "^4.0.1",
"np": "^2.17.0", "np": "^2.17.0",

2
packages/core/src/components/app/app.ios.scss
View File

@ -29,5 +29,3 @@
a { a {
color: $app-ios-link-color; color: $app-ios-link-color;
} }
@import "../icon/icon.ios";

2
packages/core/src/components/app/app.md.scss
View File

@ -28,5 +28,3 @@
a { a {
color: $app-md-link-color; color: $app-md-link-color;
} }
@import "../icon/icon.md";

16
packages/core/src/components/icon/icon.ios.scss
View File

@ -1,16 +0,0 @@
@import "../../themes/ionic.globals.ios";
// iOS Icon
// --------------------------------------------------
// Generate iOS Icon Colors
// --------------------------------------------------
@each $color-name, $color-value in $colors-ios {
$color-base: ion-color($colors-ios, $color-name, base, ios);
.icon-ios-#{$color-name} {
color: $color-base;
}
}

16
packages/core/src/components/icon/icon.md.scss
View File

@ -1,16 +0,0 @@
@import "../../themes/ionic.globals.md";
// Material Design Icon
// --------------------------------------------------
// Generate Material Design Icon Colors
// --------------------------------------------------
@each $color-name, $color-value in $colors-md {
$color-base: ion-color($colors-md, $color-name, base, md);
.icon-md-#{$color-name} {
color: $color-base;
}
}

4
packages/core/src/components/icon/test/standalone/index.html
View File

@ -16,7 +16,7 @@
<ion-icon name="happy" color="warning"></ion-icon> <ion-icon name="happy" color="warning"></ion-icon>
<ion-icon name="people"></ion-icon> <ion-icon name="people"></ion-icon>
<ion-icon name="person"></ion-icon> <ion-icon name="person" color="tertiary"></ion-icon>
<ion-icon name="contact"></ion-icon> <ion-icon name="contact"></ion-icon>
<ion-icon name="apps"></ion-icon> <ion-icon name="apps"></ion-icon>
@ -32,7 +32,7 @@
<ion-icon name="mic"></ion-icon> <ion-icon name="mic"></ion-icon>
<ion-icon name="musical-notes" color="warning"></ion-icon> <ion-icon name="musical-notes" color="warning"></ion-icon>
<ion-icon name="volume-high"></ion-icon> <ion-icon name="volume-high"></ion-icon>
<ion-icon name="microphone"></ion-icon> <ion-icon name="microphone" color="tertiary"></ion-icon>
<ion-icon name="cafe" color="success"></ion-icon> <ion-icon name="cafe" color="success"></ion-icon>
<ion-icon name="calculator"></ion-icon> <ion-icon name="calculator"></ion-icon>

4
packages/core/src/components/item/test/icons/index.html
View File

@ -47,14 +47,14 @@
<ion-label> <ion-label>
a[ion-item] w/ right side large icon a[ion-item] w/ right side large icon
</ion-label> </ion-label>
<ion-icon name="information-circle" large slot="end"></ion-icon> <ion-icon name="information-circle" size="large" slot="end"></ion-icon>
</ion-item> </ion-item>
<ion-item href="#"> <ion-item href="#">
<ion-label> <ion-label>
a[ion-item] w/ right side small icon a[ion-item] w/ right side small icon
</ion-label> </ion-label>
<ion-icon name="information-circle" small slot="end"></ion-icon> <ion-icon name="information-circle" size="small" slot="end"></ion-icon>
</ion-item> </ion-item>
<ion-item onclick="testClick(event)"> <ion-item onclick="testClick(event)">