Improve liquid logic

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

View File

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

View File

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

View File

@ -1,65 +1,65 @@
<div class="contact-container container-block">
<ul class="list-unstyled contact-list">
<ul class="list-unstyled contact-list">
{% if site.data.data.sidebar.email %}
<li class="email"><i class="fas fa-envelope"></i>
<a href="mailto:{{ site.data.data.sidebar.email }}">{{ site.data.data.sidebar.email }}</a>
</li>
{% endif %}
{% if site.data.data.sidebar.email %}
<li class="email"><i class="fas fa-envelope"></i>
<a href="mailto:{{ site.data.data.sidebar.email }}">{{ site.data.data.sidebar.email }}</a>
</li>
{% endif %}
{% if site.data.data.sidebar.phone %}
<li class="phone"><i class="fas fa-phone"></i>
<a href="tel:{{ site.data.data.sidebar.phone }}">{{ site.data.data.sidebar.phone }}</a>
</li>
{% endif %}
{% if site.data.data.sidebar.phone %}
<li class="phone"><i class="fas fa-phone"></i>
<a href="tel:{{ site.data.data.sidebar.phone }}">{{ site.data.data.sidebar.phone }}</a>
</li>
{% endif %}
{% if site.data.data.sidebar.website %}
<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>
</li>
{% endif %}
{% if site.data.data.sidebar.website %}
<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>
</li>
{% endif %}
{% if site.data.data.sidebar.linkedin %}
<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>
</li>
{% endif %}
{% if site.data.data.sidebar.linkedin %}
<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>
</li>
{% endif %}
{% if site.data.data.sidebar.github %}
<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>
</li>
{% endif %}
{% if site.data.data.sidebar.github %}
<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>
</li>
{% endif %}
{% if site.data.data.sidebar.gitlab %}
<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>
</li>
{% endif %}
{% if site.data.data.sidebar.gitlab %}
<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>
</li>
{% endif %}
{% if site.data.data.sidebar.bitbucket %}
<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>
</li>
{% endif %}
{% if site.data.data.sidebar.bitbucket %}
<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>
</li>
{% endif %}
{% if site.data.data.sidebar.twitter %}
<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>
</li>
{% endif %}
{% if site.data.data.sidebar.twitter %}
<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>
</li>
{% endif %}
{% if site.data.data.sidebar.stack-overflow %}
<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>
</li>
{% endif %}
{% if site.data.data.sidebar.stack-overflow %}
<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>
</li>
{% endif %}
{% if site.data.data.sidebar.codewars %}
<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>
</li>
{% endif %}
{% if site.data.data.sidebar.codewars %}
<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>
</li>
{% endif %}
</ul>
</ul>
</div><!--//contact-container-->

View File

@ -1,49 +1,50 @@
{% if site.data.data.studies %}
{% if site.education_in_main %}
<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>
{% if site.education_in_main %}
<section class="section educations-section">
{% for education in site.data.data.studies %}
<div class="item">
<div class="meta">
<div class="upper-row">
<h3 class="degree">{{ education.degree }}</h3>
<div class="time">{{ education.time }}</div>
</div><!--//upper-row-->
<div class="university">{{ education.university }}</div>
</div><!--//meta-->
{% if education.details %}
<div class="details">
<p>{{ education.details }}</p>
</div><!--//details-->
{% endif %}
</div><!--//item-->
{% endfor %}
<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 %}
<div class="item">
</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 class="meta">
<div class="upper-row">
<h3 class="degree">{{ education.degree }}</h3>
<div class="time">{{ education.time }}</div>
</div><!--//upper-row-->
<div class="university">{{ education.university }}</div>
</div><!--//meta-->
{% if education.details %}
<div class="details">
{{ education.details | markdownify }}
</div><!--//details-->
{% endif %}
</div><!--//item-->
{% 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-->
{% endif %}
{% endif %}
{% endif %}

View File

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

View File

@ -1,6 +1,6 @@
<footer class="footer">
<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 */-->
<small class="copyright">{{site.data.data.footer.text}}</small>
<small class="copyright">{{ site.data.data.footer.text }}</small>
</div><!--//container-->
</footer><!--//footer-->

View File

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

View File

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

View File

@ -18,7 +18,9 @@
{% for project in site.data.data.projects.projects %}
<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 %}
- <span class="project-tagline">{{ project.tagline }}</span>

View File

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

View File

@ -1,6 +1,10 @@
<!-- 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/bootstrap/js/bootstrap.min.js"></script>
<!-- custom js -->
<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 %}

View File

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