diff --git a/.gitignore b/.gitignore index eabf65e..a785adf 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ npm-debug.log yarn-error.log testem.log /typings +/src/environments/environment.*.ts # e2e /e2e/*.js diff --git a/angular.json b/angular.json index fc27253..556d174 100644 --- a/angular.json +++ b/angular.json @@ -12,14 +12,18 @@ "builder": "@angular-devkit/build-angular:browser", "options": { "outputPath": "dist", - "deployUrl":"/wp-content/themes/chiasso-theme/", + "deployUrl":"/wp-content/themes/chiasso-theme/", "index": "src/index.html", "main": "src/main.ts", "tsConfig": "src/tsconfig.app.json", "polyfills": "src/polyfills.ts", "assets": [ "src/assets", - "src/favicon.ico" + "src/favicon.ico", + "src/index.php", + "src/functions.php", + "src/screenshot.png", + "src/style.css" ], "styles": [ "src/styles.css" diff --git a/src/app/app.component.css b/src/app/app.component.css index 92f022b..7f14711 100644 --- a/src/app/app.component.css +++ b/src/app/app.component.css @@ -4,17 +4,19 @@ map-box {margin:0;} div.title {position:absolute;z-index:10;} div.title {font-size:1em;text-align:left;padding:10px;position:absolute;bottom:0;left:0;width:30vw;background-color:rgba(0,0,0,0);color:#fff;} div.title h1 {font-family:"Open Sans";font-size:4em;width:30vw;} -div.title h1 span {background:#d52b1e;padding:0 10px;} +div.title h1 span {background:#0090C8;padding:0 10px;} div.title h2 span {background:#fff;padding:2px;color:#000;cursor:pointer;background-color:#333;padding:5px 15px;margin:0 5px;} div.title p span {line-height:1.4;background:#021011;} div.title h3 {position:absolute;max-width:50vw;} -div.title h3 span.tablet-term { background:#d52b1e;color:#fff; padding:2px 10px;} +div.title h3 span.tablet-term { background:#0090C8;color:#fff; padding:2px 10px;} div.title h3 span.tablet-term b {font-weight:bold;cursor:pointer;} div.title h3 span.tablet-term b:hover {transform:rotate(-45deg);opacity:0.6;} +div.logo-header {position:absolute;top:0;left:0;z-index:2;padding:10px;} +div.logo-header img { max-width:225px;width:} @media screen and (max-device-width: 720px) { - div.title {position:relative;width:100vw;padding:10px 0; background:#d52b1e;padding-bottom:30px;} + div.title {position:relative;width:100vw;padding:10px 0; background:#0090C8;padding-bottom:30px;} div.title h2 {display:inline-block;} div.title h2 span {float:left;width:100%;text-align:center;margin:auto;background:none;} div.title h2 span a {background:transparent;} diff --git a/src/app/app.component.html b/src/app/app.component.html index 12987c2..fd6bfd7 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,3 +1,4 @@ +

Filtered by : {{filter.name}} x

Ticino Soundmap

