silva
/
new_site
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes to navbar

This commit is contained in:
Maruan Al-Shedivat 2020-05-02 15:45:16 -04:00
parent edc854aa3a
commit 39745a9224
4 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
_config.yml
View File

@ -21,7 +21,6 @@ last_updated: false # set to true if you want to display last updated in the foo
navbar_fixed: true navbar_fixed: true
footer_fixed: false footer_fixed: false
social_icons_pos: bottom
# TODO: add layout settings (single page vs. multi-page) # TODO: add layout settings (single page vs. multi-page)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -80,7 +79,7 @@ news_limit: 5
# Build settings # Build settings
markdown: kramdown markdown: kramdown
highlighter: pygments highlighter: rouge
# Includes & excludes # Includes & excludes
include: ['_pages'] include: ['_pages']
@ -125,12 +124,12 @@ scholar:
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
enable_google_analytics: false enable_google_analytics: false
enable_highlight: true enable_highlight: false
enable_katex: true enable_katex: true
enable_mansory: false enable_mansory: false
enable_progressbar: false enable_progressbar: false
enable_tooltips: false enable_tooltips: false
show_social_icons: true show_social_icons: false
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Library versions # Library versions

35
_includes/header.html
View File

@ -6,7 +6,7 @@
{% if page.title != "about" %} {% if page.title != "about" %}
{% assign name = site.title | split: ' ' %} {% assign name = site.title | split: ' ' %}
<a class="navbar-brand title font-weight-lighter" href="{{ site.baseurl | prepend: site.url }}/"><span class="font-weight-bold">{{ name | first }}</span> {{ name | last }}</a> <a class="navbar-brand title font-weight-lighter" href="{{ site.baseurl | prepend: site.url }}/"><span class="font-weight-bold">{{ name | first }}</span> {{ name | last }}</a>
{% elsif site.social_icons_pos == 'top' %} {% elsif site.show_social_icons %}
<!-- Social Icons --> <!-- Social Icons -->
<div class="row ml-1 ml-sm-0"> <div class="row ml-1 ml-sm-0">
{% include social.html %} {% include social.html %}
@ -21,7 +21,8 @@
</button> </button>
<div class="collapse navbar-collapse text-right" id="navbarNav"> <div class="collapse navbar-collapse text-right" id="navbarNav">
<ul class="navbar-nav ml-auto flex-nowrap"> <ul class="navbar-nav ml-auto flex-nowrap">
<li class="nav-item {% if page.title == 'about' %}navbar-active{% endif %}"> <!-- About -->
<li class="nav-item {% if page.title == 'about' %}active{% endif %}">
<a class="nav-link" href="{{ '/' | prepend: site.baseurl | prepend: site.url }}"> <a class="nav-link" href="{{ '/' | prepend: site.baseurl | prepend: site.url }}">
about about
{% if page.title == "about" %} {% if page.title == "about" %}
@ -29,17 +30,27 @@
{% endif %} {% endif %}
</a> </a>
</li> </li>
<!-- Blog -->
<li class="nav-item {% if page.url contains 'blog' %}active{% endif %}">
<a class="nav-link" href="{{ '/blog/' | prepend: site.baseurl | prepend: site.url }}">
blog
{% if page.title == "blog" %}
<span class="sr-only">(current)</span>
{% endif %}
</a>
</li>
<!-- Other pages -->
{% for p in site.pages %} {% for p in site.pages %}
{% if p.title and p.url != "/" %} {% if p.title and p.url != "/" %}
<li class="nav-item {% if page.nav == p.nav %}navbar-active{% endif %}"> <li class="nav-item {% if page.title == p.title %}active{% endif %}">
<a class="nav-link" href="{{ p.url | prepend: site.baseurl | prepend: site.url }}"> <a class="nav-link" href="{{ p.url | prepend: site.baseurl | prepend: site.url }}">
{{ p.title }} {{ p.title }}
{% if page.nav == p.nav %} {% if page.nav == p.nav %}
<span class="sr-only">(current)</span> <span class="sr-only">(current)</span>
{% endif %} {% endif %}
</a> </a>
</li> </li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>

2
_layouts/about.html
View File

@ -24,7 +24,7 @@ layout: page
{% include news.html %} {% include news.html %}
{% endif %} {% endif %}
{% if page.social and site.social_icons_pos == 'bottom' %} {% if page.social %}
<div class="social"> <div class="social">
{% include social.html %} {% include social.html %}
<div class="contact-note">{{ site.contact_note }}</div> <div class="contact-note">{{ site.contact_note }}</div>

8
_sass/_base.scss
View File

@ -53,6 +53,14 @@ a, table.table a {
color: $link-color; color: $link-color;
} }
} }
.navbar-nav .nav-item.active>.nav-link {
background-color: inherit;
color: $link-color;
font-weight: bolder;
&:hover {
color: $link-color;
}
}
.contact-icon { .contact-icon {
font-size: 2rem; font-size: 2rem;
a { a {