mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-08-23 05:58:26 +08:00
fix(all): js / scss linter issues
This commit is contained in:
@ -5,7 +5,6 @@
|
|||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
|
|
||||||
ion-card-content {
|
ion-card-content {
|
||||||
display: block;
|
|
||||||
|
|
||||||
position: relative;
|
position: relative;
|
||||||
|
display: block;
|
||||||
}
|
}
|
||||||
|
@ -6,11 +6,10 @@
|
|||||||
|
|
||||||
|
|
||||||
ion-card-header {
|
ion-card-header {
|
||||||
|
position: relative;
|
||||||
display: block;
|
display: block;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
|
||||||
position: relative;
|
|
||||||
}
|
}
|
||||||
|
@ -39,8 +39,8 @@ $card-ios-subtitle-color: rgba(0, 0, 0, 0.4) !default;
|
|||||||
|
|
||||||
font-size: $card-ios-subtitle-font-size;
|
font-size: $card-ios-subtitle-font-size;
|
||||||
font-weight: $card-ios-subtitle-font-weight;
|
font-weight: $card-ios-subtitle-font-weight;
|
||||||
text-transform: $card-ios-subtitle-text-transform;
|
|
||||||
letter-spacing: $card-ios-subtitle-letter-spacing;
|
letter-spacing: $card-ios-subtitle-letter-spacing;
|
||||||
|
text-transform: $card-ios-subtitle-text-transform;
|
||||||
color: $card-ios-subtitle-color;
|
color: $card-ios-subtitle-color;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
|
|
||||||
ion-card-subtitle {
|
ion-card-subtitle {
|
||||||
display: block;
|
|
||||||
|
|
||||||
position: relative;
|
position: relative;
|
||||||
|
display: block;
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
|
|
||||||
ion-card-title {
|
ion-card-title {
|
||||||
display: block;
|
|
||||||
|
|
||||||
position: relative;
|
position: relative;
|
||||||
|
display: block;
|
||||||
}
|
}
|
||||||
|
@ -5,8 +5,8 @@
|
|||||||
|
|
||||||
|
|
||||||
ion-card {
|
ion-card {
|
||||||
display: block;
|
|
||||||
position: relative;
|
position: relative;
|
||||||
|
display: block;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -183,10 +183,7 @@ export class Loading {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected render() {
|
protected render() {
|
||||||
let userCssClass = 'loading-content';
|
// TODO: cssClass
|
||||||
if (this.cssClass) {
|
|
||||||
userCssClass += ' ' + this.cssClass;
|
|
||||||
}
|
|
||||||
|
|
||||||
const loadingInner: any[] = [];
|
const loadingInner: any[] = [];
|
||||||
|
|
||||||
@ -239,4 +236,4 @@ export interface LoadingEvent extends Event {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export { iOSEnterAnimation, iOSLeaveAnimation }
|
export { iOSEnterAnimation, iOSLeaveAnimation };
|
||||||
|
@ -261,4 +261,4 @@ export class MenuController {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export { MenuOverlayAnimation, MenuPushAnimation, MenuRevealAnimation }
|
export { MenuOverlayAnimation, MenuPushAnimation, MenuRevealAnimation };
|
||||||
|
@ -115,7 +115,7 @@ $picker-ios-option-offset-y: (($picker-ios-height - $picker-io
|
|||||||
font-weight: $picker-ios-button-strong-font-weight;
|
font-weight: $picker-ios-button-strong-font-weight;
|
||||||
}
|
}
|
||||||
|
|
||||||
.picker-ios .picker-toolbar-button:first-child{
|
.picker-ios .picker-toolbar-button:first-child {
|
||||||
@include text-align(start);
|
@include text-align(start);
|
||||||
|
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
@ -128,10 +128,9 @@ $picker-ios-option-offset-y: (($picker-ios-height - $picker-io
|
|||||||
|
|
||||||
height: $picker-ios-button-height;
|
height: $picker-ios-button-height;
|
||||||
|
|
||||||
|
font-size: $picker-ios-button-font-size;
|
||||||
color: $picker-ios-button-text-color;
|
color: $picker-ios-button-text-color;
|
||||||
background: $picker-ios-button-background-color;
|
background: $picker-ios-button-background-color;
|
||||||
|
|
||||||
font-size: $picker-ios-button-font-size;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.picker-columns {
|
.picker-columns {
|
||||||
@ -161,6 +160,11 @@ $picker-ios-option-offset-y: (($picker-ios-height - $picker-io
|
|||||||
}
|
}
|
||||||
|
|
||||||
.picker-ios .picker-opt {
|
.picker-ios .picker-opt {
|
||||||
|
@include padding(
|
||||||
|
$picker-ios-option-padding-top,
|
||||||
|
$picker-ios-option-padding-end,
|
||||||
|
$picker-ios-option-padding-bottom,
|
||||||
|
$picker-ios-option-padding-start);
|
||||||
@include margin(0);
|
@include margin(0);
|
||||||
@include transform-origin(center, center);
|
@include transform-origin(center, center);
|
||||||
|
|
||||||
@ -177,8 +181,6 @@ $picker-ios-option-offset-y: (($picker-ios-height - $picker-io
|
|||||||
backface-visibility: hidden;
|
backface-visibility: hidden;
|
||||||
|
|
||||||
pointer-events: auto;
|
pointer-events: auto;
|
||||||
|
|
||||||
@include padding($picker-ios-option-padding-top, $picker-ios-option-padding-end, $picker-ios-option-padding-bottom, $picker-ios-option-padding-start);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.picker-ios .picker-above-highlight {
|
.picker-ios .picker-above-highlight {
|
||||||
|
@ -93,17 +93,15 @@ $picker-md-option-selected-color: color($colors-md, primary) !defaul
|
|||||||
.picker-md .picker-button,
|
.picker-md .picker-button,
|
||||||
.picker-md .picker-button.activated {
|
.picker-md .picker-button.activated {
|
||||||
@include margin(0);
|
@include margin(0);
|
||||||
|
@include padding(0, 1.1em);
|
||||||
|
|
||||||
height: $picker-md-button-height;
|
height: $picker-md-button-height;
|
||||||
|
|
||||||
color: $picker-md-button-text-color;
|
|
||||||
background: $picker-md-button-background-color;
|
|
||||||
|
|
||||||
font-size: $picker-md-button-font-size;
|
font-size: $picker-md-button-font-size;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
padding: 0 1.1em;
|
color: $picker-md-button-text-color;
|
||||||
|
background: $picker-md-button-background-color;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,7 +18,6 @@ export class Picker {
|
|||||||
private animation: Animation;
|
private animation: Animation;
|
||||||
private durationTimeout: any;
|
private durationTimeout: any;
|
||||||
private mode: string;
|
private mode: string;
|
||||||
private lastClick: number = 0;
|
|
||||||
|
|
||||||
@Element() private el: HTMLElement;
|
@Element() private el: HTMLElement;
|
||||||
|
|
||||||
@ -193,8 +192,6 @@ export class Picker {
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
// keep the time of the most recent button click
|
// keep the time of the most recent button click
|
||||||
this.lastClick = Date.now();
|
|
||||||
|
|
||||||
let shouldDismiss = true;
|
let shouldDismiss = true;
|
||||||
|
|
||||||
if (button.handler) {
|
if (button.handler) {
|
||||||
@ -263,10 +260,7 @@ export class Picker {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected render() {
|
protected render() {
|
||||||
let userCssClass = 'picker-content';
|
// TODO: cssClass
|
||||||
if (this.cssClass) {
|
|
||||||
userCssClass += ' ' + this.cssClass;
|
|
||||||
}
|
|
||||||
|
|
||||||
let buttons = this.buttons
|
let buttons = this.buttons
|
||||||
.map(b => {
|
.map(b => {
|
||||||
@ -346,12 +340,12 @@ export class Picker {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div class="picker-columns">
|
<div class='picker-columns'>
|
||||||
<div class="picker-above-highlight"></div>
|
<div class='picker-above-highlight'></div>
|
||||||
{columns.map(c =>
|
{columns.map(c =>
|
||||||
<ion-picker-column col={c}></ion-picker-column>
|
<ion-picker-column col={c}></ion-picker-column>
|
||||||
)}
|
)}
|
||||||
<div class="picker-below-highlight"></div>
|
<div class='picker-below-highlight'></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
];
|
];
|
||||||
|
@ -147,5 +147,5 @@ export class SegmentButton {
|
|||||||
export interface SegmentButtonEvent extends Event {
|
export interface SegmentButtonEvent extends Event {
|
||||||
detail: {
|
detail: {
|
||||||
segmentButton: SegmentButton;
|
segmentButton: SegmentButton;
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
@ -81,7 +81,7 @@ export function updateDetail(ev: any, detail: any) {
|
|||||||
var touch = changedTouches[0];
|
var touch = changedTouches[0];
|
||||||
x = touch.clientX;
|
x = touch.clientX;
|
||||||
y = touch.clientY;
|
y = touch.clientY;
|
||||||
}else if (ev.pageX !== undefined) {
|
} else if (ev.pageX !== undefined) {
|
||||||
x = ev.pageX;
|
x = ev.pageX;
|
||||||
y = ev.pageY;
|
y = ev.pageY;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user