diff --git a/_config.yml b/_config.yml --- a/_config.yml +++ b/_config.yml @@ -40,10 +40,6 @@ zh_simple: "简体中文" zh_traditional: "繁体中文" -# Image to show in the navigation bar - image must be a square (width = height) -# Remove this parameter if you don't want an image in the navbar -#avatar: "/img/avatar-icon.png" - # If you want to have an image logo in the top-left corner instead of the title text, # then specify the following parameter title-img: "/img/avatar-icon-small.png" @@ -164,7 +160,6 @@ path: "" # all files values: layout: page - show-avatar: true # Use tags index page and make tags on each post clickable link-tags: true diff --git a/_includes/head.html b/_includes/head.html --- a/_includes/head.html +++ b/_includes/head.html @@ -85,8 +85,6 @@ {% if page.share-img %} - {% elsif site.avatar %} - {% endif %} @@ -113,8 +111,5 @@ {% if page.share-img %} - {% elsif site.avatar %} - {% endif %} - diff --git a/_includes/nav.html b/_includes/nav.html --- a/_includes/nav.html +++ b/_includes/nav.html @@ -47,27 +47,8 @@ {% include navbarlink.html link=link %} {% endif %} - {% endfor %} + {% endfor %} - - {% if page.image and (layout.show-avatar or page.show-avatar) %} -
-
- - - -
-
- {% elsif site.avatar and (layout.show-avatar or page.show-avatar) %} -
-
- - - -
-
- {% endif %} - diff --git a/css/main.css b/css/main.css --- a/css/main.css +++ b/css/main.css @@ -154,46 +154,6 @@ } } -.navbar-custom .avatar-container { - position: absolute; - left: 50%; - width: 50px; - margin-top: -25px; -} -.navbar-custom .avatar-container .avatar-img-border { - width: 100%; - margin-left: -50%; - display: inline-block; - box-shadow: 0 0 8px rgba(0, 0, 0, .8); - -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .8); - -moz-box-shadow: 0 0 8px rgba(0, 0, 0, .8); -} -.navbar-custom .avatar-container .avatar-img { - width: 100%; -} - -.navbar-custom.top-nav-expanded .avatar-container { - display: none; -} - -@media only screen and (min-width: 768px) { - .navbar-custom .avatar-container { - width: 100px; - margin-top: -50px; - } - - .navbar-custom .avatar-container .avatar-img-border { - width: 100%; - box-shadow: 1px 1px 2px rgba(0, 0, 0, .8); - -webkit-box-shadow: 1px 1px 2px rgba(0, 0, 0, .8); - -moz-box-shadow: 1px 1px 2px rgba(0, 0, 0, .8); - } - - .navbar-custom .avatar-container .avatar-img { - width: 100%; - } -} - /* Multi-level navigation links */ .navbar-custom .nav .navlinks-container { position: relative; diff --git a/js/main.js b/js/main.js --- a/js/main.js +++ b/js/main.js @@ -7,21 +7,11 @@ $(window).scroll(function() { if ($(".navbar").offset().top > 50) { $(".navbar").addClass("top-nav-short"); - $(".navbar-custom .avatar-container").fadeOut(500); } else { $(".navbar").removeClass("top-nav-short"); - $(".navbar-custom .avatar-container").fadeIn(500); } }); - // On mobile, hide the avatar when expanding the navbar menu - $('#main-navbar').on('show.bs.collapse', function () { - $(".navbar").addClass("top-nav-expanded"); - }); - $('#main-navbar').on('hidden.bs.collapse', function () { - $(".navbar").removeClass("top-nav-expanded"); - }); - // On mobile, when clicking on a multi-level navbar menu, show the child links $('#main-navbar').on("click", ".navlinks-parent", function(e) { var target = e.target;