Skip to content

Commit

Permalink
Merge commit '12756baa9f3e9996941d3d6d62ff757417f63436' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
guillelopezgines committed Jun 5, 2021
2 parents 6ef768c + 12756ba commit e30c51e
Show file tree
Hide file tree
Showing 69 changed files with 191 additions and 161 deletions.
Binary file added images/7-maig/30-passos.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/9-graons.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/aigues.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/angels-garriga.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/arenal-de-llevant.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/auditori.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/auro.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/badalona-port-badalona.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/balmanya.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/casas.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/casassas-sabadell.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/catalonia.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/claret.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/concepcio.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/diputacio.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/dovella.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/encants.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/entença.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/ferran-sunyer.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/fluvia.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/font-den-fargas.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/fort-pienc.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/fructuos.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/gaia.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-maig/itaca-i-anglesola.jpg
Binary file added images/7-maig/jesuites-casp.jpg
Binary file added images/7-maig/joan-miro.jpg
Binary file added images/7-maig/jose-maria-jujol.jpg
Binary file added images/7-maig/lesseps.jpg
Binary file added images/7-maig/llacuna-poblenou.jpg
Binary file added images/7-maig/llorers-arago.jpg
Binary file added images/7-maig/llorers-valencia.jpg
Binary file added images/7-maig/mallorca.jpg
Binary file added images/7-maig/mare-de-deu-dels-angels.jpg
Binary file added images/7-maig/menendez-pelayo.jpg
Binary file added images/7-maig/miralletes.jpg
Binary file added images/7-maig/octavio-paz.jpg
Binary file added images/7-maig/patronat-domenech.jpg
Binary file added images/7-maig/pere-iv-i-quatre-cantons.jpg
Binary file added images/7-maig/pere-vila.jpg
Binary file added images/7-maig/pia-balmes.jpg
Binary file added images/7-maig/pit-roig.jpg
Binary file added images/7-maig/progres-badalona.jpg
Binary file added images/7-maig/rambleta-del-clot.jpg
Binary file added images/7-maig/ramon-llull.jpg
Binary file added images/7-maig/rebellio-extincio.jpg
Binary file added images/7-maig/revolta-escolar.jpg
Binary file added images/7-maig/revuelta-escolar.jpg
Binary file added images/7-maig/rius-i-taulet.jpg
Binary file added images/7-maig/sagrada-familia.jpg
Binary file added images/7-maig/samuntada-sabadell.jpg
Binary file added images/7-maig/santa-anna.jpg
Binary file added images/7-maig/tabor.jpg
Binary file added images/7-maig/teixidores.jpg
Binary file added images/7-maig/torrent-den-melis.jpg
Binary file added images/7-maig/torrent.jpg
Binary file added images/7-maig/univers.jpg
Binary file added images/7-maig/ventos-mir-badalona.jpg
Binary file added images/7-maig/voramar.jpg
Binary file added images/7-maig/xirinacs.jpg
Binary file modified images/base-es.png
Binary file modified images/mapa-barcelona.jpg
Binary file modified images/mapa-madrid.jpg
Binary file added images/revolta-escolar.jpg
Binary file modified images/revuelta-escolar.jpg
256 changes: 163 additions & 93 deletions index.html

Large diffs are not rendered by default.

