scott/scottjohnson.pro
2
0
Fork 0
forked from robert/robertjohnson.work
Code Pull Requests Activity

Improve liquid logic

Browse Source
This commit is contained in:
Nelson Estevão 2018-07-25 17:40:47 +01:00
parent 79e952b8aa
commit 4c89fecc25
13 changed files with 221 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
_data/data.yml
View File

@ -49,26 +49,43 @@ sidebar:
career-profile: career-profile:
title: Career Profile title: Career Profile
text: 'Summarise your career here lorem ipsum dolor sit amet, consectetuer adipiscing elit.You can <a href="#" target="_blank">download this free resume/CV template here</a>. Aenean commodo ligula eget dolor aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu.<br><br>Second paragraph if required.' text: |
Summarise your career here lorem ipsum dolor sit amet, consectetuer
adipiscing elit.You can [download this free resume/CV template here]().
Aenean commodo ligula eget dolor aenean massa. Cum sociis natoque
penatibus et magnis dis parturient montes, nascetur ridiculus mus.
Donec quam felis, ultricies nec, pellentesque eu.
Second paragraph if required.
studies: studies:
- education: - education:
degree: MSc in Computer Science degree: MSc in Computer Science
university: University of London university: University of London
time: 2011 - 2012 time: 2011 - 2012
details: "Describe your study here lorem ipsum dolor sit amet, consectetuer adipiscing details: |
elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et Describe your study here lorem ipsum dolor sit amet, consectetuer
magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum
pellentesque eu, pretium quis, sem." sociis natoque penatibus et magnis dis parturient montes, nascetur
ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu,
pretium quis, sem.
- Bullet point
- Bullet point
- education: - education:
degree: BSc in Applied Mathematics degree: BSc in Applied Mathematics
university: Bristol University university: Bristol University
time: 2007 - 2011 time: 2007 - 2011
details: "Describe your study here lorem ipsum dolor sit amet, consectetuer adipiscing details: |
elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et Describe your study here lorem ipsum dolor sit amet, consectetuer
magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum
pellentesque eu, pretium quis, sem." sociis natoque penatibus et magnis dis parturient montes, nascetur
ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu,
pretium quis, sem.
- Bullet point
- Bullet point
experiences: experiences:
title: Experiences title: Experiences
@ -77,28 +94,52 @@ experiences:
- role: Lead Developer - role: Lead Developer
time: 2015 - Present time: 2015 - Present
company: Startup Hubs, San Francisco company: Startup Hubs, San Francisco
details: Describe your role here lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. details: |
bullets: Describe your role here lorem ipsum dolor sit amet, consectetuer
- Bullet point #1 adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.
- Bullet point #2 Cum sociis natoque penatibus et magnis dis parturient montes,
nascetur ridiculus mus. Donec quam felis, ultricies nec,
pellentesque eu, pretium quis, sem. Nulla consequat massa quis
enim. Donec pede justo. Sed ut perspiciatis unde omnis iste natus
error sit voluptatem accusantium doloremque laudantium, totam rem
aperiam, eaque ipsa quae ab illo inventore veritatis et quasi
architecto beatae vitae dicta sunt explicabo.
- Bullet point
- Bullet point
- role: Senior Software Engineer - role: Senior Software Engineer
time: 2014 - 2015 time: 2014 - 2015
company: Google, London company: Google, London
details: Describe your role here lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. details: |
Describe your role here lorem ipsum dolor sit amet, consectetuer
adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.
Cum sociis natoque penatibus et magnis dis parturient montes,
nascetur ridiculus mus. Donec quam felis, ultricies nec,
pellentesque eu, pretium quis, sem.
- Bullet point
- Bullet point
- role: UI Developer - role: UI Developer
time: 2012 - 2014 time: 2012 - 2014
company: Amazon, London company: Amazon, London
details: Describe your role here lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. details: |
bullets: Describe your role here lorem ipsum dolor sit amet, consectetuer
- Bullet point #1 adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.
- Bullet point #2 Cum sociis natoque penatibus et magnis dis parturient montes,
nascetur ridiculus mus. Donec quam felis, ultricies nec,
pellentesque eu, pretium quis, sem.
- Bullet point
- Bullet point
projects: projects:
title: Projects title: Projects
intro: "You can list your side projects or open source libraries in this section. Lorem ipsum dolor intro: >
sit amet, consectetur adipiscing elit. Vestibulum et ligula in nunc bibendum fringilla a eu lectus." You can list your side projects or open source libraries in this
section. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Vestibulum et ligula in nunc bibendum fringilla a eu lectus.
projects: projects:
- project: - project:
@ -124,7 +165,10 @@ projects:
publications: publications:
title: Publications title: Publications
intro: "You can list your publications in this section. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum et ligula in nunc bibendum fringilla a eu lectus." intro: |
You can list your publications in this section. Lorem ipsum dolor sit
amet, consectetur adipiscing elit. Vestibulum et ligula in nunc
bibendum fringilla a eu lectus.
publications: publications:
- paper: - paper:
@ -163,4 +207,5 @@ skills:
level: 60% level: 60%
footer: footer:
text: 'Designed with <i class="fas fa-heart"></i> by <a href="http://themes.3rdwavemedia.com" target="_blank" rel="nofollow">Xiaoying Riley</a> for developers' text: >
Designed with <i class="fas fa-heart"></i> by <a href="http://themes.3rdwavemedia.com" target="_blank" rel="nofollow">Xiaoying Riley</a>

