Skip to content
This repository has been archived by the owner on Sep 23, 2023. It is now read-only.

Commit

Permalink
1.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonz1987 committed Mar 8, 2018
1 parent 4d3b7cc commit 6d2911e
Show file tree
Hide file tree
Showing 45 changed files with 923 additions and 467 deletions.
2 changes: 1 addition & 1 deletion config.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="me.growu.drip" version="1.3.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="me.growu.drip" version="1.4.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>水滴打卡</name>
<description>一款习惯养成和目标管理工具</description>
<author email="drip@growu.me" href="http://drip.growu.me/">格吾社区</author>
Expand Down
15 changes: 14 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"ionic:serve": "ionic-app-scripts serve"
},
"dependencies": {
"@angular/animations": "5.2.6",
"@angular/cli": "^1.5.2",
"@angular/common": "5.1.2",
"@angular/compiler": "5.1.2",
Expand Down Expand Up @@ -89,6 +90,7 @@
"ion2-calendar": "2.1.4",
"ionic-angular": "^3.9.2",
"ionic-img-viewer": "2.9.0",
"ionic-tooltips": "^2.0.1",
"ionic2-super-tabs": "^4.1.5",
"ionicons": "3.0.0",
"jpush-phonegap-plugin": "^3.2.13",
Expand Down
20 changes: 11 additions & 9 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import {Keyboard} from '@ionic-native/keyboard';
import {MyApp} from './app.component';
import {IonicStorageModule} from '@ionic/storage';
import {Deeplinks} from '@ionic-native/deeplinks';
import { JPush } from '@jiguang-ionic/jpush';
import { NativeStorage } from '@ionic-native/native-storage';
import { NativeAudio } from '@ionic-native/native-audio';
import {JPush} from '@jiguang-ionic/jpush';
import {NativeStorage} from '@ionic-native/native-storage';
import {NativeAudio} from '@ionic-native/native-audio';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';

import {MyHammerConfig} from '../components/MyHammerConfig'
import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
Expand All @@ -24,8 +25,8 @@ import {ToastProvider} from '../providers/toast/toast';
import {LoadingProvider} from '../providers/loading/loading';
import {IonicImageViewerModule} from 'ionic-img-viewer';
import {MyShareModule} from '../components/my-share/my-share.module';
import { TopProvider } from '../providers/top/top';
import { TopicProvider } from '../providers/topic/topic';
import {TopProvider} from '../providers/top/top';
import {TopicProvider} from '../providers/topic/topic';

@NgModule({
declarations: [
Expand All @@ -41,13 +42,14 @@ import { TopicProvider } from '../providers/topic/topic';
IonicModule.forRoot(MyApp, {
backButtonText: '',
tabsHideOnSubPages: true,
scrollAssist:false,
autoFocusAssist:false,
scrollAssist: false,
autoFocusAssist: false,
monthNames: ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二'],
monthShortNames: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
}),
IonicImageViewerModule,
MyShareModule
MyShareModule,
BrowserAnimationsModule
],
bootstrap: [IonicApp],
entryComponents: [
Expand Down Expand Up @@ -75,7 +77,7 @@ import { TopicProvider } from '../providers/topic/topic';
ToastProvider,
LoadingProvider,
TopProvider,
TopicProvider,
TopicProvider,
]
})
export class AppModule {
Expand Down
16 changes: 16 additions & 0 deletions src/app/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,22 @@
color:#312929;
}

.badge-ios-orange,.badge-md-orange {
color:#fff;
}

.gray-content {
background-color: #dedede!important;
}

.text-md-orange,.text-ios-orange {
//color:#fff;
}

.icon-font {
width: 1.5em;
height: 1.5em;
vertical-align: -0.5em;
fill: currentColor;
overflow: hidden;
}
Loading

0 comments on commit 6d2911e

Please sign in to comment.