diff --git a/proj/map/asset/css/font.css b/proj/map/asset/css/font.css index 4482ee6..56b4c92 100644 --- a/proj/map/asset/css/font.css +++ b/proj/map/asset/css/font.css @@ -22,6 +22,20 @@ font-weight: 400; } +@font-face { + font-family: Inter; + src: url("../fonts/inter/Inter-LightItalic.woff"); + font-style: italic; + font-weight: 200; +} + +@font-face { + font-family: Inter; + src: url("../fonts/inter/Inter-Italic.woff"); + font-style: italic; + font-weight: 400; +} + @font-face { font-family: Inter; src: url("../fonts/inter/Inter-SemiBold.woff"); @@ -30,4 +44,4 @@ html { font-family: Inter; -} \ No newline at end of file +} diff --git a/proj/map/asset/css/style.css b/proj/map/asset/css/style.css index da2581b..e9538fa 100644 --- a/proj/map/asset/css/style.css +++ b/proj/map/asset/css/style.css @@ -265,7 +265,7 @@ div.timetable p { } section.restomenu { - margin-top: 50px; + /*! margin-top: 50px; */ padding: 10px; height: 100%; overflow-y: scroll; @@ -273,11 +273,37 @@ section.restomenu { scrollbar-width: none; /* Firefox */ } -section.restomenu div.dish h3 { - margin-bottom: 10px; - margin-top: 10px; +section.restomenu section.top { + margin-top: 20px; + margin-bottom: 20px; + text-align: center; } +section.restomenu section.top p.drinks { + font-style: italic; + font-size: 1rem; +} + +section.restomenu section.top p{ + margin-bottom: 0px; + margin-top: 5px; +} + +section.restomenu div.dish h3 { + margin-bottom: 0px; + margin-top: 30px; +} + +section.restomenu div.dish p { + margin-top: 3px; + font-style: italic; +} + +section.restomenu div.dish p { + line-height: 1rem; +} + + ::-webkit-scrollbar { display: none; } \ No newline at end of file diff --git a/proj/map/asset/js/.main.js.swp b/proj/map/asset/js/.main.js.swp index a46d65f..80b3d06 100644 Binary files a/proj/map/asset/js/.main.js.swp and b/proj/map/asset/js/.main.js.swp differ diff --git a/proj/map/asset/js/db.js b/proj/map/asset/js/db.js index 50ab07f..b1b02ba 100644 --- a/proj/map/asset/js/db.js +++ b/proj/map/asset/js/db.js @@ -9,6 +9,11 @@ let ingredients = { en: "mozzarella", it: "mozzarella", }, + mozzarellaBufala: { + fr: "mozzarella de bufflonne", + en: "buffalo's mozzarella", + it: "mozzarella di bufala", + }, saucissecalabraisepiquante : { fr: "saucisse calabraise piquante", en: "spicy sausage", @@ -23,7 +28,137 @@ let ingredients = { fr: "champignons", en: "mushrooms", it: "funghi", - } + }, + provoletta : { + fr : "provoletta", + en : "provoletta", + it : "provoletta", + }, + salsiccia :{ + fr : "chaire à saucisse", + en : "sausage", + it : "salsiccia", + }, + chimichurri : { + fr : "chimichurri", + en : "chimichurri", + it : "chimichurri", + }, + gorgonzola : { + fr : "gorgonzola", + en : "gorgonzola", + it : "gorgonzola", + }, + parma : { + fr : "parma", + en : "jambon de Parme", + it : "Parma ham", + }, + noix : { + fr : "noix", + en : "nuts", + it : "noci", + }, + caprino : { + fr : "fromage de chèvre", + en : "goat cheese", + it : "caprino", + }, + honey : { + fr : "miel", + en : "honey", + it : "miele", + }, + bresaola : { + fr : "bresaola", + en : "bresaola", + it : "bresaola", + }, + roquette : { + fr : "roquette", + en : "aragula salad", + it : "rucola", + }, + crudaioladipomodoro : { + fr : "tomates fraîches concassées", + en : "fresh tomatoes", + it : "crudaiola di pomodoro", + }, + burrata : { + fr : "burrata", + en : "burrata", + it : "burrata", + }, + basilic : { + fr : "basilic", + en : "basil", + it : "basilico", + }, + thon : { + fr : "thon", + en : "tuna", + it : "tono", + }, + cipollaTropea : { + fr : "oignons rouges de Tropea", + en : "red onions from Tropea", + it : "cipolla rossa di Tropea", + }, + aubergines : { + fr : "aubergines", + en : "eggplants", + it : "melanzane", + }, + anchois : { + fr : "anchois", + en : "anchovies", + it : "acciughe", + }, + capres : { + fr : "câpres", + en : "capers", + it : "capperi", + }, + huileextravierge : { + fr : "huile extra vierge", + en : "extra olive oil", + it : "olio extra vergine", + }, + name : { + fr : "", + en : "", + it : "", + }, + name : { + fr : "", + en : "", + it : "", + }, + name : { + fr : "", + en : "", + it : "", + }, + name : { + fr : "", + en : "", + it : "", + }, + name : { + fr : "", + en : "", + it : "", + }, + name : { + fr : "", + en : "", + it : "", + }, + name : { + fr : "", + en : "", + it : "", + }, } let SanTelmo = { @@ -43,18 +178,65 @@ let SanTelmo = { tabs : { menu : { tabtype : "menu", - priceRange : "18-32€", + priceRange : "17-25€", dishes : { - divola : { - name : "Pizza Divola", + diavolo : { + name : "Pizza Diavolo", ing : [ ingredients.tomate, ingredients.mozzarella, ingredients.saucissecalabraisepiquante ] }, - reg : { - name : "Pizza Regina nanana", + d10s : { + name : "Pizza D10S", + ing : [ + ingredients.tomate, + ingredients.mozzarella, + ingredients.provoletta, + ingredients.salsiccia, + ingredients.chimichurri + ] + }, + navigli : { + name : "Pizza Navigli", + ing : [ + ingredients.tomate, + ingredients.mozzarella, + ingredients.gorgonzola, + ingredients.parma + ] + }, + brachet : { + name : "Pizza Brachet (bianca - blanche - white)", + ing : [ + ingredients.mozzarella, + ingredients.caprino, + ingredients.noix, + ingredients.honey + ] + }, + superibricchi : { + name : "Pizza Sù Per I Bricchi", + ing : [ + ingredients.tomate, + ingredients.mozzarella, + ingredients.caprino, + ingredients.bresaola, + ingredients.roquette + ] + }, + superibricchi : { + name : "Pizza Sù Per I Bricchi", + ing : [ + ingredients.tomate, + ingredients.mozzarella, + ingredients.thon, + ingredients.cipollaTropea + ] + }, + reine : { + name : "Pizza Cotto e Funghi / Reine", ing : [ ingredients.tomate, ingredients.mozzarella, @@ -62,24 +244,53 @@ let SanTelmo = { ingredients.champignons ] }, - regina : { - name : "Pizza Regina", + margherita : { + name : "Pizza Margherita", ing : [ ingredients.tomate, - ingredients.mozzarella, - ingredients.jambonblanc, - ingredients.champignons + ingredients.mozzarella ] }, - regina2 : { - name : "Pizza Regina due", + buffemel : { + name : "Pizza Bufala e Melanzane", + ing : [ + ingredients.tomate, + ingredients.mozzarellaBufala, + ingredients.aubergines + ] + }, + romana : { + name : "Pizza Romana", ing : [ ingredients.tomate, ingredients.mozzarella, - ingredients.jambonblanc, - ingredients.champignons + ingredients.anchois, + ingredients.capres, + ingredients.huileextravierge ] - } + }, + /* + pizza : { + name : "Pizza", + ing : [ + ingredients. , + ingredients. , + ingredients. , + ingredients. , + ingredients. , + ] + }, + pizza : { + name : "Pizza", + ing : [ + ingredients. , + ingredients. , + ingredients. , + ingredients. , + ingredients. , + ] + }, + */ } }, time : { diff --git a/proj/map/asset/js/main.js b/proj/map/asset/js/main.js index 0b66c68..02af7ff 100644 --- a/proj/map/asset/js/main.js +++ b/proj/map/asset/js/main.js @@ -1,14 +1,21 @@ Vue.component('Menu',{ template: `
+
+

{{ fourchette.fr }}

+

{{ fourchette.en }}

+

{{ fourchette.it }}

+

{{ this.obj.priceRange }}

+

{{ horsboissons.fr }}

+

{{ horsboissons.en }}

+

{{ horsboissons.it }}

+
+

{{ d.name }}

{{ l2s(ings2ls(d.ing,"fr"), "fr") }}

{{ l2s(ings2ls(d.ing,"en"), "en") }}

{{ l2s(ings2ls(d.ing,"it"), "it") }}

- - -
`, @@ -29,9 +36,9 @@ Vue.component('Menu',{ it : "Fascia di prezzo per persona:", }, horsboissons : { - fr : "hors boissons", - en : "excluding drinks", - it : "bevande escluse", + fr : "(hors boissons)", + en : "(excluding drinks)", + it : "(bevande escluse)", } } }, @@ -70,7 +77,16 @@ Vue.component('Time', { {{ days[i].fr }} {{ days[i].en }} {{ days[i].it }} - {{ d }} + {{ d }} + + {{ closed.fr }} + + + {{ closed.en }} + + + {{ closed.it }} +

`, @@ -81,9 +97,9 @@ Vue.component('Time', { return { message : "hello from time", closed : { - fr : "fermé", - fr : "closed", - it : "chiuso", + fr : "Fermé", + en : "Closed", + it : "Chiuso", }, days : { mon : { diff --git a/proj/map/asset/markers/markers.svg b/proj/map/asset/markers/markers.svg index d83870a..dd1b4e2 100644 --- a/proj/map/asset/markers/markers.svg +++ b/proj/map/asset/markers/markers.svg @@ -23,9 +23,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.20296809" - inkscape:cx="2214.5142" - inkscape:cy="-7879.0027" + inkscape:zoom="0.30106958" + inkscape:cx="5547.9727" + inkscape:cy="-8955.9688" inkscape:document-units="mm" inkscape:current-layer="g5160" inkscape:document-rotation="0" @@ -375,6 +375,41 @@ d="m 3370.0581,-2099.8304 h 228.3351 l -38.0558,247.3632 -57.0838,-10e-5 v 76.1117 l 57.0838,19.028 0,19.0279 H 3408.114 l 0,-19.0279 57.0837,-19.028 v -76.1117 l -57.0837,10e-5 z" id="path7887" sodipodi:nodetypes="ccccccccccccc" /> + + + + + + + +