Skip to content

Commit 0574852

Browse files
alshedivatalshedivat
committed
Upgrade project grid
1 parent 3a133cc commit 0574852

14 files changed

+108
-107
lines changed

‎_config.yml

+32-18
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,6 @@ permalink: /blog/:year/:title/
6262
# Pagination
6363
pagination:
6464
enabled: true
65-
collection: 'posts'
66-
permalink: /page/:num/
67-
per_page: 3
68-
sort_field: 'date'
69-
sort_reverse: true
70-
trail:
71-
before: 1 # The number of links before the current page
72-
after: 3 # The number of links after the current page
7365

7466
# Comments
7567
disqus_shortname: al-folio # put your disqus shortname
@@ -152,20 +144,42 @@ scholar:
152144

153145
enable_google_analytics: false
154146
enable_katex: true
155-
enable_mansory: false
156-
enable_progressbar: false
147+
enable_mansory: true
148+
enable_progressbar: true
157149
enable_tooltips: false
158150
show_social_icons: false
159151

160152
# -----------------------------------------------------------------------------
161153
# Library versions
162154
# -----------------------------------------------------------------------------
163155

164-
academicons_version: "1.8.6"
165-
bootstrap_version: "4.4.1"
166-
fontawesome_version: "5.11.2"
167-
highlight_version: "9.15.10"
168-
jquery_version: "3.4.1"
169-
katex_version: "0.11.1"
170-
mdb_version: "4.8.10"
171-
popper_version: "1.15.0"
156+
academicons:
157+
version: "1.8.6"
158+
integrity: "sha256-uFVgMKfistnJAfoCUQigIl+JfUaP47GrRKjf6CTPVmw="
159+
bootstrap:
160+
version: "4.4.1"
161+
integrity:
162+
css: "sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh"
163+
js: "sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
164+
fontawesome:
165+
version: "5.13.0"
166+
integrity: "sha256-h20CPZ0QyXlBuAw7A+KluUYx/3pK+c7lYEpqLTlxjYQ="
167+
jquery:
168+
version: "3.4.1"
169+
integrity: "sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n"
170+
katex:
171+
version: "0.11.1"
172+
integrity:
173+
css: "sha256-V8SV2MO1FUb63Bwht5Wx9x6PVHNa02gv8BgH/uH3ung="
174+
js: "sha256-F/Xda58SPdcUCr+xhSGz9MA2zQBPb0ASEYKohl8UCHc="
175+
mansory:
176+
version: "4.2.2"
177+
integrity: "sha256-Nn1q/fx0H7SNLZMQ5Hw5JLaTRZp0yILA/FRexe19VdI="
178+
mdb:
179+
version: "4.17.0"
180+
integrity:
181+
css: "sha256-/SwJ2GDcEt5382i8zqDwl36VJGECxEoIcBIuoLmLR4g="
182+
js: "sha256-UGNYR+uy841zU5TiO2yXD96UktHt9TM4/WXvsDLr4l0="
183+
popper:
184+
version: "2.4.0"
185+
integrity: "sha256-OH05DFHUWzr725HmuHo3pnuvUUn+TJuj8/Qz9xytFEw="

‎_includes/head.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<meta name="description" content="{{ site.description }}">
77

88
<!-- Bootstrap & MDB -->
9-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.bootstrap_version }}/css/bootstrap.min.css">
10-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/{{ site.mdb_version }}/css/mdb.min.css">
9+
<link href="https://stackpath.bootstrapcdn.com/bootstrap/{{ site.bootstrap.version }}/css/bootstrap.min.css" rel="stylesheet" integrity="{{ site.bootstrap.integrity.css }}" crossorigin="anonymous">
10+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/{{ site.mdb.version }}/css/mdb.min.css" integrity="{{ site.mdb.integrity.css }}" crossorigin="anonymous" />
1111

1212
<!-- Fonts & Icons -->
13-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/{{ site.fontawesome_version }}/css/all.min.css">
14-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/academicons/{{ site.academicons_version }}/css/academicons.min.css">
13+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/{{ site.fontawesome.version }}/css/all.min.css" integrity="{{ site.fontawesome.integrity }}" crossorigin="anonymous">
14+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/academicons/{{ site.academicons.version }}/css/academicons.min.css" integrity="{{ site.academicons.integrity }}" crossorigin="anonymous">
1515
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Roboto+Slab:100,300,400,500,700|Material+Icons">
1616

