Skip to content

Commit

Permalink
Fixed ribbon url in session-modals, added webmaster tools verificatio…
Browse files Browse the repository at this point in the history
…n, view-on-map bug fix, sold out tickets label, fixed schema.org speaker's image url
  • Loading branch information
ozasadnyy committed Sep 29, 2014
1 parent 6c0eda3 commit 488f83f
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 5 deletions.
3 changes: 3 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ url: "http://gdg-x.github.io"
permalink: "/blog/:title"
googleAnalyticsTrackingId: "UA-43643469-5"
googleAnalyticsSiteUrl: "gdg-x.github.io"
siteVerification: "b9imDOrFawXaBXCC4r3uJDdswSYcalD-wWpMYhFq-no"

# Organizer Info
organizerName: "GDG Lviv"
Expand Down Expand Up @@ -163,6 +164,8 @@ ticketsOffers:
ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"]
validFrom: "2014-08-20T10:00"
validThrough: "2014-10-23T23:59"
soldOut: true
soldOutText: "Sold Out"

# Footer
socialLinks:
Expand Down
1 change: 1 addition & 0 deletions _includes/find-way.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ <h3 class="animated hiding" data-animation="fadeInUp" data-delay="0">{{ site.fin
<a id="find-flight" href="https://google.com/flights" class="pull-right hidden" target="_blank">{{ site.findWayFindFlight }}</a>
</li>
</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>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<meta name="author" content="Oleh Zasadnyy, GDG Lviv">
<meta name="description" content="{{ site.description }}">
<meta name="keywords" content="{{ site.metaKeywords }}">
<meta name="google-site-verification" content="{{ site.siteVerification }}" />
<link rel="canonical" href="{{ site.url }}">
<!-- Social: Twitter -->
<meta name="twitter:card" content="summary">
Expand Down
2 changes: 1 addition & 1 deletion _includes/schema-event.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
{
"@type" : "Person",
"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 }}",
"worksFor" : {
"@type" : "Organization",
Expand Down
2 changes: 1 addition & 1 deletion _includes/sessions-modals.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ <h4>{{ session.title }}</h4>
{% if speaker.ribbon != null %}
<div class="modal-ribbon-wrapper">
{% 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 %}
</div>
{% endif %}
Expand Down
4 changes: 3 additions & 1 deletion _includes/tickets-2.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ <h3>{{ site.ticketsTitle }}</h3>
<p class="price">{{ ticketsOffer.price }} {{ ticketsOffer.priceCurrency }}</p>
</div>
<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">
<a href="{{ ticketsOffer.buyButtonLink }}" class="waves-effect waves-button" target="_blank">{{ ticketsOffer.buyButtonText }}</a>
</span>
Expand Down
7 changes: 7 additions & 0 deletions _includes/tickets.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,14 @@ <h3>{{ site.ticketsTitle }}</h3>
<li>{{ listItem }}</li>
{% endfor %}
</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>
{% 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>
{% endfor %}
Expand Down
4 changes: 4 additions & 0 deletions _sass/partials/_tickets-2.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ $border-color: rgba(51, 51, 51, .6);
padding-top: 2px;
line-height: 1.2;;
}
.ticket-sold-out {
font-size: 18px;
padding-top: 10px;
}
.tickets-info {
font-size: 16px;
}
Expand Down
16 changes: 15 additions & 1 deletion _sass/partials/_tickets.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ $button-background-color-hover: #4d4d4d;
@media (max-width: 767px) {
margin: 0;
}
&.disabled {
&:hover {
background: $primary-color;
}
}
}
}
.title {
Expand All @@ -83,14 +88,23 @@ $button-background-color-hover: #4d4d4d;
font-size: 32px;
display: block;
margin-top: 30px;
padding: 7px 0 10px;
padding: 7px 25px 10px;
color: #fff;
background: $button-background-color;
font-weight: $light;
text-decoration: none;
&:hover {
background: $button-background-color-hover;
}
&.disabled {
&:hover {
background: $button-background-color;
}
}
&.fallback {
font-size: 18px;
line-height: 1.4;
}
}
.pricing-ribbon {
position: absolute;
Expand Down
3 changes: 3 additions & 0 deletions _sass/partials/_twitter-feed.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
.twitter-feed {
h3 {
margin-bottom: 10px;
}
.icon {
width: 64px;
height: 64px;
Expand Down
2 changes: 1 addition & 1 deletion css/main.min.css

Large diffs are not rendered by default.

0 comments on commit 488f83f

Please sign in to comment.