8
_includes/about.html
View File

@ -1,6 +1,6 @@
<div class="remove-container container-block"> <div class="remove-container container-block">
<h2 class="container-block-title">About Theme</h2> <h2 class="container-block-title">About Theme</h2>
<ul class="list-unstyled interests-list"> <ul class="list-unstyled interests-list">
<a target="_blank" href="https://www.youtube.com/watch?v=Jnmj1dXDbNk"><li>How to use?</li></a> <a target="_blank" href="https://www.youtube.com/watch?v=Jnmj1dXDbNk"><li>How to use?</li></a>
</ul> </ul>
</div><!--//About--> </div><!--//About-->

6
_includes/career-profile.html
View File

@ -9,9 +9,9 @@
{{ site.data.data.career-profile.title }} {{ site.data.data.career-profile.title }}
</h2> </h2>
<div class="summary"> <div class="summary">
<p>{{ site.data.data.career-profile.text }}</p> {{ site.data.data.career-profile.text | markdownify }}
</div><!--//summary--> </div><!--//summary-->
</section><!--//section--> </section><!--//section-->
{% endif %} {% endif %}

104
_includes/contact.html
View File

@ -1,65 +1,65 @@
<div class="contact-container container-block"> <div class="contact-container container-block">
<ul class="list-unstyled contact-list"> <ul class="list-unstyled contact-list">
{% if site.data.data.sidebar.email %} {% if site.data.data.sidebar.email %}
<li class="email"><i class="fas fa-envelope"></i> <li class="email"><i class="fas fa-envelope"></i>
<a href="mailto:{{ site.data.data.sidebar.email }}">{{ site.data.data.sidebar.email }}</a> <a href="mailto:{{ site.data.data.sidebar.email }}">{{ site.data.data.sidebar.email }}</a>
</li> </li>
{% endif %} {% endif %}
{% if site.data.data.sidebar.phone %} {% if site.data.data.sidebar.phone %}
<li class="phone"><i class="fas fa-phone"></i> <li class="phone"><i class="fas fa-phone"></i>
<a href="tel:{{ site.data.data.sidebar.phone }}">{{ site.data.data.sidebar.phone }}</a> <a href="tel:{{ site.data.data.sidebar.phone }}">{{ site.data.data.sidebar.phone }}</a>
</li> </li>
{% endif %} {% endif %}
{% if site.data.data.sidebar.website %} {% if site.data.data.sidebar.website %}
<li class="website"><i class="fas fa-globe-americas"></i> <li class="website"><i class="fas fa-globe-americas"></i>
<a href="http://{{ site.data.data.sidebar.website }}" target="_blank">{{ site.data.data.sidebar.website }}</a> <a href="http://{{ site.data.data.sidebar.website }}" target="_blank">{{ site.data.data.sidebar.website }}</a>
</li> </li>
{% endif %} {% endif %}
{% if site.data.data.sidebar.linkedin %} {% if site.data.data.sidebar.linkedin %}
<li class="linkedin"><i class="fab fa-linkedin"></i> <li class="linkedin"><i class="fab fa-linkedin"></i>
<a href="https://linkedin.com/in/{{ site.data.data.sidebar.linkedin }}" target="_blank">{{ site.data.data.sidebar.linkedin }}</a> <a href="https://linkedin.com/in/{{ site.data.data.sidebar.linkedin }}" target="_blank">{{ site.data.data.sidebar.linkedin }}</a>
</li> </li>
{% endif %} {% endif %}
{% if site.data.data.sidebar.github %} {% if site.data.data.sidebar.github %}
<li class="github"><i class="fab fa-github"></i> <li class="github"><i class="fab fa-github"></i>
<a href="http://github.com/{{ site.data.data.sidebar.github }}" target="_blank">{{ site.data.data.sidebar.github }}</a> <a href="http://github.com/{{ site.data.data.sidebar.github }}" target="_blank">{{ site.data.data.sidebar.github }}</a>
</li> </li>
{% endif %} {% endif %}
{% if site.data.data.sidebar.gitlab %} {% if site.data.data.sidebar.gitlab %}
<li class="gitlab"><i class="fab fa-gitlab"></i> <li class="gitlab"><i class="fab fa-gitlab"></i>
<a href="http://gitlab.com/{{ site.data.data.sidebar.gitlab }}" target="_blank">{{ site.data.data.sidebar.gitlab }}</a> <a href="http://gitlab.com/{{ site.data.data.sidebar.gitlab }}" target="_blank">{{ site.data.data.sidebar.gitlab }}</a>
</li> </li>
{% endif %} {% endif %}
{% if site.data.data.sidebar.bitbucket %} {% if site.data.data.sidebar.bitbucket %}
<li class="bitbucket"><i class="fab fa-bitbucket"></i> <li class="bitbucket"><i class="fab fa-bitbucket"></i>
<a href="http://bitbucket.com/{{ site.data.data.sidebar.bitbucket }}" target="_blank">{{ site.data.data.sidebar.bitbucket }}</a> <a href="http://bitbucket.com/{{ site.data.data.sidebar.bitbucket }}" target="_blank">{{ site.data.data.sidebar.bitbucket }}</a>
</li> </li>
{% endif %} {% endif %}
{% if site.data.data.sidebar.twitter %} {% if site.data.data.sidebar.twitter %}
<li class="twitter"><i class="fab fa-twitter"></i> <li class="twitter"><i class="fab fa-twitter"></i>
<a href="https://twitter.com/{{ site.data.data.sidebar.twitter }}" target="_blank">{{ site.data.data.sidebar.twitter }}</a> <a href="https://twitter.com/{{ site.data.data.sidebar.twitter }}" target="_blank">{{ site.data.data.sidebar.twitter }}</a>
</li> </li>
{% endif %} {% endif %}
{% if site.data.data.sidebar.stack-overflow %} {% if site.data.data.sidebar.stack-overflow %}
<li class="stack-overflow"><i class="fab fa-stack-overflow"></i> <li class="stack-overflow"><i class="fab fa-stack-overflow"></i>
<a href="https://stackoverflow.com/users/{{ site.data.data.sidebar.stack-overflow }}" target="_blank">{{ site.data.data.sidebar.stack-overflow }}</a> <a href="https://stackoverflow.com/users/{{ site.data.data.sidebar.stack-overflow }}" target="_blank">{{ site.data.data.sidebar.stack-overflow }}</a>
</li> </li>
{% endif %} {% endif %}
{% if site.data.data.sidebar.codewars %} {% if site.data.data.sidebar.codewars %}
<li class="codewars"><i class="fas fa-code"></i> <li class="codewars"><i class="fas fa-code"></i>
<a href="https://www.codewars.com/users/{{ site.data.data.sidebar.codewars }}/completed_solutions" target="_blank">{{ site.data.data.sidebar.codewars }}</a> <a href="https://www.codewars.com/users/{{ site.data.data.sidebar.codewars }}/completed_solutions" target="_blank">{{ site.data.data.sidebar.codewars }}</a>
</li> </li>
{% endif %} {% endif %}
</ul> </ul>
</div><!--//contact-container--> </div><!--//contact-container-->

