FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

alpha39 updates/hacks · Java1024/ionic@c657bb6 · GitHub

  1. Java1024
  2. ionic

Repository navigation

Commit c657bb6

Browse files
adamdbradley
committed
alpha39 updates/hacks
Conflicts: ionic/components/search-bar/search-bar.ts ionic/config/decorators.ts
1 parent 9fc63fe commit c657bb6

9 files changed

Lines changed: 23 additions & 32 deletions

File tree

‎demos/snapcat/main.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,18 @@ <h2 style="text-align: center; color: #555; font-size: 16px;">Swipe Right <i cla
4646
ion-content {
4747
background-color: #F5F5F5 !important;
4848
}
49-
.card {
49+
ion-card {
5050
box-shadow: none !important;
5151
}
52-
.card .card-content {
52+
ion-card ion-card-content {
5353
font-family: 'lato';
5454
font-size: 16px;
5555
line-height: 25px;
5656
}
57-
.card .item {
57+
ion-card .item {
5858
border: none !important;
5959
}
60-
.card .card-content {
60+
ion-card ion-card-content {
6161
padding: 25px !important;
6262
}
6363
.item {

‎ionic/components.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ export * from 'ionic/components/app/id'
44
export * from 'ionic/components/action-sheet/action-sheet'
55
export * from 'ionic/components/blur/blur'
66
export * from 'ionic/components/button/button'
7-
export * from 'ionic/components/card/card'
87
export * from 'ionic/components/checkbox/checkbox'
98
export * from 'ionic/components/content/content'
109
export * from 'ionic/components/form/input'

‎ionic/components/card/card.ts‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎ionic/components/item/item.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,3 +155,9 @@ ion-item-options {
155155
z-index: $z-index-item-options;
156156
height: 100%;
157157
}
158+
159+
160+
// TEMP hack for https://github.com/angular/angular/issues/4582
161+
[item-right] {
162+
order: 1;
163+
}

‎ionic/components/item/item.ts‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Component, View} from 'angular2/angular2';
1+
import {Component, View, ElementRef, Renderer} from 'angular2/angular2';
22

33

44
/**
@@ -18,17 +18,18 @@ import {Component, View} from 'angular2/angular2';
1818
* ```
1919
*/
2020
@Component({
21-
selector: 'ion-item,[ion-item]',
22-
host: {
23-
'class': 'item'
24-
}
21+
selector: 'ion-item,[ion-item]'
2522
})
2623
@View({
2724
template:
2825
'<ng-content select="[item-left]"></ng-content>' +
26+
'<ng-content select="[item-right]"></ng-content>' +
2927
'<ion-item-content>' +
3028
'<ng-content></ng-content>'+
31-
'</ion-item-content>' +
32-
'<ng-content select="[item-right]"></ng-content>'
29+
'</ion-item-content>'
3330
})
34-
export class Item {}
31+
export class Item {
32+
constructor(elementRef: ElementRef, renderer: Renderer) {
33+
renderer.setElementClass(elementRef, 'item', true);
34+
}
35+
}

‎ionic/components/item/modes/ios.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ button.item {
210210
}
211211

212212
.list,
213-
.card {
213+
ion-card {
214214
button[ion-item]:not([detail-none]),
215215
a[ion-item]:not([detail-none]),
216216
[detail-push]:not(ion-item-sliding) {

‎ionic/components/item/modes/md.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ $item-md-sliding-transition: transform 250ms ease-in-out !default;
148148
margin: 4px;
149149
}
150150

151-
icon + ion-item-content,
152-
icon + .text-input {
151+
icon[item-left] + ion-item-content,
152+
icon[item-left] + .text-input {
153153
margin-left: $item-md-padding-left + ($item-md-padding-left / 2);
154154
}
155155

‎ionic/components/search-bar/test/basic/index.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import {NgControl} from 'angular2/angular2';
2-
import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/forms';
1+
import {NgControl, FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/angular2';
32

43
import {App} from 'ionic/ionic';
54
import {SearchPipe} from 'ionic/components/search-bar/search-bar';

‎ionic/config/directives.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {Refresher} from '../components/scroll/pull-to-refresh';
1212
import {Slides, Slide, SlideLazy} from '../components/slides/slides';
1313
import {Tabs} from '../components/tabs/tabs';
1414
import {Tab} from '../components/tabs/tab';
15-
import {Card} from '../components/card/card';
1615
import {List, ListHeader} from '../components/list/list';
1716
import {Item} from '../components/item/item';
1817
import {ItemGroup, ItemGroupTitle} from '../components/item/item-group';
@@ -55,7 +54,6 @@ export const IONIC_DIRECTIVES = [
5554
Refresher,
5655

5756
// Lists
58-
Card,
5957
List,
6058
ListHeader,
6159
Item,

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL