Skip to content

Commit

Permalink
Merge pull request #12 from osm-without-borders/QMAPS-248
Browse files Browse the repository at this point in the history 
Qmaps 248
  • Loading branch information
@amatissart
amatissart authored May 28, 2018
2 parents 344a49c + aff48ab commit 4e2da49
Show file tree
Hide file tree
Showing 27 changed files with 3,374 additions and 171 deletions.
Binary file modified explorer/fonts/icomoon.eot
View file
Binary file not shown.
31 changes: 17 additions & 14 deletions explorer/fonts/icomoon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified explorer/fonts/icomoon.ttf
View file
Binary file not shown.
Binary file modified explorer/fonts/icomoon.woff
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions explorer/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!doctype html>
<head>
<meta charset="UTF-8">
<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css' rel='stylesheet'/>
<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.45.0/mapbox-gl.css' rel='stylesheet'/>
<link href='src/css/app.css' rel='stylesheet'/>
<link href='./style.css' rel='stylesheet'/>
<link href='src/css/font.css' rel='stylesheet'/>
<link href='src/css/z_index.css' rel='stylesheet'/>
</head>

<div id="map-container"></div>
<div id="root"></div>
<script src="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.js"></script>
<script src="https://api.tiles.mapbox.com/mapbox-gl-js/v0.45.0/mapbox-gl.js"></script>
<script src="./dist/main.js"></script>
4 changes: 0 additions & 4 deletions explorer/nginx.vh.default.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ server {
#charset koi8-r;
#access_log /var/log/nginx/host.access.log main;

location = / {
return 302 $scheme://$http_host/index.html#2/17/30;
}

location / {
root /usr/share/nginx/html;
index index.html index.htm;
Expand Down
14 changes: 7 additions & 7 deletions explorer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"main": "index.js",
"scripts": {
"test": "npm test",
"start" : "http-server -c-1 ./",
"build" : "webpack",
"watch" : "webpack -w"
"start": "http-server -c-1 ./",
"build": "webpack",
"watch": "webpack -w"
},
"repository": {
"type": "git",
Expand All @@ -19,14 +19,14 @@
"url": "https://github.com/osm-without-borders/cosmogony_explorer/issues"
},
"homepage": "https://github.com/osm-without-borders/cosmogony_explorer#readme",
"dependencies": {
"devDependencies": {
"prettier": "1.12.0",
"uglifyjs-webpack-plugin": "^1.1.8",
"vue": "^2.5.13",
"vue-loader": "^14.1.1",
"vue-router": "^3.0.1",
"vue-template-compiler": "^2.5.13",
"webpack": "^4.0.0-beta.0"
},
"devDependencies": {
"webpack": "^4.0.0-beta.0",
"webpack-cli": "^2.0.4"
}
}
214 changes: 205 additions & 9 deletions explorer/src/css/app.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

A, A:active, A:focus, BUTTON {
outline: none;
color: #1793d8;
}

LI {
Expand All @@ -19,6 +20,10 @@ LI {
height: 100vh;
}

#map-container .mapboxgl-popup {
top: -3px;
}

/* hierarchy */

.hierarchy {
Expand All @@ -39,18 +44,29 @@ LI {
}

.hierarchy__current__name {
padding: 20px 0 0 20px;
font-size: 30px;
padding: 90px 0 0 20px;
font-size: 26px;
font-weight: bold;
font-family: serif;
}

.hierarchy__current__zoom_button {
position: absolute;
bottom: 20px;
right: 20px;
display: block;
background: none;
color : #d0d7e7;
font-size: 30px;
cursor: pointer;
}

.hierarchy__curent__name__level {
color: #484b53;
}

.hierarchy__current__type {
padding: 0 0 140px 20px;
padding: 0 0 20px 20px;
letter-spacing: 1px;
font-size: 14px;
color: #dddce1
Expand Down Expand Up @@ -79,7 +95,6 @@ LI {
text-decoration: underline;
}


.hierarchy__category_title {
padding: 20px 0 0 20px;
font-weight: normal;
Expand All @@ -102,7 +117,7 @@ LI {

.layer_selector {
position: absolute;
top: 0;
top: 80px;
right: 0;
}

Expand All @@ -116,6 +131,14 @@ LI {
transition: background-color .2s;
}

.layer_selector__action.layer_selector__action--active.disabled {
color: #841919!important;
}

.layer_selector__action.disabled {
color: #a2a2a2
}

.layer_selector__action:hover {
background-color: #7996ab;
}
Expand Down Expand Up @@ -145,9 +168,8 @@ LI {
text-decoration: underline;
}



/* list & sub-list */

.child {
list-style: none;
margin-left: 10px;
Expand All @@ -165,7 +187,6 @@ LI {
color: #4b6278;
}


.child__toggle--disabled {
color: #bdc4cc;
cursor:default;
Expand Down Expand Up @@ -240,4 +261,179 @@ LI {
.modal__admin_level {
font-size: 14px;
color: #31404e;
}
}

/* top bar */

.top_bar {
display: flex;
position: absolute;
top:0;
width: 100%;
height: 80px;
background: #fff;
}

.top_bar__menu {
display: flex;
justify-content: space-between;
width: 600px;
margin-left: 100px;
}

.top_bar__title {
color: #21303e;
padding: 18px 0 0 20px;
}

.top_bar__menu_item {
font-weight: bold;
font-size: 13px;
color: #4b6278;
padding: 32px 5px 0;
}

.top_bar__menu_item A {
color: #4b6278;
text-decoration: none;
}

.top_bar__menu_item--active {
color: #6b8ca6;
border-bottom: 2px solid #6b8ca6;
}

.top_bar__menu_item:hover {
color: #353b48;
}


#volumetric-dashboard {
border: none;
width: 80vw;
margin:50px 10vw 50px;
border-collapse: collapse;
}

TD {
text-align: center;
}

#volumetric-dashboard td, #volumetric-dashboard th {
border: none;
padding: 6px 10px;
}

#volumetric-dashboard tr th {
font-size: 18px;
height: 40px;
font-weight: normal;
background: #ffffff;
color: #212427;
}

.legend__container {
padding: 10px;
border: 1px solid #dee0e2;
}

#volumetric-dashboard tr:nth-child(odd), #volumetric-dashboard tr {
transition: background-color .2s;
}

tr {
background-color: #e0ebf5;
}

#volumetric-dashboard tr:nth-child(odd), tr:nth-child(odd) {
background-color: #e9eff9;
}


#volumetric-dashboard tr:hover {
filter: brightness(0.9);
}


#volumetric-dashboard .ko_column, #volumetric-dashboard .ko_column:hover {
background-color: #f1c5d0;
}

#volumetric-dashboard tr:nth-child(odd).ko_column, #volumetric-dashboard tr:nth-child(odd).ko_column:hover, .ko_column {
background-color: #f7ccd7;
}

.volumetric_dashboard__table__head {
border-bottom: 2px #e4e6e8 solid;
}

.status_detail, .result__expected {
font-size: 12px;
color: #2d2f36;
}

.result__name, .name {
text-align: left;
}

.result__monitor {
width: 300px;
}

.article__container {
margin-top: 120px;
display: flex;
justify-content: flex-start;
margin-left: 10vw;
width: 80vw;
}

.article {
width: 500px;
font-size: 14px;
color: #464850;
}

.article--first {
margin-right: 50px;
}

.legend__table {
border-collapse: collapse;
}

.legend__table td {
text-align: left;
padding: 2px 4px;
}

.legend__description {
color: #444648;
}

.about__content {
width: 800px;
margin: 120px auto;
}

.about__emphasis {
padding: 2px 4px;
background-color: #b8e3f5;
}

.about__gif {
width: 800px;
}

.about__description {
font-size: 14px;
margin: 15px 0;
line-height: 20px;
color: #232527;
}

.about__gif__alt {
color: #454749;
margin: 30px 0 10px;
font-size: 12px;
}
Loading

0 comments on commit 4e2da49

Please sign in to comment.