diff --git a/_config.yml b/_config.yml index 972b596..24d221d 100644 --- a/_config.yml +++ b/_config.yml @@ -62,14 +62,6 @@ permalink: /blog/:year/:title/ # Pagination pagination: enabled: true - collection: 'posts' - permalink: /page/:num/ - per_page: 3 - sort_field: 'date' - sort_reverse: true - trail: - before: 1 # The number of links before the current page - after: 3 # The number of links after the current page # Comments disqus_shortname: al-folio # put your disqus shortname @@ -152,8 +144,8 @@ scholar: enable_google_analytics: false enable_katex: true -enable_mansory: false -enable_progressbar: false +enable_mansory: true +enable_progressbar: true enable_tooltips: false show_social_icons: false @@ -161,11 +153,33 @@ show_social_icons: false # Library versions # ----------------------------------------------------------------------------- -academicons_version: "1.8.6" -bootstrap_version: "4.4.1" -fontawesome_version: "5.11.2" -highlight_version: "9.15.10" -jquery_version: "3.4.1" -katex_version: "0.11.1" -mdb_version: "4.8.10" -popper_version: "1.15.0" +academicons: + version: "1.8.6" + integrity: "sha256-uFVgMKfistnJAfoCUQigIl+JfUaP47GrRKjf6CTPVmw=" +bootstrap: + version: "4.4.1" + integrity: + css: "sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" + js: "sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" +fontawesome: + version: "5.13.0" + integrity: "sha256-h20CPZ0QyXlBuAw7A+KluUYx/3pK+c7lYEpqLTlxjYQ=" +jquery: + version: "3.4.1" + integrity: "sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" +katex: + version: "0.11.1" + integrity: + css: "sha256-V8SV2MO1FUb63Bwht5Wx9x6PVHNa02gv8BgH/uH3ung=" + js: "sha256-F/Xda58SPdcUCr+xhSGz9MA2zQBPb0ASEYKohl8UCHc=" +mansory: + version: "4.2.2" + integrity: "sha256-Nn1q/fx0H7SNLZMQ5Hw5JLaTRZp0yILA/FRexe19VdI=" +mdb: + version: "4.17.0" + integrity: + css: "sha256-/SwJ2GDcEt5382i8zqDwl36VJGECxEoIcBIuoLmLR4g=" + js: "sha256-UGNYR+uy841zU5TiO2yXD96UktHt9TM4/WXvsDLr4l0=" +popper: + version: "2.4.0" + integrity: "sha256-OH05DFHUWzr725HmuHo3pnuvUUn+TJuj8/Qz9xytFEw=" diff --git a/_includes/head.html b/_includes/head.html index d2cc3bb..245c0e9 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -6,12 +6,12 @@ - - + + - - + + diff --git a/_includes/header.html b/_includes/header.html index 74498f8..2879578 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -30,6 +30,7 @@ {% endif %} + {% if site.blog_name %}
  • @@ -39,9 +40,11 @@ {% endif %}
    • + {% endif %} - {% for p in site.pages %} - {% if p.nav %} + {% assign sorted_pages = site.pages | sort: "title" %} + {% for p in sorted_pages %} + {% if p.nav and p.autogen == nil %}
  • {{ p.title }} @@ -57,13 +60,4 @@ - {% if site.enable_progressbar %} - - -
    - -
    -     - {% endif %} - diff --git a/_includes/hemline.html b/_includes/hemline.html index e49f9f5..4f6e997 100644 --- a/_includes/hemline.html +++ b/_includes/hemline.html @@ -1,8 +1,8 @@ - - - - + + + + @@ -12,19 +12,28 @@ {% if site.enable_katex %} - - + + {% endif %} {% if site.enable_mansory %} - -{% endif %} + -{% if site.enable_progressbar %} - - + + {% endif %} {% if site.enable_tooltips %} diff --git a/_layouts/distill.html b/_layouts/distill.html index 988c117..e9b8b52 100644 --- a/_layouts/distill.html +++ b/_layouts/distill.html @@ -55,27 +55,23 @@ -
    +
    -
    + +

    {{ page.title }}

    +

    {{ page.description }}

    +     - -

    {{ page.title }}

    -

    {{ page.description }}

    -     + - + + {{ content }} + - - {{ content }} - - - - - - - -
    + + + +
    diff --git a/_projects/1_project.markdown b/_projects/1_project.markdown index 94cd752..8bc4074 100644 --- a/_projects/1_project.markdown +++ b/_projects/1_project.markdown @@ -3,6 +3,7 @@ layout: page title: Project 1 description: a project with a background image img: /assets/img/12.jpg +importance: 1 --- Every project has a beautiful feature shocase page. It's easy to include images, in a flexible 3-column grid format. Make your photos 1/3, 2/3, or full width. diff --git a/_projects/2_project.markdown b/_projects/2_project.markdown index 3f157d9..57a86df 100644 --- a/_projects/2_project.markdown +++ b/_projects/2_project.markdown @@ -3,6 +3,7 @@ layout: page title: Project 2 description: a project with a background image img: /assets/img/2.jpg +importance: 2 --- Every project has a beautiful feature shocase page. It's easy to include images, in a flexible 3-column grid format. Make your photos 1/3, 2/3, or full width. diff --git a/_projects/3_project.markdown b/_projects/3_project.markdown index bc139c7..238788f 100644 --- a/_projects/3_project.markdown +++ b/_projects/3_project.markdown @@ -4,6 +4,7 @@ title: Project 3 description: a project that redirects to another website img: redirect: https://unsplash.com +importance: 3 --- Every project has a beautiful feature shocase page. It's easy to include images, in a flexible 3-column grid format. Make your photos 1/3, 2/3, or full width. diff --git a/_projects/4_project.markdown b/_projects/4_project.markdown index 15457ff..114308a 100644 --- a/_projects/4_project.markdown +++ b/_projects/4_project.markdown @@ -3,6 +3,7 @@ layout: page title: Project 4 description: another without an image img: +importance: 3 --- Every project has a beautiful feature shocase page. It's easy to include images, in a flexible 3-column grid format. Make your photos 1/3, 2/3, or full width. diff --git a/_projects/5_project.markdown b/_projects/5_project.markdown index 8538fe1..cd8a689 100644 --- a/_projects/5_project.markdown +++ b/_projects/5_project.markdown @@ -3,6 +3,7 @@ layout: page title: Project 5 description: a project with a background image img: /assets/img/1.jpg +importance: 3 --- Every project has a beautiful feature shocase page. It's easy to include images, in a flexible 3-column grid format. Make your photos 1/3, 2/3, or full width. diff --git a/_projects/6_project.markdown b/_projects/6_project.markdown index b06503e..7fc6d02 100644 --- a/_projects/6_project.markdown +++ b/_projects/6_project.markdown @@ -3,6 +3,7 @@ layout: page title: Project 6 description: a project with no image img: +importance: 4 --- Every project has a beautiful feature shocase page. It's easy to include images, in a flexible 3-column grid format. Make your photos 1/3, 2/3, or full width. diff --git a/_sass/_base.scss b/_sass/_base.scss index 8bce632..bf77ed7 100644 --- a/_sass/_base.scss +++ b/_sass/_base.scss @@ -217,3 +217,23 @@ footer.sticky-bottom { text-decoration: none; } } + + +// Projects + +.projects { + .grid-item { + width: 250px; + margin-bottom: 10px; + a { + color: black; + text-decoration: none; + &:hover { + color: $theme-color; + } + } + } + .card img { + width: 100%; + } +} diff --git a/assets/js/progressbar.js b/assets/js/progressbar.js deleted file mode 100644 index 03e8748..0000000 --- a/assets/js/progressbar.js +++ /dev/null @@ -1,46 +0,0 @@ -$(document).ready(function() { - var navbarHeight = $('#navbar').outerHeight(true); - $('body').css({ 'padding-top': navbarHeight }); - $('progress-container').css({ 'padding-top': navbarHeight }); - var progressBar = $('#progress'); - progressBar.css({ 'top': navbarHeight }); - var getMax = function() { return $(document).height() - $(window).height(); } - var getValue = function() { return $(window).scrollTop(); } - // Check if the browser supports the progress element. - if ('max' in document.createElement('progress')) { - // Set the 'max' attribute for the first time. - progressBar.attr({ max: getMax() }); - progressBar.attr({ value: getValue() }); - - $(document).on('scroll', function() { - // On scroll only the 'value' attribute needs to be calculated. - progressBar.attr({ value: getValue() }); - }); - - $(window).resize(function() { - var navbarHeight = $('#navbar').outerHeight(true); - $('body').css({ 'padding-top': navbarHeight }); - $('progress-container').css({ 'padding-top': navbarHeight }); - progressBar.css({ 'top': navbarHeight }); - // On resize, both the 'max' and 'value' attributes need to be calculated. - progressBar.attr({ max: getMax(), value: getValue() }); - }); - } else { - var max = getMax(), value, width; - var getWidth = function() { - // Calculate the window width as a percentage. - value = getValue(); - width = (value/max) * 100; - width = width + '%'; - return width; - } - var setWidth = function() { progressBar.css({ width: getWidth() }); }; - setWidth(); - $(document).on('scroll', setWidth); - $(window).on('resize', function() { - // Need to reset the 'max' attribute. - max = getMax(); - setWidth(); - }); - } -}); diff --git a/blog/index.html b/blog/index.html index 5a6e096..9c474d7 100644 --- a/blog/index.html +++ b/blog/index.html @@ -2,6 +2,14 @@ layout: default pagination: enabled: true + collection: posts + permalink: /page/:num/ + per_page: 3 + sort_field: date + sort_reverse: true + trail: + before: 1 # The number of links before the current page + after: 3 # The number of links after the current page ---