Skip to content

Commit

Permalink
Update fonts
Browse files Browse the repository at this point in the history
  • Loading branch information
alexcoman committed Jan 6, 2016
1 parent db77752 commit 7b99683
Show file tree
Hide file tree
Showing 53 changed files with 18,662 additions and 33 deletions.
22 changes: 12 additions & 10 deletions _includes/contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,19 @@ <h3>{{ contact.title }}</h3>
</div>

<div id="contact-blocks" class="row">
{% for block in contact.blocks %}
{% assign collumn_width = 12 | divided_by: forloop.length %}
<div class="col-md-{{ collumn_width }} col-xs-12">
<h5>{{ block.title }}</h5>
<ul>
{% for link_element in block.links %}
<li><a href="{% if link_element.permalink != null %} {{ link_element.permalink | prepend: site.baseurl }} {% else %} {{ link_element.link }} {% endif %}" {% if link_element.link != null %}target="_blank"{% endif %}>{{ link_element.text }}</a></li>
{% endfor %}
</ul>
<div class="col-lg-10 col-lg-offset-1 text-center">
{% for block in contact.blocks %}
{% assign collumn_width = 12 | divided_by: forloop.length %}
<div class="col-md-{{ collumn_width }} col-sm-4 col-xs-12 col-center">
<h5>{{ block.title }}</h5>
<ul>
{% for link_element in block.links %}
<li><a href="{% if link_element.permalink != null %} {{ link_element.permalink | prepend: site.baseurl }} {% else %} {{ link_element.link }} {% endif %}" {% if link_element.link != null %}target="_blank"{% endif %}>{{ link_element.text }}</a></li>
{% endfor %}
</ul>
</div>
{% endfor %}
</div>
{% endfor %}
</div>

<div id="contact-links" class="row">
Expand Down
4 changes: 2 additions & 2 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

<!-- Custom Fonts -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
<link href="//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic" rel="stylesheet" type="text/css">
<link href="//fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,400italic,700italic&subset=latin,latin-ext" rel="stylesheet" type="text/css">
<link href="css/fonts/geomanist.css" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="{{site.baseurl}}/css/rrssb.css" />
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
Expand Down
16 changes: 8 additions & 8 deletions _includes/team.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ <h3>{{ team.title }}</h3>
<div class="col-md-3 col-sm-6 col-xs-12 same-height cols-centered">
<img class="img-me" src="{{ site.baseurl | append: '/img/team/' | append: team_member.picture }}">
<div class="col-md-12 col-sm-12 col-xs-12 same-height text-center">
<h4>{{ team_member.name }} <span>{{ team_member.surname }}</span></h4>
<p class="text-muted">{{ team_member.title }}</p>
<ul class="list-inline social-buttons">
{% for network in team_member.social %}
<li><a href="{{ network.url }}" target="_blank"><i class="fa fa-{{ network.title }} fa-fw"></i></a></li>
{% endfor %}
</ul>
</div>
<h4>{{ team_member.name }} <span>{{ team_member.surname }}</span></h4>
<p class="text-muted">{{ team_member.title }}</p>
<ul class="list-inline social-buttons">
{% for network in team_member.social %}
<li><a href="{{ network.url }}" target="_blank"><i class="fa fa-{{ network.title }} fa-fw"></i></a></li>
{% endfor %}
</ul>
</div>
</div>
{% endfor %}
</div>
Expand Down
12 changes: 1 addition & 11 deletions _includes/timeline.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,9 @@
<div class="col-md-10 col-md-offset-1">
<h3>{{ timeline.title }}</h3>
<ul class="timeline">
<li class="timeline-inverted">
<div class="timeline-image">
<img class="img-circle img-responsive" src="{{site.baseurl}}{{ timeline.timeline-img }}" alt="">
</div>
</li>
{% for event in timeline.events %}
{% assign loopindex = forloop.index | modulo: 2 %}
{% capture class %}
{% if loopindex == 0 %}
timeline-inverted
{% endif %}
{% endcapture %}
<li class="{{ class }}">
<li{% if loopindex == 0 %} class="timeline-inverted" {% endif %}>
<div class="timeline-image">
<img class="img-circle img-responsive" src="{{site.baseurl}}{{ event.image }}" alt="">
</div>
Expand Down
128 changes: 128 additions & 0 deletions _sass/fonts/geomanist.scss

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _sass/vendor/_grayscale.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
body {
width: 100%;
height: 100%;
font-family: "Lora","Helvetica Neue",Helvetica,Arial,sans-serif;
font-family: 'Source Sans Pro', Helvetica, Arial, sans-serif;
color: $light;
background-color: $dark;
}
Expand Down
3 changes: 3 additions & 0 deletions css/fonts/geomanist.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added fonts/geomanist/geomanist-black-webfont.eot
Binary file not shown.
Loading

0 comments on commit 7b99683

Please sign in to comment.