diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png new file mode 100644 index 0000000..bb227e8 Binary files /dev/null and b/public/favicon-16x16.png differ diff --git a/public/index.html b/public/index.html index e6191b2..10745d7 100644 --- a/public/index.html +++ b/public/index.html @@ -1,6 +1,7 @@ + AccessFlanders @@ -9,7 +10,7 @@ homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/ --> - + - - React App diff --git a/src/components/Header.jsx b/src/components/Header.jsx index 33f5ad6..2ea66e5 100644 --- a/src/components/Header.jsx +++ b/src/components/Header.jsx @@ -122,7 +122,7 @@ export default class Header extends Component { OASIS -

OASIS

+

Access Flanders

@@ -133,6 +133,12 @@ export default class Header extends Component { close
+ + + github icon + + +
diff --git a/src/components/SidebarBuildingDetail.jsx b/src/components/SidebarBuildingDetail.jsx index fb3483d..350e9c9 100644 --- a/src/components/SidebarBuildingDetail.jsx +++ b/src/components/SidebarBuildingDetail.jsx @@ -61,7 +61,7 @@ export default class SidebarBuildingDetail extends Component {

{this.Building.title}

- +

{this.Building.description}

diff --git a/src/components/SidebarSearchResult.jsx b/src/components/SidebarSearchResult.jsx index c50a5c1..ba6c827 100644 --- a/src/components/SidebarSearchResult.jsx +++ b/src/components/SidebarSearchResult.jsx @@ -1,5 +1,5 @@ import React from 'react' -import {Col, Row} from "react-materialize"; +import {Card, Col, Row} from "react-materialize"; import {inject, observer} from 'mobx-react'; @@ -36,6 +36,7 @@ export default class SidebarSearchResult extends React.Component { render() { return ( +
@@ -52,6 +53,7 @@ export default class SidebarSearchResult extends React.Component { Meer details...
+
) } } \ No newline at end of file diff --git a/src/css/App.scss b/src/css/App.scss index 181d65d..bddf7e4 100644 --- a/src/css/App.scss +++ b/src/css/App.scss @@ -1,5 +1,5 @@ -$colorPrimary: #2ed3c8; +$colorPrimary: #27b59f; $colorPrimaryLight: lighten($colorPrimary,20%); $colorPrimaryDark: #026863; diff --git a/src/css/Header.scss b/src/css/Header.scss index 813c4f1..42c8923 100644 --- a/src/css/Header.scss +++ b/src/css/Header.scss @@ -27,6 +27,13 @@ $filterBarBackground: white; float: left; } + .social__media__icon{ + height: 32px; + float: right; + position: absolute; + right: 0px; + } + .brand__name { height: 100%; display: inline-block; @@ -36,6 +43,11 @@ $filterBarBackground: white; float: left; } + ::placeholder { + color: $colorPrimaryDark; + opacity: 1; /* Firefox */ + } + div.search { display: block; height: $headerBarPrimaryHeight - 2* $headerBarPadding; @@ -49,6 +61,7 @@ $filterBarBackground: white; } } + .header .search__filters { height: $headerBarFilterHeight; margin-bottom: 0; @@ -89,7 +102,7 @@ $filterBarBackground: white; margin-top: ($headerBarFilterHeight - 3 * $headerBarPadding - 18px)/2; padding: $headerBarPadding / 2; line-height: 18px; - font-size: 14px; + font-size: 20px; border-radius: 4px; color: $filterBarForeground; border: 1px solid $filterBarForeground; diff --git a/src/css/Map.scss b/src/css/Map.scss index e640508..ffcf504 100644 --- a/src/css/Map.scss +++ b/src/css/Map.scss @@ -1,37 +1,41 @@ div.leaflet-container { - height: 100%; + height: 100%; } - -.leaflet-marker-pane>img{ - margin:-1px; +.leaflet-marker-pane > img { + margin: -1px; } .map__marker__image { - position: relative; - height:38px; - width:38px; - top: -32px; - left: -13px; + position: relative; + height: 42px; + width: 30px; + top: -34px; + left: -13px; } -.map__marker__text{ - position: relative; - width:80px; - overflow: hidden; - white-space: nowrap; - top: -100px; - left: -35px; - background-color: #ffffff; - opacity: 0.9; - display: none; - text-align: center; +.map__marker__text { + position: relative; + width: 80px; + overflow: hidden; + white-space: nowrap; + top: -100px; + left: -35px; + background-color: $colorPrimary; + border: 1px solid $colorPrimaryDark; + opacity: 0.9; + display: none; + text-align: center; } -.map__marker__image:hover + .map__marker__text{ - display: block; +.map__marker__image:hover + .map__marker__text { + display: block; } .map__marker:hover > .map__marker__text { - display: block; + display: block; } + +leaflet-top leaflet-left { + float: right !important; +} \ No newline at end of file diff --git a/src/css/Sidebar.scss b/src/css/Sidebar.scss index bbb4ca0..153d2b4 100644 --- a/src/css/Sidebar.scss +++ b/src/css/Sidebar.scss @@ -3,9 +3,10 @@ div.sidebar { margin: 0; float: left; background-color: #fff; + overflow: scroll; } div.sidebar__card { - overflow: scroll; + height: 100%; } \ No newline at end of file diff --git a/src/images/github_otocat.png b/src/images/github_otocat.png new file mode 100644 index 0000000..91057da Binary files /dev/null and b/src/images/github_otocat.png differ diff --git a/src/images/map-marker-icon.png b/src/images/map-marker-icon.png index 994c0e1..fd41d11 100644 Binary files a/src/images/map-marker-icon.png and b/src/images/map-marker-icon.png differ