26 changes: 19 additions & 7 deletions mapa.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
'properties': {
'color': color,
'title': "Miguel de Unamuno",
'anchor': 'bottom'
'anchor': 'left'
},
'geometry': {
'type': 'Point',
Expand All @@ -59,7 +59,7 @@
'properties': {
'color': color,
'title': "Fernando el Católico",
'anchor': 'top'
'anchor': 'right'
},
'geometry': {
'type': 'Point',
Expand All @@ -71,7 +71,7 @@
'properties': {
'color': color,
'title': "Asunción Rincón",
'anchor': 'bottom'
'anchor': 'right'
},
'geometry': {
'type': 'Point',
Expand All @@ -83,7 +83,7 @@
'properties': {
'color': color,
'title': "Menéndez Pelayo",
'anchor': 'bottom'
'anchor': 'right'
},
'geometry': {
'type': 'Point',
Expand All @@ -95,7 +95,7 @@
'properties': {
'color': color,
'title': "Rufino Blanco",
'anchor': 'bottom'
'anchor': 'left'
},
'geometry': {
'type': 'Point',
Expand All @@ -107,7 +107,7 @@
'properties': {
'color': color,
'title': "Lope de Vega",
'anchor': 'bottom'
'anchor': 'right'
},
'geometry': {
'type': 'Point',
Expand All @@ -119,7 +119,7 @@
'properties': {
'color': color,
'title': "Arcangel",
'anchor': 'bottom'
'anchor': 'left'
},
'geometry': {
'type': 'Point',
Expand All @@ -137,6 +137,18 @@
'type': 'Point',
'coordinates': [-3.6310137, 40.4712337]
}
},
{
'type': 'Feature',
'properties': {
'color': color,
'title': "Palacio Valdes",
'anchor': 'right'
},
'geometry': {
'type': 'Point',
'coordinates': [-3.6941461, 40.4108127]
}
}
];
map
Expand Down
70 changes: 9 additions & 61 deletions poster.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,75 +37,23 @@ <h1>DESCÁRGATE EL CARTEL:</h1>
</div>
<div class="row">
<label>Subtítulo:</label>
<input type="text" data-target=".poster .subtitle" placeholder="cortamos la calle Perú">
<input type="text" data-target=".poster .subtitle" placeholder="cortamos la calle Perú" value="cortamos la calle Perú">
</div>
<div class="row">
<label>Dia:</label>
<div class="shopify-select">
<select data-target=".poster .date">
<option>Viernes 12 de marzo</option>
<option>Jueves 25 de marzo</option>
<option>Viernes 26 de marzo</option>
</select>
<svg class="shopify-select-icon" viewBox="0 0 24 24"><path d="M21 5.176l-9.086 9.353L3 5.176.686 7.647 12 19.382 23.314 7.647 21 5.176z"></path></svg>
</div>
<input type="text" data-target=".poster .date" placeholder="Viernes 7 de mayo" value="Viernes 7 de mayo">
</div>
<div class="row">
<label>Hora:</label>
<div class="shopify-select">
<select data-target=".poster .time">
<option>10:00</option>
<option>10:15</option>
<option>10:30</option>
<option>10:45</option>
<option>11:00</option>
<option>11:15</option>
<option>11:30</option>
<option>11:45</option>
<option>12:00</option>
<option>12:15</option>
<option>12:30</option>
<option>12:45</option>
<option>13:00</option>
<option>13:15</option>
<option>13:30</option>
<option>13:45</option>
<option>14:00</option>
<option>14:15</option>
<option>14:30</option>
<option>14:45</option>
<option>15:00</option>
<option>15:15</option>
<option>15:30</option>
<option>15:45</option>
<option>16:00</option>
<option>16:15</option>
<option selected>16:30</option>
<option>16:45</option>
<option>17:00</option>
<option>16:00</option>
<option>16:15</option>
<option>16:30</option>
<option>16:45</option>
</select>
<svg class="shopify-select-icon" viewBox="0 0 24 24"><path d="M21 5.176l-9.086 9.353L3 5.176.686 7.647 12 19.382 23.314 7.647 21 5.176z"></path></svg>
</div>
<input type="text" data-target=".poster .time" placeholder="16:30 h" value="16:30 h">
</div>
<div class="row">
<label>Localitzación:</label>
<input type="text" data-target=".poster .location" maxlength="38" placeholder="Perú entre Diputación y Mayor">
<input type="text" data-target=".poster .location" placeholder="Perú entre Diputación y Mayor" value="Perú entre Diputación y Mayor">
</div>
<div class="row">
<label>Duración:</label>
<div class="shopify-select">
<select data-target=".poster .duration">
<option>30 minutos</option>
<option>45 minutos</option>
<option>1 hora</option>
<option>2 horas</option>
</select>
<svg class="shopify-select-icon" viewBox="0 0 24 24"><path d="M21 5.176l-9.086 9.353L3 5.176.686 7.647 12 19.382 23.314 7.647 21 5.176z"></path></svg>
</div>
<input type="text" data-target=".poster .duration" placeholder="Duración: 30 minutos" value="Duración: 30 minutos">
</div>
<div class="row">
<label>Logotipo entitades convocantes:</label>
Expand Down Expand Up @@ -136,13 +84,13 @@ <h1>DESCÁRGATE EL CARTEL:</h1>
<div class="right">
<div class="container">
<div class="poster">
<img class="background" src="/images/base-es.png?v=1">
<img class="background" src="/images/base-es.png?v=3">
<div class="text subtitle">cortamos la calle Perú</div>
<div class="text info">
<b><span class="date">Viernes 12 de marzo</span></b><br>
<b><span class="time">16:30</span> h</b><br>
<b><span class="date">Viernes 7 de mayo</span></b><br>
<b><span class="time">16:30 h</span></b><br>
<span class="location">Perú entre Diputación y Mayor</span><br>
Duración: <span class="duration">30 minutos</span>
<span class="duration">Duración: 30 minutos</span>
</div>
<div class="logos">
<div class="section summons">
Expand Down

0 comments on commit e30c51e

Please sign in to comment.