1717
<!-- Styles -->

‎_includes/header.html

+5-11
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
{% endif %}
3131
</a>
3232
</li>
33+
{% if site.blog_name %}
3334
<!-- Blog -->
3435
<li class="nav-item {% if page.url contains 'blog' %}active{% endif %}">
3536
<a class="nav-link" href="{{ '/blog/' | relative_url }}">
@@ -39,9 +40,11 @@
3940
{% endif %}
4041
</a>
4142
</li>
43+
{% endif %}
4244
<!-- Other pages -->
43-
{% for p in site.pages %}
44-
{% if p.nav %}
45+
{% assign sorted_pages = site.pages | sort: "title" %}
46+
{% for p in sorted_pages %}
47+
{% if p.nav and p.autogen == nil %}
4548
<li class="nav-item {% if page.title == p.title %}active{% endif %}">
4649
<a class="nav-link" href="{{ p.url | relative_url }}">
4750
{{ p.title }}
@@ -57,13 +60,4 @@
5760
</div>
5861
</nav>
5962

60-
{% if site.enable_progressbar %}
61-
<!-- Scrolling Progress Bar -->
62-
<progress id="progress" value="0">
63-
<div class="progress-container">
64-
<span class="progress-bar"></span>
65-
</div>
66-
</progress>
67-
{% endif %}
68-
6963
</header>

‎_includes/hemline.html

+20-11
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!-- Load Core and Bootstrap JS -->
2-
<script src="https://code.jquery.com/jquery-{{ site.jquery_version }}.slim.min.js"></script>
3-
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/{{ site.popper_version }}/umd/popper.min.js"></script>
4-
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.bootstrap_version }}/js/bootstrap.min.js"></script>
5-
<script src="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/{{ site.mdb_version }}/js/mdb.min.js"></script>
2+
<script src="https://code.jquery.com/jquery-{{ site.jquery.version }}.slim.min.js" integrity="{{ site.jquery.integrity }}" crossorigin="anonymous"></script>
3+
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/{{ site.popper.version }}/umd/popper.min.js" integrity="{{ site.popper.integrity }}" crossorigin="anonymous"></script>
4+
<script src="https://stackpath.bootstrapcdn.com/bootstrap/{{ site.bootstrap.version }}/js/bootstrap.min.js" integrity="{{ site.bootstrap.integrity.js }}" crossorigin="anonymous"></script>
5+
<script src="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/{{ site.mdb.version }}/js/mdb.min.js" integrity="{{ site.bootstrap.integrity.js }}" crossorigin="anonymous"></script>
66

77
<!-- Load Common JS -->
88
<script src="{{ '/assets/js/common.js' | relative_url }}"></script>
@@ -12,19 +12,28 @@
1212

1313
{% if site.enable_katex %}
1414
<!-- Load KaTeX -->
15-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/{{ site.katex_version }}/katex.min.css" integrity="sha256-V8SV2MO1FUb63Bwht5Wx9x6PVHNa02gv8BgH/uH3ung=" crossorigin="anonymous" />
16-
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/{{ site.katex_version }}/katex.min.js" integrity="sha256-F/Xda58SPdcUCr+xhSGz9MA2zQBPb0ASEYKohl8UCHc=" crossorigin="anonymous"></script>
15+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/{{ site.katex.version }}/katex.min.css" integrity="{{ site.katex.integrity.css }}" crossorigin="anonymous" />
16+
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/{{ site.katex.version }}/katex.min.js" integrity="{{ site.katex.integrity.js }}" crossorigin="anonymous"></script>
1717
<script src="{{ '/assets/js/katex.js' | relative_url }}"></script>
1818
{% endif %}
1919

2020
{% if site.enable_mansory %}
2121
<!-- Load Mansory -->
22-
<script src="https://cdnjs.cloudflare.com/ajax/libs/masonry/4.2.2/masonry.pkgd.min.js" integrity="sha256-Nn1q/fx0H7SNLZMQ5Hw5JLaTRZp0yILA/FRexe19VdI=" crossorigin="anonymous"></script>
23-
{% endif %}
22+
<script src="https://cdnjs.cloudflare.com/ajax/libs/masonry/{{ site.mansory.version }}/masonry.pkgd.min.js" integrity="{{ site.masonry.integrity }}" crossorigin="anonymous"></script>
2423

