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

fix(all): js / scss linter issues

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2017-11-17 00:20:26 +01:00
parent 5507a94580
commit 3c3cd1b537
14 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/src/components/card-content/card-content.scss
View File

@ -5,7 +5,6 @@
// --------------------------------------------------
ion-card-content {
display: block;
position: relative;
display: block;
}

3
packages/core/src/components/card-header/card-header.scss
View File

@ -6,11 +6,10 @@
ion-card-header {
position: relative;
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
position: relative;
}

2
packages/core/src/components/card-subtitle/card-subtitle.ios.scss
View File

@ -39,8 +39,8 @@ $card-ios-subtitle-color: rgba(0, 0, 0, 0.4) !default;
font-size: $card-ios-subtitle-font-size;
font-weight: $card-ios-subtitle-font-weight;
text-transform: $card-ios-subtitle-text-transform;
letter-spacing: $card-ios-subtitle-letter-spacing;
text-transform: $card-ios-subtitle-text-transform;
color: $card-ios-subtitle-color;
}

3
packages/core/src/components/card-subtitle/card-subtitle.scss
View File

@ -5,7 +5,6 @@
// --------------------------------------------------
ion-card-subtitle {
display: block;
position: relative;
display: block;
}

3
packages/core/src/components/card-title/card-title.scss
View File

@ -5,7 +5,6 @@
// --------------------------------------------------
ion-card-title {
display: block;
position: relative;
display: block;
}

2
packages/core/src/components/card/card.scss
View File

@ -5,8 +5,8 @@
ion-card {
display: block;
position: relative;
display: block;
overflow: hidden;
}

7
packages/core/src/components/loading/loading.tsx
View File

@ -183,10 +183,7 @@ export class Loading {
}
protected render() {
let userCssClass = 'loading-content';
if (this.cssClass) {
userCssClass += ' ' + this.cssClass;
}
// TODO: cssClass
const loadingInner: any[] = [];
@ -239,4 +236,4 @@ export interface LoadingEvent extends Event {
};
}
export { iOSEnterAnimation, iOSLeaveAnimation }
export { iOSEnterAnimation, iOSLeaveAnimation };

2
packages/core/src/components/menu-controller/menu-controller.ts
View File

@ -261,4 +261,4 @@ export class MenuController {
}
export { MenuOverlayAnimation, MenuPushAnimation, MenuRevealAnimation }
export { MenuOverlayAnimation, MenuPushAnimation, MenuRevealAnimation };

12
packages/core/src/components/picker/picker.ios.scss
View File

@ -115,7 +115,7 @@ $picker-ios-option-offset-y: (($picker-ios-height - $picker-io
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);
font-weight: normal;
@ -128,10 +128,9 @@ $picker-ios-option-offset-y: (($picker-ios-height - $picker-io
height: $picker-ios-button-height;
font-size: $picker-ios-button-font-size;
color: $picker-ios-button-text-color;
background: $picker-ios-button-background-color;
font-size: $picker-ios-button-font-size;
}
.picker-columns {
@ -161,6 +160,11 @@ $picker-ios-option-offset-y: (($picker-ios-height - $picker-io
}
.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 transform-origin(center, center);
@ -177,8 +181,6 @@ $picker-ios-option-offset-y: (($picker-ios-height - $picker-io
backface-visibility: hidden;
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 {

8
packages/core/src/components/picker/picker.md.scss
View File

@ -93,17 +93,15 @@ $picker-md-option-selected-color: color($colors-md, primary) !defaul
.picker-md .picker-button,
.picker-md .picker-button.activated {
@include margin(0);
@include padding(0, 1.1em);
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-weight: 500;
text-transform: uppercase;
padding: 0 1.1em;
color: $picker-md-button-text-color;
background: $picker-md-button-background-color;
box-shadow: none;
}

14
packages/core/src/components/picker/picker.tsx
View File

@ -18,7 +18,6 @@ export class Picker {
private animation: Animation;
private durationTimeout: any;
private mode: string;
private lastClick: number = 0;
@Element() private el: HTMLElement;
@ -193,8 +192,6 @@ export class Picker {
// }
// keep the time of the most recent button click
this.lastClick = Date.now();
let shouldDismiss = true;
if (button.handler) {
@ -263,10 +260,7 @@ export class Picker {
}
protected render() {
let userCssClass = 'picker-content';
if (this.cssClass) {
userCssClass += ' ' + this.cssClass;
}
// TODO: cssClass
let buttons = this.buttons
.map(b => {
@ -346,12 +340,12 @@ export class Picker {
</div>
)}
</div>
<div class="picker-columns">
<div class="picker-above-highlight"></div>
<div class='picker-columns'>
<div class='picker-above-highlight'></div>
{columns.map(c =>
<ion-picker-column col={c}></ion-picker-column>
)}
<div class="picker-below-highlight"></div>
<div class='picker-below-highlight'></div>
</div>
</div>
];

2
packages/core/src/components/segment-button/segment-button.tsx
View File

@ -147,5 +147,5 @@ export class SegmentButton {
export interface SegmentButtonEvent extends Event {
detail: {
segmentButton: SegmentButton;
}
};
}

2
packages/core/src/utils/helpers.ts
View File

@ -81,7 +81,7 @@ export function updateDetail(ev: any, detail: any) {
var touch = changedTouches[0];
x = touch.clientX;
y = touch.clientY;
}else if (ev.pageX !== undefined) {
} else if (ev.pageX !== undefined) {
x = ev.pageX;
y = ev.pageY;
}