Skip to content
This repository was archived by the owner on Feb 26, 2020. It is now read-only.

Commit fbe6fff

Browse files
author
Max Schorradt
committed
Merge branch 'design'
2 parents 4b2a381 + 89e037f commit fbe6fff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+45530
-25
lines changed

‎bower.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@
33
"private": "true",
44
"devDependencies": {
55
"ionic": "driftyco/ionic-bower#1.3.0"
6+
},
7+
"dependencies": {
8+
"ng-material-floating-button": "ng-mfb#^0.6.2"
69
}
710
}

‎hooks/after_prepare/010_add_platform_class.js

100644100755
File mode changed.

‎ionic.config.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "CycleDorf",
3+
"app_id": "10a984c8"
4+
}

‎package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
"description": "CycleDorf",
55
"dependencies": {
66
"gulp": "^3.5.6",
7-
"gulp-sass": "^2.0.4",
87
"gulp-concat": "^2.2.0",
98
"gulp-minify-css": "^0.3.0",
10-
"gulp-rename": "^1.2.0"
9+
"gulp-rename": "^1.2.0",
10+
"gulp-sass": "^2.0.4",
11+
"ng-material-floating-button": "^0.6.2"
1112
},
1213
"devDependencies": {
1314
"bower": "^1.3.3",

‎www/css/style.css

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,42 @@
11
/* Empty. Add your own CSS if you like */
22

3-
43
}
54

6-
button.disable-user-behavior {
7-
display: block;
5+
6+
img {
87
width: 100%;
9-
height: 57%;
8+
height: auto;
9+
10+
1011
}
1112

1213
div.ng-binding {
1314
display: block;
1415
width: 100%;
1516
height: 57%;
17+
text-align: center;
18+
font-size: 31px;
19+
position: relative;
20+
top: 23mm;
21+
background-color: #ffffff;
22+
}
23+
24+
button.button.button-full.button-calm.ng-binding.disable-user-behavior {
25+
background-color: #2196F3;
26+
}
27+
28+
ion-header-bar.bar.bar-header.bar-calm {
29+
background-color: #2196F3;
1630
}
1731

1832
map {
1933
display: block;
2034
width: 100%;
2135
height: 60%;
36+
2237
}
38+
39+
2340
.scroll {
2441
height: 78%;
2542
}

‎www/img/CycleDorf.svg

Lines changed: 27 additions & 0 deletions
Loading

‎www/index.html

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<link href="lib/ionic/css/ionic.css" rel="stylesheet">
99
<link href="css/style.css" rel="stylesheet">
1010
<link href="css/leaflet.css" rel="stylesheet">
11+
<link href="lib/ion-floating-menu/dist/ion-floating-menu.css" rel="stylesheet" type="text/css">
1112

1213
<!-- <! IF using Sass (run gulp sass first), then uncomment below and remove the CSS includes above
1314
<link href="css/ionic.app.css" rel="stylesheet">
@@ -18,7 +19,7 @@
1819

1920
<!-- ionic/angularjs js -->
2021
<script src="lib/ionic/js/ionic.bundle.js"></script>
21-
22+
<script src="lib/ion-floating-menu/dist/ion-floating-menu.js" type="text/javascript"></script>
2223
<script src="js/angularfire.min.js"></script>
2324
<script src="js/leaflet-src.js"></script>
2425
<script src="js/firebase.js"></script>
@@ -33,23 +34,14 @@
3334
</head>
3435

3536
<body ng-app="starter" ng-controller="MapCtrl">
36-
<ion-header-bar class="bar-stable">
37-
<h1 class="title">Map</h1>
38-
</ion-header-bar>
39-
37+
<ion-header-bar class="bar bar-header bar-assertive">
38+
<h1 class="title">CycleDorf</h1>
39+
</ion-header-bar>
4040
<ion-content scroll="false">
4141
<map on-create="mapCreated(map)"></map>
42-
<div>
43-
{{ timer }}<br>
44-
<button ng-click="start()">{{ status }}</button>
42+
<div>
43+
{{ timer }}<br>
44+
<button ng-click="start()" class="button button-full button-assertive">{{ status }}
45+
</button>
4546
</div>
46-
</ion-content>
47-
48-
49-
<ion-footer-bar class="bar-stable">
50-
<a ng-click="centerOnMe()" class="button button-icon icon ion-navigate"></a>
51-
<a ng-click="play=!play" class="button button-icon icon {&apos;ion-play&apos;: play, &apos;ion-stop&apos;: !play}"></a>
52-
<!-- {'icon ion-ios7-heart': liked, 'icon ion-ios7-heart-outline': !liked}" ng-click="liked=!liked" -->
53-
</ion-footer-bar>
54-
</body>
55-
</html>
47+
</ion-content></body></html>

‎www/js/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
angular.module('starter', ['ionic', 'starter.controllers', 'starter.directives', 'firebase'])
1+
angular.module('starter', ['ionic', 'starter.controllers', 'starter.directives', 'firebase', 'ion-floating-menu'])
22

33
.run(function($ionicPlatform) {
44
$ionicPlatform.ready(function() {

‎www/lib/angular-animate/.bower.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"name": "angular-animate",
3+
"version": "1.4.3",
4+
"main": "./angular-animate.js",
5+
"ignore": [],
6+
"dependencies": {
7+
"angular": "1.4.3"
8+
},
9+
"homepage": "https://github.com/angular/bower-angular-animate",
10+
"_release": "1.4.3",
11+
"_resolution": {
12+
"type": "version",
13+
"tag": "v1.4.3",
14+
"commit": "4ce2a76359401102d2e0146ccf69e6c060799ff8"
15+
},
16+
"_source": "https://github.com/angular/bower-angular-animate.git",
17+
"_target": "1.4.3",
18+
"_originalSource": "angular-animate"
19+
}

0 commit comments

Comments
 (0)