25-
{% if site.enable_progressbar %}
26-
<!-- Load Progress Bar -->
27-
<script src="{{ '/assets/js/progressbar.js' | relative_url }}"></script>
24+
<!-- Project Cards Layout -->
25+
<script type="text/javascript">
26+
// Init Masonry
27+
var $grid = $('.grid').masonry({
28+
gutter: 10,
29+
horizontalOrder: true,
30+
itemSelector: '.grid-item',
31+
});
32+
// layout Masonry after each image loads
33+
$grid.imagesLoaded().progress( function() {
34+
$grid.masonry('layout');
35+
});
36+
</script>
2837
{% endif %}
2938

3039
{% if site.enable_tooltips %}

‎_layouts/distill.html

+13-17
Original file line numberDiff line numberDiff line change
@@ -55,27 +55,23 @@
5555

5656
<!-- Content -->
5757

58-
<div class="container-fluid">
58+
<div class="post distill">
5959

60-
<div class="post distill">
60+
<d-title>
61+
<h1>{{ page.title }}</h1>
62+
<p>{{ page.description }}</p>
63+
</d-title>
6164

62-
<d-title>
63-
<h1>{{ page.title }}</h1>
64-
<p>{{ page.description }}</p>
65-
</d-title>
65+
<d-byline></d-byline>
6666

67-
<d-byline></d-byline>
67+
<d-article>
68+
{{ content }}
69+
</d-article>
6870

69-
<d-article>
70-
{{ content }}
71-
</d-article>
72-
73-
<d-appendix>
74-
<d-footnote-list></d-footnote-list>
75-
<d-citation-list></d-citation-list>
76-
</d-appendix>
77-
78-
</div>
71+
<d-appendix>
72+
<d-footnote-list></d-footnote-list>
73+
<d-citation-list></d-citation-list>
74+
</d-appendix>
7975

8076
</div>
8177

‎_projects/1_project.markdown

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: page
33
title: Project 1
44
description: a project with a background image
55
img: /assets/img/12.jpg
6+
importance: 1
67
---
78

89
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.

‎_projects/2_project.markdown

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: page
33
title: Project 2
44
description: a project with a background image
55
img: /assets/img/2.jpg
6+
importance: 2
67
---
78

89
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.

‎_projects/3_project.markdown

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ title: Project 3
44
description: a project that redirects to another website
55
img:
66
redirect: https://unsplash.com
7+
importance: 3
78
---
89

910
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.

‎_projects/4_project.markdown

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: page
33
title: Project 4
44
description: another without an image
55
img:
6+
importance: 3
67
---
78

89
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.

‎_projects/5_project.markdown

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: page
33
title: Project 5
44
description: a project with a background image
55
img: /assets/img/1.jpg
6+
importance: 3
67
---
78

89
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.

‎_projects/6_project.markdown

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: page
33
title: Project 6
44
description: a project with no image
55
img:
6+
importance: 4
67
---
78

89
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.

‎_sass/_base.scss

+20
Original file line numberDiff line numberDiff line change
@@ -217,3 +217,23 @@ footer.sticky-bottom {
217217
text-decoration: none;
218218
}
219219
}
220+
221+
222+
// Projects
223+
224+
.projects {
225+
.grid-item {
226+
width: 250px;
227+
margin-bottom: 10px;
228+
a {
229+
color: black;
230+
text-decoration: none;
231+
&:hover {
232+
color: $theme-color;
233+
}
234+
}
235+
}
236+
.card img {
237+
width: 100%;
238+
}
239+
}

‎assets/js/progressbar.js

-46
This file was deleted.

‎blog/index.html

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
layout: default
33
pagination:
44
enabled: true
5+
collection: posts
6+
permalink: /page/:num/
7+
per_page: 3
8+
sort_field: date
9+
sort_reverse: true
10+
trail:
11+
before: 1 # The number of links before the current page
12+
after: 3 # The number of links after the current page
513
---
614

715
<div class="post">

0 commit comments

Comments
 (0)