diff --git a/src/app/map-box/map-box.component.ts b/src/app/map-box/map-box.component.ts index c6bf660..d71db37 100644 --- a/src/app/map-box/map-box.component.ts +++ b/src/app/map-box/map-box.component.ts @@ -18,6 +18,7 @@ export class MapBoxComponent implements OnInit { map: mapboxgl.Map; // style = 'mapbox://styles/mapbox/satellite-streets-v9'; //style = 'mapbox://styles/lrullo/cjonkoeiu3hrk2rqstkofqku9'; + //style = 'mapbox://styles/lrullo/cjplquc7x0eil2qo95qhxtq80'; style = 'mapbox://styles/lrullo/cjplquc7x0eil2qo95qhxtq80'; //chiasso 45.8289397,8.9803456 public lat = 46.238752301105706; @@ -133,7 +134,7 @@ export class MapBoxComponent implements OnInit { 'text-transform':'lowercase', }, paint: { - // 'text-halo-color':"#d52b1e", + // 'text-halo-color':"#0090C8", // 'text-halo-width':20, 'text-halo-width': ["case", ["boolean", ["feature-state", "hover"], false], @@ -149,7 +150,7 @@ export class MapBoxComponent implements OnInit { 'text-halo-color':["case", ["boolean", ["feature-state", "hover"], false], "#000", - "#d52b1e" + "#0090C8" ] } }); diff --git a/src/app/pages/pages.component.css b/src/app/pages/pages.component.css index f020feb..268b7fa 100644 --- a/src/app/pages/pages.component.css +++ b/src/app/pages/pages.component.css @@ -1,5 +1,5 @@ -div.container {background-color:#d52b1e;} -div.page-container {min-height:100vh; background-color:#d52b1e;padding-top:15px;position:relative;clear:both;} +div.container {background-color:#0090C8;} +div.page-container {min-height:100vh; background-color:#0090C8;padding-top:15px;position:relative;clear:both;} div.page-container h1 {font-family:"Raleway"; font-size:2.5rem;font-weight:bold;color:#fff; padding:0;border:5px solid #fff;width:80%;text-align:center;margin:15px 15px;} div.page-container div.col-left { text-align:center; min-height:100vh; position:relative;float:left;width:45%;max-width:500px;min-width:320px;} @@ -21,8 +21,8 @@ footer div.info-footer {max-width:1000px;font-size:0.8rem;text-align:center;marg /* media query */ @media screen and (max-device-width: 720px) { div.page-container div.col-left {margin:auto; width:100%;width:100%; min-height:0;clear:both;min-width:0;} - div.page-container div.col-right {background-color:#d52b1e;margin:auto; width:100%;clear:both;min-width:0;} + div.page-container div.col-right {background-color:#0090C8;margin:auto; width:100%;clear:both;min-width:0;} div.page-container h1 {min-width:0;width:100%;height:80%;margin:auto;padding:0;text-align:center;} div.page-container {padding:0 20px;} - div.container-map-pages {background-color:#d52b1e;padding-top:0;} + div.container-map-pages {background-color:#0090C8;padding-top:0;} } diff --git a/src/app/text-info/text-info.component.css b/src/app/text-info/text-info.component.css index cbef390..58812ca 100644 --- a/src/app/text-info/text-info.component.css +++ b/src/app/text-info/text-info.component.css @@ -3,4 +3,4 @@ ul.tags li { cursor:pointer; transition:0.3s; } ul.categories li:hover, -ul.tags li:hover { color:#d52b1e; font-weight: bold; background:#fff;} +ul.tags li:hover { color:#0090C8; font-weight: bold; background:#fff;} diff --git a/src/assets/functions.php b/src/assets/functions.php new file mode 100644 index 0000000..d8703a6 --- /dev/null +++ b/src/assets/functions.php @@ -0,0 +1,8 @@ + + diff --git a/src/assets/index.php b/src/assets/index.php new file mode 100644 index 0000000..cac5a53 --- /dev/null +++ b/src/assets/index.php @@ -0,0 +1 @@ + diff --git a/src/assets/logo-SUPSI_nero.png b/src/assets/logo-SUPSI_nero.png new file mode 100644 index 0000000..51b0fff Binary files /dev/null and b/src/assets/logo-SUPSI_nero.png differ diff --git a/src/assets/screenshot.png b/src/assets/screenshot.png new file mode 100644 index 0000000..bce71b8 Binary files /dev/null and b/src/assets/screenshot.png differ diff --git a/src/assets/sound-marker.svg b/src/assets/sound-marker.svg index d1a2f0f..d708267 100644 --- a/src/assets/sound-marker.svg +++ b/src/assets/sound-marker.svg @@ -1,6 +1,4 @@ - - Svg Vector Icons : http://www.onlinewebfonts.com/icon image/svg+xml \ No newline at end of file + d="m 17.803388,1.8510121 c -27.0931969,3.4447841 4.183855,32.9059859 4.183855,32.9059859 0,0 22.90934,-36.35077 -4.183855,-32.9059859 z m 0.39933,3.1407308 A 8.2838955,8.2838955 0 0 1 27.4655,12.163908 8.2838955,8.2838955 0 0 1 20.292367,21.426814 8.2838955,8.2838955 0 0 1 11.029462,14.25368 8.2838955,8.2838955 0 0 1 18.202718,4.9917429 Z" + style="fill:#0090c8;fill-opacity:1;stroke:#000000;stroke-width:0.713239;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.140097" + inkscape:connector-curvature="0" /> diff --git a/src/assets/style.css b/src/assets/style.css new file mode 100644 index 0000000..237c8c4 --- /dev/null +++ b/src/assets/style.css @@ -0,0 +1,5 @@ +/* +Theme Name: Ticino Soundmap Theme +Author: Luca Rullo +Author URI: https://lrullo.audio-lab.org +*/ diff --git a/src/environments/environment.example.ts b/src/environments/environment.example.ts deleted file mode 100644 index a7c5cde..0000000 --- a/src/environments/environment.example.ts +++ /dev/null @@ -1,11 +0,0 @@ -// The file contents for the current environment will overwrite these during build. -// The build system defaults to the dev environment which uses `environment.ts`, but if you do -// `ng build --env=prod` then `environment.prod.ts` will be used instead. -// The list of which env maps to which file can be found in `.angular-cli.json`. - -export const environment = { - production: false, - mapbox: { - accessToken: 'pk.eyJ1IjoibHJ1bGxvIiwiYSI6ImNpaDUydjdoNTAwd3BzdGx5bGlhOTh6bXYifQ.tE8QgNbVSgwP8V5LnJWA3w' - } -}; diff --git a/src/favicon.ico b/src/favicon.ico index 8081c7c..9af9df6 100644 Binary files a/src/favicon.ico and b/src/favicon.ico differ diff --git a/src/functions.php b/src/functions.php new file mode 100644 index 0000000..d8703a6 --- /dev/null +++ b/src/functions.php @@ -0,0 +1,8 @@ + + diff --git a/src/index.html b/src/index.html index 1da15e8..2b3f466 100644 --- a/src/index.html +++ b/src/index.html @@ -5,13 +5,14 @@ Ticino Soundmap + + + - + diff --git a/src/index.php b/src/index.php new file mode 100644 index 0000000..cac5a53 --- /dev/null +++ b/src/index.php @@ -0,0 +1 @@ + diff --git a/src/screenshot.png b/src/screenshot.png new file mode 100644 index 0000000..bce71b8 Binary files /dev/null and b/src/screenshot.png differ diff --git a/src/style.css b/src/style.css new file mode 100644 index 0000000..237c8c4 --- /dev/null +++ b/src/style.css @@ -0,0 +1,5 @@ +/* +Theme Name: Ticino Soundmap Theme +Author: Luca Rullo +Author URI: https://lrullo.audio-lab.org +*/ diff --git a/src/styles.css b/src/styles.css index 9b7ddda..129d8c8 100644 --- a/src/styles.css +++ b/src/styles.css @@ -13,19 +13,19 @@ div.content h1 span {font-size:3em;padding:0;} div.title h2 span { background:#ccc; color:#fff; padding:0 20px;} div.title h3 {color:#000; } -div.content h1,h2,h3,h4,h5 {text-decoration:none; font-size:1em;color:#d52b1e;} +div.content h1,h2,h3,h4,h5 {text-decoration:none; font-size:1em;color:#0090C8;} div.content div.content-col > * {margin:0 20px;height:100%;display:block;} div.content div.col-right-30 > * {margin-bottom:20px;} div.content div.tags-container, div.content div.categories-container, div.content div.content-container {width:100%;clear:both;position:relative;padding:10px 0px;} -div.content div.content-container h2 {font-size:1em;color:#d52b1e;margin-left:5px;} +div.content div.content-container h2 {font-size:1em;color:#0090C8;margin-left:5px;} div.content-container img {max-width:100%;} div.content-container p code {background:#efefef;padding:1px;} div.content-container figcaption {background-color:#efefef;padding:10px;font-size:0.8em;} div.content ul {list-style:none;max-width:100%;clear:both;padding:0;height:100%;} div.content ul.categories li, -div.content ul.tags li {float:left;padding:5px;margin:2px;background-color:#d52b1e;color:#fff;} +div.content ul.tags li {float:left;padding:5px;margin:2px;background-color:#0090C8;color:#fff;} div.content div.audio-box audio {margin-top:10px;margin-bottom:10px;} div.close-button {cursor:pointer;position:absolute;right:0;top:0;z-index:100;padding:10px;} div close-button:hover {background:#eee;} @@ -34,20 +34,20 @@ div.content-metadata {top:20px;position:relative;} div.content div.audio-box ul li {padding:3px 0;font-size:0.8em;} /*filter */ -span.tablet-term { background:#d52b1e;color:#fff; padding:2px 10px;} +span.tablet-term { background:#0090C8;color:#fff; padding:2px 10px;} span.tablet-term b {font-weight:bold;cursor:pointer;} span.tablet-term b:hover {transform:rotate(-45deg);opacity:0.6;} /* pages */ -app-pages div.container-map-pages {padding-top:100vh;background-color:#d52b1e;} +app-pages div.container-map-pages {padding-top:100vh;background-color:#0090C8;} /* trick */ div.mapboxgl-ctrl-bottom-right, div.mapboxgl-ctrl-bottom-left { display:none;} @media screen and (max-device-width: 720px) { - body { background-color:#d52b1e} + body { background-color:#0090C8} div.col-right-30 {width:100%; border:0;} div.col-left-70 {width:100%;} div.title h3 {display:none;}