Skip to content

Commit 12090de

Browse files
authored
Merge pull request #241 from urbanriskmap/dev
Merging dev to master Reviewed changes, tested in prod environment via riskmap.us deployment off dev branch
2 parents e55b144 + bbf069c commit 12090de

Some content is hidden

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

76 files changed

+1972
-253
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ coverage/
1111
src/environment.js
1212
src/deployment.js
1313
src/components/side-pane/
14-
src/resources/locales/local_lang.js
14+
src/resources/locales/
15+
/index.html
16+
/favicon.ico
1517

1618
#for vim:
1719
*.swp

.jshintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"ignoreDelimiters": [
3-
{ "start": "start-non-standard", "end": "end-non-standard" }
3+
{ "start": "start-aurelia-decorators", "end": "end-aurelia-decorators" }
44
],
55
"esversion":6
66
}

README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
### PetaBencana.id
2-
Front-end code  
1+
### RiskMap
2+
Client application for cognicity map  
33
[![Build Status](https://travis-ci.org/urbanriskmap/petabencana.id.svg?branch=master)](https://travis-ci.org/urbanriskmap/petabencana.id)
44
<br>
55
[Project description](https://github.com/urbanriskmap/petabencana-docs/blob/master/README.md)
@@ -12,6 +12,11 @@ DOI for current stable release [v1.0.1](https://github.com/urbanriskmap/petabenc
1212
[![DOI](https://zenodo.org/badge/70249665.svg)](https://zenodo.org/badge/latestdoi/70249665)
1313
____
1414

15+
### Supported deployments
16+
* riskmap.us
17+
* petabencana.id
18+
* riskmap.in
19+
1520
### Machine setup
1621
* Install NodeJS >= 4.x
1722
* You can [download it here](https://nodejs.org/en/).

assets/fonts/fontello/config.json

100644100755
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "",
2+
"name": "fontello",
33
"css_prefix_text": "icon-",
44
"css_use_suffix": false,
55
"hinting": true,
@@ -84,12 +84,6 @@
8484
"code": 62073,
8585
"src": "fontawesome"
8686
},
87-
{
88-
"uid": "559647a6f430b3aeadbecd67194451dd",
89-
"css": "menu",
90-
"code": 61641,
91-
"src": "fontawesome"
92-
},
9387
{
9488
"uid": "9bd60140934a1eb9236fd7a8ab1ff6ba",
9589
"css": "spin4",
@@ -403,6 +397,12 @@
403397
"search": [
404398
"flood_icon"
405399
]
400+
},
401+
{
402+
"uid": "2cfb3f2b46b34a1790aec0aa846297b6",
403+
"css": "menu",
404+
"code": 59425,
405+
"src": "entypo"
406406
}
407407
]
408-
}
408+
}

assets/fonts/fontello/css/animation.css

100644100755
File mode changed.

assets/fonts/fontello/css/fontello-codes.css

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
.icon-desilting:before { content: '\e81e'; } /* '' */
3333
.icon-canalrepair:before { content: '\e81f'; } /* '' */
3434
.icon-map-flood:before { content: '\e820'; } /* '' */
35+
.icon-menu:before { content: '\e821'; } /* '' */
3536
.icon-flood:before { content: '\e822'; } /* '' */
3637
.icon-spin4:before { content: '\e834'; } /* '' */
37-
.icon-menu:before { content: '\f0c9'; } /* '' */
3838
.icon-angle-double-right:before { content: '\f101'; } /* '' */
3939
.icon-apple:before { content: '\f179'; } /* '' */
4040
.icon-android:before { content: '\f17b'; } /* '' */

assets/fonts/fontello/css/fontello-embedded.css

100644100755
Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/fonts/fontello/css/fontello-ie7-codes.css

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
.icon-desilting { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe81e;&nbsp;'); }
3333
.icon-canalrepair { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe81f;&nbsp;'); }
3434
.icon-map-flood { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe820;&nbsp;'); }
35+
.icon-menu { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe821;&nbsp;'); }
3536
.icon-flood { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe822;&nbsp;'); }
3637
.icon-spin4 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe834;&nbsp;'); }
37-
.icon-menu { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c9;&nbsp;'); }
3838
.icon-angle-double-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf101;&nbsp;'); }
3939
.icon-apple { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf179;&nbsp;'); }
4040
.icon-android { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf17b;&nbsp;'); }

assets/fonts/fontello/css/fontello-ie7.css

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[class^="icon-"], [class*=" icon-"] {
2-
font-family: 'fontello';
2+
font-family: 'manu';
33
font-style: normal;
44
font-weight: normal;
55

@@ -43,9 +43,9 @@
4343
.icon-desilting { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe81e;&nbsp;'); }
4444
.icon-canalrepair { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe81f;&nbsp;'); }
4545
.icon-map-flood { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe820;&nbsp;'); }
46+
.icon-menu { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe821;&nbsp;'); }
4647
.icon-flood { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe822;&nbsp;'); }
4748
.icon-spin4 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe834;&nbsp;'); }
48-
.icon-menu { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c9;&nbsp;'); }
4949
.icon-angle-double-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf101;&nbsp;'); }
5050
.icon-apple { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf179;&nbsp;'); }
5151
.icon-android { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf17b;&nbsp;'); }

assets/fonts/fontello/css/fontello.css

100644100755
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
@font-face {
2-
font-family: 'fontello';
3-
src: url('../font/fontello.eot?61121405');
4-
src: url('../font/fontello.eot?61121405#iefix') format('embedded-opentype'),
5-
url('../font/fontello.woff2?61121405') format('woff2'),
6-
url('../font/fontello.woff?61121405') format('woff'),
7-
url('../font/fontello.ttf?61121405') format('truetype'),
8-
url('../font/fontello.svg?61121405#fontello') format('svg');
2+
font-family: 'manu';
3+
src: url('../font/manu.eot?32698092');
4+
src: url('../font/manu.eot?32698092#iefix') format('embedded-opentype'),
5+
url('../font/manu.woff2?32698092') format('woff2'),
6+
url('../font/manu.woff?32698092') format('woff'),
7+
url('../font/manu.ttf?32698092') format('truetype'),
8+
url('../font/manu.svg?32698092#manu') format('svg');
99
font-weight: normal;
1010
font-style: normal;
1111
}
@@ -14,14 +14,14 @@
1414
/*
1515
@media screen and (-webkit-min-device-pixel-ratio:0) {
1616
@font-face {
17-
font-family: 'fontello';
18-
src: url('../font/fontello.svg?61121405#fontello') format('svg');
17+
font-family: 'manu';
18+
src: url('../font/manu.svg?32698092#manu') format('svg');
1919
}
2020
}
2121
*/
2222

2323
[class^="icon-"]:before, [class*=" icon-"]:before {
24-
font-family: "fontello";
24+
font-family: "manu";
2525
font-style: normal;
2626
font-weight: normal;
2727
speak: none;
@@ -88,9 +88,9 @@
8888
.icon-desilting:before { content: '\e81e'; } /* '' */
8989
.icon-canalrepair:before { content: '\e81f'; } /* '' */
9090
.icon-map-flood:before { content: '\e820'; } /* '' */
91+
.icon-menu:before { content: '\e821'; } /* '' */
9192
.icon-flood:before { content: '\e822'; } /* '' */
9293
.icon-spin4:before { content: '\e834'; } /* '' */
93-
.icon-menu:before { content: '\f0c9'; } /* '' */
9494
.icon-angle-double-right:before { content: '\f101'; } /* '' */
9595
.icon-apple:before { content: '\f179'; } /* '' */
9696
.icon-android:before { content: '\f17b'; } /* '' */

0 commit comments

Comments
 (0)