diff options
| author | Pliable Pixels <pliablepixels@users.noreply.github.com> | 2016-10-12 10:56:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-12 10:56:11 -0400 |
| commit | a3d4132cc177a8009ba53630808abaa245bbaf79 (patch) | |
| tree | ec891a02273110c34efb5a6f15158fc634d85f4e /www/index.html | |
| parent | 986006947c3a6ac404d6868c113a03aaf202dcc2 (diff) | |
| parent | 77670b3180515076ba19febd0cdff4d7ecb4da69 (diff) | |
Merge pull request #349 from pliablepixels/montage-jazz
Montage jazz
Former-commit-id: ba1be6c70c55a7274d980d9b418b8bc385704ba2
Diffstat (limited to 'www/index.html')
| -rw-r--r-- | www/index.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/www/index.html b/www/index.html index df6cdf13..a6a9ae8f 100644 --- a/www/index.html +++ b/www/index.html @@ -69,6 +69,7 @@ <script src="external/draggabilly.pkgd.js"></script> <script src="external/ionic.scroll.sista.js"></script> <script src="external/angular-circular-navigation.js"></script> + <script src="external/Chart2.min.js"></script> @@ -140,7 +141,7 @@ </ion-header-bar> <ion-content has-header="true" mouse-wheel-scroll> - <ion-scroll scrollbar-y="false" style="height:100%" > + <!-- <ion-scroll scrollbar-y="false" style="height:100%" >--> <ion-list> <ion-item href="#/montage" menu-close> @@ -164,7 +165,7 @@ </span>{{'kMenuTimeline'|translate}} </ion-item> - <ion-item href="#/events/0" menu-close> + <ion-item href="#/events/0/false" menu-close> <span class=" item-icon-left"> <i class="icon ion-ios-calendar-outline"></i> </span>{{'kMenuEvents'|translate}} @@ -260,7 +261,7 @@ </ion-list> - </ion-scroll> + <!--</ion-scroll>--> </ion-content> </ion-side-menu> </ion-side-menus> |