mirror of
https://github.com/medialab-prado/datamad2017.git
synced 2024-12-26 04:31:22 +01:00
Fixed ribbon url in session-modals, added webmaster tools verification, view-on-map bug fix, sold out tickets label, fixed schema.org speaker's image url
This commit is contained in:
parent
6c0eda3d3e
commit
488f83f50d
11 changed files with 40 additions and 5 deletions
|
@ -13,6 +13,7 @@ url: "http://gdg-x.github.io"
|
||||||
permalink: "/blog/:title"
|
permalink: "/blog/:title"
|
||||||
googleAnalyticsTrackingId: "UA-43643469-5"
|
googleAnalyticsTrackingId: "UA-43643469-5"
|
||||||
googleAnalyticsSiteUrl: "gdg-x.github.io"
|
googleAnalyticsSiteUrl: "gdg-x.github.io"
|
||||||
|
siteVerification: "b9imDOrFawXaBXCC4r3uJDdswSYcalD-wWpMYhFq-no"
|
||||||
|
|
||||||
# Organizer Info
|
# Organizer Info
|
||||||
organizerName: "GDG Lviv"
|
organizerName: "GDG Lviv"
|
||||||
|
@ -163,6 +164,8 @@ ticketsOffers:
|
||||||
ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"]
|
ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"]
|
||||||
validFrom: "2014-08-20T10:00"
|
validFrom: "2014-08-20T10:00"
|
||||||
validThrough: "2014-10-23T23:59"
|
validThrough: "2014-10-23T23:59"
|
||||||
|
soldOut: true
|
||||||
|
soldOutText: "Sold Out"
|
||||||
|
|
||||||
# Footer
|
# Footer
|
||||||
socialLinks:
|
socialLinks:
|
||||||
|
|
|
@ -43,6 +43,7 @@
|
||||||
<a id="find-flight" href="https://google.com/flights" class="pull-right hidden" target="_blank">{{ site.findWayFindFlight }}</a>
|
<a id="find-flight" href="https://google.com/flights" class="pull-right hidden" target="_blank">{{ site.findWayFindFlight }}</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
<div class="clearfix"></div>
|
||||||
<a href="http://maps.google.com/maps?ll={{ site.eventPlaceCoordinates | replace:' ',''}}&z=17&t=m&hl=en-US&gl=US&mapclient=embed&q={{ site.eventStreetAddress | replace:' ','%20' | replace:',','%2C'}}%2C%20{{ site.eventAddressLocality | replace:' ','%20' | replace:',','%2C'}}" class="view-on-map" target="_blank">{{ site.viewOnMap }}</a>
|
<a href="http://maps.google.com/maps?ll={{ site.eventPlaceCoordinates | replace:' ',''}}&z=17&t=m&hl=en-US&gl=US&mapclient=embed&q={{ site.eventStreetAddress | replace:' ','%20' | replace:',','%2C'}}%2C%20{{ site.eventAddressLocality | replace:' ','%20' | replace:',','%2C'}}" class="view-on-map" target="_blank">{{ site.viewOnMap }}</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
<meta name="author" content="Oleh Zasadnyy, GDG Lviv">
|
<meta name="author" content="Oleh Zasadnyy, GDG Lviv">
|
||||||
<meta name="description" content="{{ site.description }}">
|
<meta name="description" content="{{ site.description }}">
|
||||||
<meta name="keywords" content="{{ site.metaKeywords }}">
|
<meta name="keywords" content="{{ site.metaKeywords }}">
|
||||||
|
<meta name="google-site-verification" content="{{ site.siteVerification }}" />
|
||||||
<link rel="canonical" href="{{ site.url }}">
|
<link rel="canonical" href="{{ site.url }}">
|
||||||
<!-- Social: Twitter -->
|
<!-- Social: Twitter -->
|
||||||
<meta name="twitter:card" content="summary">
|
<meta name="twitter:card" content="summary">
|
||||||
|
|
|
@ -85,7 +85,7 @@
|
||||||
{
|
{
|
||||||
"@type" : "Person",
|
"@type" : "Person",
|
||||||
"name" : "{{ speaker.name }} {{ speaker.surname }}",
|
"name" : "{{ speaker.name }} {{ speaker.surname }}",
|
||||||
"image" : "{{ speaker.thumbnailUrl | prepend: site.thumbnailsFolder | prepend: site.baseurl | prepend: site.url }}",
|
"image" : "{{ site.url | append: site.baseurl | append: '/img/people/' | append: speaker.thumbnailUrl }}",
|
||||||
"jobTitle" : "{{ speaker.title }}",
|
"jobTitle" : "{{ speaker.title }}",
|
||||||
"worksFor" : {
|
"worksFor" : {
|
||||||
"@type" : "Organization",
|
"@type" : "Organization",
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
{% if speaker.ribbon != null %}
|
{% if speaker.ribbon != null %}
|
||||||
<div class="modal-ribbon-wrapper">
|
<div class="modal-ribbon-wrapper">
|
||||||
{% for ribbon in speaker.ribbon %}
|
{% for ribbon in speaker.ribbon %}
|
||||||
<a class="modal-ribbon" href="ribbon["url"]" target="_blank">{{ ribbon["title"] }}</a>
|
<a class="modal-ribbon" href="{{ ribbon["url"] }}" target="_blank">{{ ribbon["title"] }}</a>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
@ -22,7 +22,9 @@
|
||||||
<p class="price">{{ ticketsOffer.price }} {{ ticketsOffer.priceCurrency }}</p>
|
<p class="price">{{ ticketsOffer.price }} {{ ticketsOffer.priceCurrency }}</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-3 col-xs-12">
|
<div class="col-sm-3 col-xs-12">
|
||||||
{% if ticketsOffer.disabled != true %}
|
{% if ticketsOffer.soldOut == true %}
|
||||||
|
<p class="ticket-sold-out">{{ ticketsOffer.soldOutText }}</p>
|
||||||
|
{% elsif ticketsOffer.disabled != true %}
|
||||||
<span class="bordered dark-border button">
|
<span class="bordered dark-border button">
|
||||||
<a href="{{ ticketsOffer.buyButtonLink }}" class="waves-effect waves-button" target="_blank">{{ ticketsOffer.buyButtonText }}</a>
|
<a href="{{ ticketsOffer.buyButtonLink }}" class="waves-effect waves-button" target="_blank">{{ ticketsOffer.buyButtonText }}</a>
|
||||||
</span>
|
</span>
|
||||||
|
|
|
@ -18,7 +18,14 @@
|
||||||
<li>{{ listItem }}</li>
|
<li>{{ listItem }}</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
|
{% if ticketsOffer.soldOut == true %}
|
||||||
|
<span class="button disabled">{{ ticketsOffer.soldOutText }}</span>
|
||||||
|
{% elsif ticketsOffer.disabled != true %}
|
||||||
<a class="button" href="{{ ticketsOffer.buyButtonLink }}" target="_blank">{{ ticketsOffer.buyButtonText }}</a>
|
<a class="button" href="{{ ticketsOffer.buyButtonLink }}" target="_blank">{{ ticketsOffer.buyButtonText }}</a>
|
||||||
|
{% else %}
|
||||||
|
{% assign ticketValidFrom = ticketsOffer.validFrom | split: "T" %}
|
||||||
|
<span class="button disabled fallback">Ticket sales will begin on {{ ticketValidFrom[0] | date: "%-d %B %Y"}} {{ ticketValidFrom[1] }}</span>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
|
@ -46,6 +46,10 @@ $border-color: rgba(51, 51, 51, .6);
|
||||||
padding-top: 2px;
|
padding-top: 2px;
|
||||||
line-height: 1.2;;
|
line-height: 1.2;;
|
||||||
}
|
}
|
||||||
|
.ticket-sold-out {
|
||||||
|
font-size: 18px;
|
||||||
|
padding-top: 10px;
|
||||||
|
}
|
||||||
.tickets-info {
|
.tickets-info {
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,6 +60,11 @@ $button-background-color-hover: #4d4d4d;
|
||||||
@media (max-width: 767px) {
|
@media (max-width: 767px) {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
&.disabled {
|
||||||
|
&:hover {
|
||||||
|
background: $primary-color;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.title {
|
.title {
|
||||||
|
@ -83,7 +88,7 @@ $button-background-color-hover: #4d4d4d;
|
||||||
font-size: 32px;
|
font-size: 32px;
|
||||||
display: block;
|
display: block;
|
||||||
margin-top: 30px;
|
margin-top: 30px;
|
||||||
padding: 7px 0 10px;
|
padding: 7px 25px 10px;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
background: $button-background-color;
|
background: $button-background-color;
|
||||||
font-weight: $light;
|
font-weight: $light;
|
||||||
|
@ -91,6 +96,15 @@ $button-background-color-hover: #4d4d4d;
|
||||||
&:hover {
|
&:hover {
|
||||||
background: $button-background-color-hover;
|
background: $button-background-color-hover;
|
||||||
}
|
}
|
||||||
|
&.disabled {
|
||||||
|
&:hover {
|
||||||
|
background: $button-background-color;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
&.fallback {
|
||||||
|
font-size: 18px;
|
||||||
|
line-height: 1.4;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.pricing-ribbon {
|
.pricing-ribbon {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
.twitter-feed {
|
.twitter-feed {
|
||||||
|
h3 {
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
.icon {
|
.icon {
|
||||||
width: 64px;
|
width: 64px;
|
||||||
height: 64px;
|
height: 64px;
|
||||||
|
|
2
css/main.min.css
vendored
2
css/main.min.css
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue