Skip to content
This repository was archived by the owner on Nov 2, 2018. It is now read-only.

Commit 5cb984c

Browse files
committed
Merge pull request #112 from owncloud/maki-icons
Maki icons
2 parents 7ac5dae + f718a55 commit 5cb984c

File tree

232 files changed

+852
-425
lines changed

Some content is hidden

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

232 files changed

+852
-425
lines changed

controller/pagecontroller.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ public function index() {
5353
$csp->addAllowedImageDomain('https://api.tiles.mapbox.com');
5454
// inline images
5555
$csp->addAllowedScriptDomain('data:');
56+
$csp->addAllowedImageDomain('data:');
57+
//overpasslayer api
58+
$csp->addAllowedConnectDomain('http://overpass-api.de/api/interpreter?');
5659
$response->setContentSecurityPolicy($csp);
5760
}
5861
return $response;

css/style.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,14 @@ i {
107107
width: 16px;
108108
cursor: pointer;
109109
}
110+
111+
.maki-icon {
112+
background: #fff;
113+
border: 1px solid #666;
114+
border-radius: 10px;
115+
padding: 1px;
116+
}
117+
110118
#loadingContacts {
111119
padding-left: 45px;
112120
margin-top: -10px;

img/mapIcons/alcohol.png

-1015 Bytes
Binary file not shown.

img/mapIcons/antiques.png

-934 Bytes
Binary file not shown.

img/mapIcons/apartment.png

-967 Bytes
Binary file not shown.

img/mapIcons/art.png

-1.03 KB
Binary file not shown.

img/mapIcons/art_supplies.png

-1.03 KB
Binary file not shown.

img/mapIcons/artist.png

-1.03 KB
Binary file not shown.

img/mapIcons/arts_centre.png

-1.47 KB
Binary file not shown.

img/mapIcons/artwork.png

-1.47 KB
Binary file not shown.

0 commit comments

Comments
 (0)