Merge branch 'design'

codefordus · May 22, 2016 · fbe6fff · fbe6fff
2 parents 4b2a381 + 89e037f
commit fbe6fff
Show file tree

Hide file tree

Showing 88 changed files with 45,530 additions and 25 deletions.
diff --git a/bower.json b/bower.json
@@ -3,5 +3,8 @@
   "private": "true",
   "devDependencies": {
     "ionic": "driftyco/ionic-bower#1.3.0"
+  },
+  "dependencies": {
+    "ng-material-floating-button": "ng-mfb#^0.6.2"
   }
 }
diff --git a/hooks/after_prepare/010_add_platform_class.js b/hooks/after_prepare/010_add_platform_class.js
diff --git a/ionic.config.json b/ionic.config.json
@@ -0,0 +1,4 @@
+{
+  "name": "CycleDorf",
+  "app_id": "10a984c8"
+}
diff --git a/package.json b/package.json
@@ -4,10 +4,11 @@
   "description": "CycleDorf",
   "dependencies": {
     "gulp": "^3.5.6",
-    "gulp-sass": "^2.0.4",
     "gulp-concat": "^2.2.0",
     "gulp-minify-css": "^0.3.0",
-    "gulp-rename": "^1.2.0"
+    "gulp-rename": "^1.2.0",
+    "gulp-sass": "^2.0.4",
+    "ng-material-floating-button": "^0.6.2"
   },
   "devDependencies": {
     "bower": "^1.3.3",

diff --git a/www/css/style.css b/www/css/style.css
@@ -1,25 +1,42 @@
 /* Empty. Add your own CSS if you like */
 
-
 }
 
-button.disable-user-behavior {
-	display: block;
+
+img {
 	width: 100%;
-	height: 57%;
+	height: auto;
+
+
 }
 
 div.ng-binding {
 	display: block;
 	width: 100%;
 	height: 57%;
+	text-align: center;
+	font-size: 31px;
+	position: relative;
+	top: 23mm;
+	background-color: #ffffff;
+}
+
+button.button.button-full.button-calm.ng-binding.disable-user-behavior {
+	background-color: #2196F3;
+}
+
+ion-header-bar.bar.bar-header.bar-calm {
+	background-color: #2196F3;
 }
 
 map {
   display: block;
   width: 100%;
   height: 60%;
+
 }
+
+
 .scroll {
   height: 78%;
 }
diff --git a/www/img/CycleDorf.svg b/www/img/CycleDorf.svg
diff --git a/www/index.html b/www/index.html
@@ -8,6 +8,7 @@
     <link href="lib/ionic/css/ionic.css" rel="stylesheet">
     <link href="css/style.css" rel="stylesheet">
     <link href="css/leaflet.css" rel="stylesheet">
+    <link href="lib/ion-floating-menu/dist/ion-floating-menu.css" rel="stylesheet" type="text/css">
 
  <!--   <! IF using Sass (run gulp sass first), then uncomment below and remove the CSS includes above
     <link href="css/ionic.app.css" rel="stylesheet">
@@ -18,7 +19,7 @@
 
     <!-- ionic/angularjs js -->
     <script src="lib/ionic/js/ionic.bundle.js"></script>
-
+	<script src="lib/ion-floating-menu/dist/ion-floating-menu.js" type="text/javascript"></script>
     <script src="js/angularfire.min.js"></script>
     <script src="js/leaflet-src.js"></script>
     <script src="js/firebase.js"></script>
@@ -33,23 +34,14 @@
   </head>
 
   <body ng-app="starter" ng-controller="MapCtrl">
-    <ion-header-bar class="bar-stable">
-      <h1 class="title">Map</h1>
-    </ion-header-bar>
-
+    <ion-header-bar class="bar bar-header bar-assertive">
+ 	  <h1 class="title">CycleDorf</h1>
+     </ion-header-bar>
     <ion-content scroll="false">
       <map on-create="mapCreated(map)"></map>
-  <div>
-    {{ timer }}<br>
-    <button ng-click="start()">{{ status }}</button>
+    <div>
+   {{ timer }}<br>
+    <button ng-click="start()" class="button button-full button-assertive">{{ status }} 
+    </button>
   </div>
-    </ion-content>
-
-
-    <ion-footer-bar class="bar-stable">
-      <a ng-click="centerOnMe()" class="button button-icon icon ion-navigate"></a>
-      <a ng-click="play=!play" class="button button-icon icon {&apos;ion-play&apos;: play, &apos;ion-stop&apos;: !play}"></a>
-      <!-- {'icon ion-ios7-heart': liked, 'icon ion-ios7-heart-outline': !liked}" ng-click="liked=!liked" -->
-    </ion-footer-bar>
-  </body>
-</html>
+ </ion-content></body></html>
diff --git a/www/js/app.js b/www/js/app.js
@@ -1,4 +1,4 @@
-angular.module('starter', ['ionic', 'starter.controllers', 'starter.directives', 'firebase'])
+angular.module('starter', ['ionic', 'starter.controllers', 'starter.directives', 'firebase', 'ion-floating-menu'])
 
 .run(function($ionicPlatform) {
   $ionicPlatform.ready(function() {

diff --git a/www/lib/angular-animate/.bower.json b/www/lib/angular-animate/.bower.json
@@ -0,0 +1,19 @@
+{
+  "name": "angular-animate",
+  "version": "1.4.3",
+  "main": "./angular-animate.js",
+  "ignore": [],
+  "dependencies": {
+    "angular": "1.4.3"
+  },
+  "homepage": "https://github.com/angular/bower-angular-animate",
+  "_release": "1.4.3",
+  "_resolution": {
+    "type": "version",
+    "tag": "v1.4.3",
+    "commit": "4ce2a76359401102d2e0146ccf69e6c060799ff8"
+  },
+  "_source": "https://github.com/angular/bower-angular-animate.git",
+  "_target": "1.4.3",
+  "_originalSource": "angular-animate"
+}