Skip to content

Commit

Permalink
(feat): fade changes
Browse files Browse the repository at this point in the history
  • Loading branch information
markharding committed Jan 18, 2017
1 parent b3ff4f2 commit 3bec8c9
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 12 deletions.
8 changes: 6 additions & 2 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Component, ViewChild } from "@angular/core";
import { Nav } from 'ionic-angular';
import { Nav, Platform } from 'ionic-angular';
import { StatusBar } from 'ionic-native';

import { TabsComponent } from "./modules/tabs/tabs.component";
import { LoginComponent } from "./modules/auth/login.component";
Expand All @@ -18,7 +19,10 @@ export class MindsApp {

rootPage : any = LoginComponent;

constructor(private oauth2 : OAuth2){
constructor(private oauth2 : OAuth2, private platform : Platform){
platform.ready().then(() => {
StatusBar.backgroundColorByHexString('#333333');
});
if(this.oauth2.hasAccessToken()){
this.rootPage = TabsComponent;
}
Expand Down
5 changes: 2 additions & 3 deletions src/app/common/directives/img-fade.directive.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ img[imgFade]{
background:#666;
-webkit-filter:
//blur(1px)
opacity(0%);

brightness(0);
drop-shadow:0 0 3px #EEE;
}

img.m-imgFade--loaded{
-webkit-filter:
//blur(0)
opacity(100%);
brightness(100%);
}
4 changes: 2 additions & 2 deletions src/app/modules/comments/comments.module.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { NgModule } from '@angular/core';
import { IonicModule } from 'ionic-angular';


import { CommonModule } from '../../common/common.module';
import { Client } from '../../common/services/api/client';

import { CommentsList } from './list.component';

@NgModule({
imports: [ IonicModule ],
imports: [ IonicModule, CommonModule ],
providers: [ Client ],
declarations: [ CommentsList ],
exports: [ CommentsList ],
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/comments/list.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div *ngFor="let comment of comments">
<div class="m-ionic-comments--comment">
<div class="m-ionic-avatar">
<img [src]="'https://www.minds.com/icon/' + comment.ownerObj.guid + '/medium'" class="mdl-shadow--2dp"/>
<img [src]="'https://www.minds.com/icon/' + comment.ownerObj.guid + '/medium'" class="mdl-shadow--2dp" imgFade/>
</div>
<div class="m-ionic-body">
<b>{{comment.ownerObj.name}} (@ {{comment.ownerObj.name}})</b>
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/messenger/list.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
[navPush]="components.view"
[navParams]="{ conversation: convo }">
<div class="m-ionic-avatar">
<img [src]="'https://www.minds.com/icon/' + convo.participants[0].guid+ '/medium'" class="mdl-shadow--2dp"/>
<img [src]="'https://www.minds.com/icon/' + convo.participants[0].guid+ '/medium'" class="mdl-shadow--2dp" imgFade />
</div>
<div class="m-ionic-body">
<h3>{{convo.username}}</h3>
Expand Down
4 changes: 2 additions & 2 deletions src/app/modules/messenger/messenger.module.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { NgModule } from '@angular/core';
import { IonicModule } from 'ionic-angular';


import { CommonModule } from '../../common/common.module';
import { Client } from '../../common/services/api/client';

import { MessengerList } from './list.component';
import { MessengerView } from './view.component';

@NgModule({
imports: [ IonicModule ],
imports: [ IonicModule, CommonModule ],
providers: [ Client ],
declarations: [ MessengerList, MessengerView ],
exports: [ MessengerList ],
Expand Down
1 change: 1 addition & 0 deletions src/app/modules/notifications/list.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
width="36"
height="36"
style="margin: 0px; border-radius:50%;"
imgFade
/>
</button>
</ion-buttons>
Expand Down
3 changes: 2 additions & 1 deletion src/app/modules/notifications/notifications.module.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import { NgModule } from '@angular/core';
import { IonicModule } from 'ionic-angular';

import { CommonModule } from '../../common/common.module';
import { Client } from '../../common/services/api/client';
import { NotificationsList } from './list.component';
import { NotificationCard } from './card/card.component';


@NgModule({
imports: [ IonicModule ],
imports: [ IonicModule, CommonModule ],
providers: [ Client ],
declarations: [ NotificationsList, NotificationCard ],
exports: [ NotificationsList, NotificationCard ],
Expand Down

0 comments on commit 3bec8c9

Please sign in to comment.