mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2026-03-13 10:22:08 +08:00
refactor(icon): logo ionicons use logo- prefix rather than suffix
This commit is contained in:
@@ -27,7 +27,7 @@ import {Config} from '../../config/config';
|
||||
*
|
||||
* <!-- always use the same icon, no matter what the mode -->
|
||||
* <ion-icon name="ios-clock"></ion-icon>
|
||||
* <ion-icon name="twitter-logo"></ion-icon>
|
||||
* <ion-icon name="logo-twitter"></ion-icon>
|
||||
* ```
|
||||
*
|
||||
* @property {string} [name] - Use the appropriate icon for the mode.
|
||||
@@ -82,7 +82,7 @@ export class Icon {
|
||||
* @private
|
||||
*/
|
||||
set name(val) {
|
||||
if (!(/^md-|^ios-|-logo$/.test(val))) {
|
||||
if (!(/^md-|^ios-|^logo-/.test(val))) {
|
||||
// this does not have one of the defaults
|
||||
// so lets auto add in the mode prefix for them
|
||||
val = this.mode + '-' + val;
|
||||
|
||||
@@ -16,7 +16,7 @@ class E2EApp {
|
||||
'ios-alert',
|
||||
'ios-alert-outline',
|
||||
'md-alert',
|
||||
'apple-logo'
|
||||
'logo-apple'
|
||||
];
|
||||
this.btnIcon = this.icons[0];
|
||||
}
|
||||
|
||||
@@ -57,16 +57,16 @@
|
||||
</ion-item>
|
||||
|
||||
<ion-item>
|
||||
<ion-icon name="twitter-logo" item-left></ion-icon>
|
||||
<ion-icon name="logo-twitter" item-left></ion-icon>
|
||||
<code>
|
||||
name="twitter-logo"
|
||||
name="logo-twitter"
|
||||
</code>
|
||||
</ion-item>
|
||||
|
||||
<ion-item>
|
||||
<ion-icon ios="apple-logo" md="android-logo" item-left></ion-icon>
|
||||
<ion-icon ios="logo-apple" md="logo-android" item-left></ion-icon>
|
||||
<code>
|
||||
ios="apple-logo" md="android-logo"
|
||||
ios="logo-apple" md="logo-android"
|
||||
</code>
|
||||
</ion-item>
|
||||
|
||||
|
||||
@@ -126,11 +126,6 @@ ion-thumbnail[item-right] {
|
||||
min-height: 25px;
|
||||
}
|
||||
|
||||
.button-icon-only ion-icon,
|
||||
.button-icon-only {
|
||||
padding: 0 1px;
|
||||
}
|
||||
|
||||
ion-avatar {
|
||||
min-width: $item-ios-avatar-size;
|
||||
min-height: $item-ios-avatar-size;
|
||||
|
||||
@@ -102,11 +102,6 @@ ion-icon[item-right] {
|
||||
font-size: 1.2rem;
|
||||
}
|
||||
|
||||
.button-icon-only ion-icon,
|
||||
.button-icon-only {
|
||||
padding: 0 1px;
|
||||
}
|
||||
|
||||
[text-wrap] ion-item-content {
|
||||
font-size: $item-md-body-text-font-size;
|
||||
line-height: $item-md-body-text-line-height;
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<button class="e2eContentToggleMenu" menuToggle="rightMenu">Toggle Right Menu</button>
|
||||
<button menuToggle="rightMenu">Toggle Right Menu</button>
|
||||
</p>
|
||||
|
||||
<ion-card>
|
||||
|
||||
@@ -104,7 +104,7 @@
|
||||
<ion-segment-button value="free">
|
||||
Toolbar
|
||||
</ion-segment-button>
|
||||
<ion-segment-button value="top" class="e2eSegmentTopGrossing">
|
||||
<ion-segment-button value="top">
|
||||
Danger Segment
|
||||
</ion-segment-button>
|
||||
</ion-segment>
|
||||
@@ -118,7 +118,7 @@
|
||||
<ion-segment-button value="free">
|
||||
Toolbar
|
||||
</ion-segment-button>
|
||||
<ion-segment-button value="top" class="e2eSegmentTopGrossing">
|
||||
<ion-segment-button value="top">
|
||||
Default Segment
|
||||
</ion-segment-button>
|
||||
</ion-segment>
|
||||
|
||||
Reference in New Issue
Block a user