75
_includes/education.html
View File

@ -1,49 +1,50 @@
{% if site.data.data.studies %} {% if site.data.data.studies %}
{% if site.education_in_main %} {% if site.education_in_main %}
<section class="section educations-section"> <section class="section educations-section">
<h2 class="section-title">
<span class="fa-stack fa-xs">
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fas fa-graduation-cap fa-stack-1x fa-inverse"></i>
</span>
Education
</h2>
{% for education in site.data.data.studies %} <h2 class="section-title">
<div class="item"> <span class="fa-stack fa-xs">
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fas fa-graduation-cap fa-stack-1x fa-inverse"></i>
</span>
Education
</h2>
<div class="meta"> {% for education in site.data.data.studies %}
<div class="item">
<div class="upper-row"> <div class="meta">
<h3 class="degree">{{ education.degree }}</h3>
<div class="time">{{ education.time }}</div>
</div><!--//upper-row-->
<div class="university">{{ education.university }}</div> <div class="upper-row">
</div><!--//meta--> <h3 class="degree">{{ education.degree }}</h3>
<div class="time">{{ education.time }}</div>
</div><!--//upper-row-->
{% if education.details %} <div class="university">{{ education.university }}</div>
<div class="details"> </div><!--//meta-->
<p>{{ education.details }}</p>
</div><!--//details-->
{% endif %}
</div><!--//item-->
{% endfor %}
</section><!--//section--> {% if education.details %}
{% else %} <div class="details">
<div class="education-container container-block"> {{ education.details | markdownify }}
</div><!--//details-->
<h2 class="container-block-title">Education</h2> {% endif %}
{% for education in site.data.data.studies %}
<div class="item">
<h4 class="degree">{{ education.degree }}</h4>
<h5 class="meta">{{ education.university }}</h5>
<div class="time">{{ education.time }}</div>
</div><!--//item--> </div><!--//item-->
{% endfor %} {% endfor %}
</section><!--//section-->
{% else %}
<div class="education-container container-block">
<h2 class="container-block-title">Education</h2>
{% for education in site.data.data.studies %}
<div class="item">
<h4 class="degree">{{ education.degree }}</h4>
<h5 class="meta">{{ education.university }}</h5>
<div class="time">{{ education.time }}</div>
</div><!--//item-->
{% endfor %}
</div><!--//education-container--> </div><!--//education-container-->
{% endif %} {% endif %}
{% endif %} {% endif %}

13
_includes/experience.html
View File

@ -8,7 +8,7 @@
{{ site.data.data.experiences.title }} {{ site.data.data.experiences.title }}
</h2> </h2>
{% for experience in site.data.data.experiences.experiences %} {% for experience in site.data.data.experiences.experiences %}
<div class="item"> <div class="item">
<div class="meta"> <div class="meta">
@ -24,19 +24,12 @@
{% if experience.details %} {% if experience.details %}
<div class="details"> <div class="details">
<p>{{ experience.details }}</p> {{ experience.details | markdownify }}
{% if experience.bullets %}
<ul>
{% for bullet in experience.bullets %}
<li>{{ bullet }}</li>
{% endfor %}
</ul>
{% endif %}
</div><!--//details--> </div><!--//details-->
{% endif %} {% endif %}
</div><!--//item--> </div><!--//item-->
{% endfor %} {% endfor %}
</section><!--//section--> </section><!--//section-->
{% endif %} {% endif %}

2
_includes/footer.html
View File

@ -1,6 +1,6 @@
<footer class="footer"> <footer class="footer">
<div class="text-center"> <div class="text-center">
<!--/* This template is released under the Creative Commons Attribution 3.0 License. Please keep the attribution link below when using for your own project. Thank you for your support. :) If you'd like to use the template without the attribution, you can check out other license options via our website: themes.3rdwavemedia.com */--> <!--/* This template is released under the Creative Commons Attribution 3.0 License. Please keep the attribution link below when using for your own project. Thank you for your support. :) If you'd like to use the template without the attribution, you can check out other license options via our website: themes.3rdwavemedia.com */-->
<small class="copyright">{{site.data.data.footer.text}}</small> <small class="copyright">{{ site.data.data.footer.text }}</small>
</div><!--//container--> </div><!--//container-->
</footer><!--//footer--> </footer><!--//footer-->

16
_includes/interests.html
View File

@ -3,17 +3,17 @@
<h2 class="container-block-title">Interests</h2> <h2 class="container-block-title">Interests</h2>
<ul class="list-unstyled interests-list"> <ul class="list-unstyled interests-list">
{% for interest in site.data.data.sidebar.interests %} {% for interest in site.data.data.sidebar.interests %}
{% if interest.link %} {% if interest.link %}
<li><a href="{{ interest.link }}">{{ interest.item }}</a></li> <li><a href="{{ interest.link }}">{{ interest.item }}</a></li>
{% else %} {% else %}
<li>{{ interest.item }}</li> <li>{{ interest.item }}</li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
</div><!--//interests--> </div><!--//interests-->
{% endif %} {% endif %}

13
_includes/language.html
View File

@ -3,11 +3,14 @@
<h2 class="container-block-title">Languages</h2> <h2 class="container-block-title">Languages</h2>
<ul class="list-unstyled interests-list"> <ul class="list-unstyled interests-list">
{%for language in site.data.data.sidebar.languages %} {%for language in site.data.data.sidebar.languages %}
<li>{{ language.idiom }} <span class="lang-desc">({{ language.level }})</span></li> <li>
{% endfor %} {{ language.idiom }}
</ul> <span class="lang-desc">({{ language.level }})</span>
</li>
{% endfor %}
</ul>
</div><!--//interests--> </div><!--//interests-->
{% endif %} {% endif %}

4
_includes/projects.html
View File

@ -18,7 +18,9 @@
{% for project in site.data.data.projects.projects %} {% for project in site.data.data.projects.projects %}
<div class="item"> <div class="item">
<span class="project-title"><a href="{{ project.link }}">{{ project.title }}</a></span> <span class="project-title">
<a href="{{ project.link }}">{{ project.title }}</a>
</span>
{% if project.tagline %} {% if project.tagline %}
- <span class="project-tagline">{{ project.tagline }}</span> - <span class="project-tagline">{{ project.tagline }}</span>

12
_includes/publications.html
View File

@ -11,16 +11,16 @@
{% if site.data.data.publications.intro %} {% if site.data.data.publications.intro %}
<div class="intro"> <div class="intro">
<p>{{ site.data.data.publications.intro }}</p> {{ site.data.data.publications.intro | markdownify }}
</div><!--//intro--> </div><!--//intro-->
{% endif %} {% endif %}
{% for publication in site.data.data.publications.publications %} {% for publication in site.data.data.publications.publications %}
<div class="item"> <div class="item">
<div class="publication-title">{{ publication.title }}</div> <div class="publication-title">{{ publication.title }}</div>
<div class="publication-authors">{{ publication.authors }}</div> <div class="publication-authors">{{ publication.authors }}</div>
<div class="publication-conference">{{ publication.conference }}</div> <div class="publication-conference">{{ publication.conference }}</div>
</div><!--//item--> </div><!--//item-->
{% endfor %} {% endfor %}
</section><!--//section--> </section><!--//section-->

6
_includes/scripts.html
View File

@ -1,6 +1,10 @@
<!-- Javascript --> <!-- Javascript -->
<script type="text/javascript" src="{{site.baseurl}}/assets/plugins/jquery-1.11.3.min.js"></script> <script type="text/javascript" src="{{site.baseurl}}/assets/plugins/jquery-1.11.3.min.js"></script>
<script type="text/javascript" src="{{site.baseurl}}/assets/plugins/bootstrap/js/bootstrap.min.js"></script> <script type="text/javascript" src="{{site.baseurl}}/assets/plugins/bootstrap/js/bootstrap.min.js"></script>
<!-- custom js --> <!-- custom js -->
<script type="text/javascript" src="{{site.baseurl}}/assets/js/main.js"></script> <script type="text/javascript" src="{{site.baseurl}}/assets/js/main.js"></script>
{% if site.analytics %} {% include analytics.html %} {% endif %}
{% if site.analytics %}
{% include analytics.html %}
{% endif %}

32
_includes/sidebar.html
View File

@ -1,30 +1,32 @@
<!-- Use icons from fontawesome when you are adding new item in the contact list --> <!-- Use icons from fontawesome when you are adding new item in the contact list -->
<div class="sidebar-wrapper"> <div class="sidebar-wrapper">
<div class="profile-container"> <div class="profile-container">
{% if site.data.data.sidebar.name %} {% if site.data.data.sidebar.name %}
<img class="avatar" src="{{ site.baseurl }}/assets/images/{{ site.data.data.sidebar.avatar }}" alt="profile picture" /> <img class="avatar" src="{{ site.baseurl }}/assets/images/{{ site.data.data.sidebar.avatar }}" alt="profile picture" />
{% endif %} {% endif %}
{% if site.data.data.sidebar.name %} {% if site.data.data.sidebar.name %}
<h1 class="name">{{ site.data.data.sidebar.name }}</h1> <h1 class="name">{{ site.data.data.sidebar.name }}</h1>
{% endif %} {% endif %}
{% if site.data.data.sidebar.tagline %} {% if site.data.data.sidebar.tagline %}
<h3 class="tagline">{{ site.data.data.sidebar.tagline }}</h3> <h3 class="tagline">{{ site.data.data.sidebar.tagline }}</h3>
{% endif %} {% endif %}
</div><!--//profile-container--> </div><!--//profile-container-->
{% include contact.html %} {% include contact.html %}
{% if site.education_in_main == null or site.education_in_main == false %} {% unless site.education_in_main %}
{% include education.html %} {% include education.html %}
{% endif %} {% endunless %}
{% include language.html %} {% include language.html %}
{% include interests.html %} {% include interests.html %}
{% if site.data.data.sidebar.about == true %}
{% if site.data.data.sidebar.about %}
{% include about.html %} {% include about.html %}
{% endif %} {% endif %}