Skip to content

Commit e492b8b

Browse files
ayushsubediayushsubedi
authored
Merge pull request #188 from crypticsy/master
Updates on Team, GitHub Projects, and UI Enhancements
2 parents 7bb184b + 87dd9a0 commit e492b8b

File tree

11 files changed

+209
-138
lines changed

11 files changed

+209
-138
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ _site
33
.jekyll-cache
44
.jekyll-metadata
55
vendor
6-
_drafts/
6+
_drafts/
7+
.DS_Store

‎_data/sitetext.yml‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,16 @@ header:
66

77
services:
88
title: "Our work"
9-
text: "As a community of volunteers we believe in creating opportunities and public goods. Use them or contribute to them."
9+
text: "As a community of volunteers we believe in creating opportunities and public goods."
1010
section: work
1111
list:
12-
- title: "[NepalMap](https://nepalmap.org/)"
12+
- title: "[NepalMap](https://github.com/CodeforNepal/nepalmap_federal)"
1313
desc: "Explore and understand Nepal using data"
14+
icon: fas fa-map-marker-alt
1415

15-
- title: "[Hawkins Fellowship](https://codefornepal.org/fellowship/)"
16-
desc: "Fellowship for underprivliged youths"
17-
18-
- title: "[Sangraha](http://sangraha.org/)"
16+
- title: "[Sangraha](https://github.com/CodeforNepal/akshara-project)"
1917
desc: "Access Nepali poems and literature"
20-
21-
- title: "[AskNepal](https://asknepal.info/en)"
22-
desc: "Ask Nepal helps you make a Freedom of Information request."
23-
icon: fab fa-markdown
18+
icon: fas fa-book-open
2419

2520
portfolio:
2621
title: "Stories"
@@ -49,7 +44,7 @@ timeline:
4944
desc: "We launched open data and civic tech products, [organized conferences](https://digitalnepal.org/), and [hackathon](http://hackfornepal.org/), collaborated with partners such as [Purdue University](https://sbaniya.com/2017/03/09/featured-content-2/) and gave scholarships to young women and men."
5045
image: assets/img/timeline/3.jpg
5146
alt: image alt text
52-
align: right
47+
align: left
5348
end: "[Join us](https://codefornepal.github.io/joinus/) <br> and shape <br> our story!"
5449

5550
about:
@@ -84,4 +79,4 @@ footer:
8479
icon: "fab fa-github"
8580
- url: http://instagram.com/codefornepal
8681
icon: "fab fa-instagram"
87-
license: "This work is licensed under a Creative Commons Attribution - ShareAlike 3.0 License! Code for Nepal is a registered 501(c)(3) nonprofit organization. EIN: 47-3620037"
82+
license: "This work is licensed under a Creative Commons Attribution - ShareAlike 3.0 License! <br> Code for Nepal is a registered 501(c)(3) nonprofit organization. <br> EIN: 47-3620037"

‎_data/team.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ people:
1111
image: "/assets/img/team/aman.jpg"
1212
linkedin_url: https://www.linkedin.com/in/aman-giri-ag/
1313

14+
- name: Animesh S. Basnet
15+
image: "/assets/img/team/animesh.png"
16+
linkedin_url: https://www.linkedin.com/in/animeshbasnet/
17+
1418
- name: Anup Dhamala
1519
image: "/assets/img/team/placeholder.png"
1620
linkedin_url:

‎_includes/fellowship_details.html‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,13 @@ <h2 class="fellowship-heading ">Application Details</h2>
3838
</div>
3939

4040
<div style="background-color:#FCFBFB; width: 100%;">
41-
<div class="fellowship-section">
42-
<div class="text-center" style="margin-bottom: 80px;">
43-
<h2 class="fellowship-heading " style="padding-top: 40px;">APPLY NOW</h2>
44-
</div>
45-
<div style="display: flex;
46-
justify-content: center;">
47-
<iframe src="https://docs.google.com/forms/d/e/1FAIpQLScmp_2drrZYjZmCdrB7FI92L4YwWQ74i1IwdihW5P8qNn48Hw/viewform" width="1240" height="3581" frameborder="0" marginheight="0" marginwidth="0">Loading…</iframe>
41+
<div class="fellowship-section">
42+
<div class="text-center" style="margin-bottom: 80px;">
43+
<h2 class="fellowship-heading" style="padding-top: 40px;">APPLY NOW</h2>
4844
</div>
49-
</div>
45+
<div style="display: flex; justify-content: center;">
46+
<iframe src="https://docs.google.com/forms/d/e/1FAIpQLScmp_2drrZYjZmCdrB7FI92L4YwWQ74i1IwdihW5P8qNn48Hw/viewform" width="1240" height="3581" frameborder="0" marginheight="0" marginwidth="0">
47+
</iframe>
48+
</div>
49+
</div>
50+
</div>

‎_includes/footer.html‎

Lines changed: 58 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,66 @@
1-
<!-- Footer -->
2-
<footer class="footer" id="footer">
3-
<div class="container">
4-
<div class="row align-items-center">
5-
<div class="col-md-4">
6-
<span class="copyright">Copyright &copy; {{ site.title }} {{ 'now' | date: "%Y" }}</span>
7-
</div>
8-
<!-- Social Media -->
9-
<div class="col-md-4">
10-
<ul class="list-inline social-buttons">
11-
{% for link in site.data.sitetext.footer.social %}
12-
<li class="list-inline-item">
13-
{% if link.url %}
14-
<a href="{{ link.url }}">
15-
{% if link.icon %}<i class="{{ link.icon }}"></i>{% endif %}
16-
</a>
17-
{% endif %}
18-
</li>
19-
{% endfor %}
20-
<div class="mt-2">
21-
{% include donations.html %}
1+
<!-- Footer -->
2+
<footer class="footer" id="footer">
3+
<div class="container mt-4">
4+
<div class="row align-items-center">
5+
<div class="col-md-4">
6+
<span class="copyright"
7+
>Copyright &copy; {{ site.title }} {{ 'now' | date: "%Y" }}</span
8+
>
229
</div>
23-
</ul>
24-
</div>
25-
<!-- Legal -->
26-
<div class="col-md-4">
27-
<ul class="list-inline quicklinks">
28-
<li class="list-inline-item">
29-
<a href="{{ site.baseurl }}/codeofconduct/" target="_blank">{{ site.data.sitetext.footer.legal_title }}</a>
30-
</li>
31-
</ul>
32-
<ul class="list-inline quicklinks">
33-
<li class="list-inline-item">
34-
<a href="{{ site.baseurl }}/privacy/" target="_blank">{{ site.data.sitetext.footer.privacy }}</a>
35-
</li>
36-
</ul>
37-
</div>
38-
<div class="col-md-11">
39-
<span class="code">{{ site.data.sitetext.footer.license }}</span>
40-
</div>
10+
11+
<!-- Social Media -->
12+
<div class="col-md-4">
13+
<ul class="list-inline social-buttons">
14+
{% for link in site.data.sitetext.footer.social %}
15+
<li class="list-inline-item">
16+
{% if link.url %}
17+
<a href="{{ link.url }}">
18+
{% if link.icon %}<i class="{{ link.icon }}"></i>{% endif %}
19+
</a>
20+
{% endif %}
21+
</li>
22+
{% endfor %}
23+
<div class="mt-2">{% include donations.html %}</div>
24+
</ul>
25+
</div>
26+
27+
<!-- Legal -->
28+
<div class="col-md-4">
29+
<ul class="list-inline quicklinks">
30+
<li class="list-inline-item">
31+
<a href="{{ site.baseurl }}/codeofconduct/" target="_blank"
32+
>{{ site.data.sitetext.footer.legal_title }}</a
33+
>
34+
</li>
35+
</ul>
36+
<ul class="list-inline quicklinks">
37+
<li class="list-inline-item">
38+
<a href="{{ site.baseurl }}/privacy/" target="_blank"
39+
>{{ site.data.sitetext.footer.privacy }}</a
40+
>
41+
</li>
42+
</ul>
43+
</div>
44+
45+
<div class="col-md-11 mt-4">
46+
<span class="code">{{ site.data.sitetext.footer.license }}</span>
4147
</div>
4248
</div>
43-
</footer>
49+
</div>
50+
</footer>
51+
4452
{% if page.layout == "page" %}
4553
<script>
46-
fixPageShort();
47-
function fixPageShort() {
48-
if(window.innerHeight > document.body.offsetHeight) {
49-
document.getElementById("footer").style.position="fixed";
50-
document.getElementById("footer").style.bottom=0;
51-
document.getElementById("footer").style.right=0;
52-
document.getElementById("footer").style.left=0;
53-
document.getElementById("footer").style.width="100%";
54+
fixPageShort();
55+
function fixPageShort() {
56+
if (window.innerHeight > document.body.offsetHeight) {
57+
document.getElementById("footer").style.position = "fixed";
58+
document.getElementById("footer").style.bottom = 0;
59+
document.getElementById("footer").style.right = 0;
60+
document.getElementById("footer").style.left = 0;
61+
document.getElementById("footer").style.width = "100%";
62+
}
5463
}
55-
}
5664
</script>
5765
{% endif %}
58-
<!-- End Footer -->
66+
<!-- End Footer -->

‎_includes/project.html‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
1-
<div class="list-group-flush mt-4 mb-4">
2-
<!-- <a href="https://nepalmap.org/" target="_blank" rel="noopener noreferrer" class="list-group-item list-group-item-action text-center no-logo p-5">
3-
<span>Nepal</span>Map
1+
<div class="row text-center justify-content-center">
2+
{% for service in site.data.sitetext.services.list %}
3+
<div class="col-md-4 col-lg-3 mb-4">
4+
{% assign title_html = service.title | markdownify %}
5+
{% assign url = title_html | split: 'href="' | last | split: '"' | first %}
6+
{% assign title_text = service.title | markdownify | strip_html %}
7+
8+
<a href="{{ url }}" target="_blank" rel="noopener noreferrer" class="text-decoration-none text-dark d-block h-100">
9+
<div class="service-item h-100 d-flex flex-column align-items-center justify-content-center p-3">
10+
<span class="fa-stack fa-4x mb-3">
11+
<i class="fas fa-circle fa-stack-2x text-primary"></i>
12+
<i class="{{ service.icon }} fa-stack-1x fa-inverse"></i>
13+
</span>
14+
<h4 class="service-heading mb-3">{{ title_text }}</h4>
15+
<p class="text-muted">{{ service.desc }}</p>
16+
</div>
417
</a>
5-
<a href="http://sangraha.org/" target="_blank" rel="noopener noreferrer" class="list-group-item list-group-item-action pt-4 pb-3">
6-
<svg id="svg2" xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" version="1.1" viewBox="0 0 200.00002 69.999998" style="max-height: 5rem;"><g id="layer1" transform="translate(0 -982.36)"><g id="text4136"><path id="path4160" d="m44.959 1009.2q-2.3438 0.3906-3.9063 0.3906-3.2031 0-6.1719-1.3672-1.7969 4.2969-6.0156 6.4453-4.2188 2.1484-10.859 2.1484 4.5313 5.3907 6.9922 6.9141 2.4609 1.4844 4.7656 1.4844 3.6719 0 6.25-4.336l1.5234 1.211q-3.2031 7.0312-11.055 7.0312-3.3203 0-6.2109-1.3671-2.8906-1.3672-6.0938-4.8829-5.5078-6.3672-8.1641-7.0312l0.625-2.0703q4.1406 1.289 7.2266 1.289 5.8203 0 9.6484-3.2031 3.8672-3.2422 3.8672-8.3203 0-1.7578-0.54688-3.4375-0.50781-1.6797-1.5625-3.1641-1.0156-1.5234-2.5-2.6953-1.4453-1.2109-3.2812-1.9141-1.7969-0.74219-2.5-0.74219h-11.367v-3.0859h54.883v3.0859h-8.4766v32.813q0 1.289 1.6016 2.2265 1.6406 0.8985 3.9063 0.8985v1.6015h-18.008v-1.6015q1.9922 0 3.7109-0.7813 1.7188-0.7812 1.7188-2.3437v-15.195zm0-3.125v-14.492h-21.836q5.9766 1.25 9.2188 4.8047 3.2812 3.5547 3.2812 8.8281 2.3438 1.6797 5.4297 1.6797 1.6406 0 3.9063-0.8203z" fill="black" stroke="black" stroke-opacity="0.5"></path><path class="AnimatedStroke__3zv3D" id="path4162" d="m108.51 991.58h-14.219v8.5938h-12.5q-3.3203 0-5.5859 1.1328-2.2266 1.1328-2.2266 2.7734 0 1.6016 2.3438 2.7735 2.3828 1.1328 5.4688 1.1328h4.6875q4.5703 0 7.7344 2.6172 3.2031 2.5781 3.2031 6.3672 0 5-5.0781 8.5546-5.0781 3.5547-12.109 3.5547-8.3984 0-14.375-6.25-5.9375-6.25-6.7188-15.234l2.3438-0.3907q0.70312 7.7344 6.25 13.047 5.5469 5.3125 12.891 5.3125 4.1016 0 6.9141-2.3828 2.8516-2.4219 2.8516-5.8203 0-2.7735-1.8359-4.6875-1.7969-1.9531-4.4141-1.9531h-6.6406q-4.3359 0-7.4609-2.1875-3.0859-2.1875-3.0859-5.2344 0-2.5781 3.0469-4.4141 3.0469-1.8359 7.5-1.8359h9.7656v-5.4688h-29.766v-3.125h51.016v3.125zm-8.4375 16.953q-1.4063 0-2.4219-1.0157-1.0156-1.0156-1.0156-2.4218 0-1.4063 1.0156-2.4219t2.4219-1.0156q1.4062 0 2.4219 1.0156 1.0156 1.0156 1.0156 2.4219 0 1.4062-1.0156 2.4218-1.0156 1.0157-2.4219 1.0157zm1.7969 20.547z" fill="black" stroke="black" stroke-opacity="0.5"></path><path class="AnimatedStroke__3zv3D" id="path4164" d="m103.12 1049.3h-7.8125l-17.188-13.281-2.3438 1.5625h-4.6875l4.6875-3.9063h7.8125l19.531 15.625z" fill="black" stroke="black" stroke-opacity="0.5"></path><path class="AnimatedStroke__3zv3D" id="path4166" d="m119.29 1004.8q-2.0703 0-3.3984 2.2656-1.3281 2.2266-1.3281 4.8047 0 2.5 1.3281 4.7657 1.3281 2.2656 3.3984 2.2656 1.9922 0 3.3594-2.1094t1.3672-4.9219-1.3281-4.9218q-1.3281-2.1485-3.3984-2.1485zm23.047-13.281h-19.922q5.9766 1.0938 10 5.1172 4.0625 3.9843 4.0625 8.9843 0 6.4844-5.0391 11.055-5.0391 4.5313-12.148 4.5313-4.8047 0-8.2813-2.7735-3.4766-2.7734-3.4766-6.7187 0-3.8281 3.0859-6.7188 3.0859-2.8906 7.4609-2.8906 4.1406 0 6.7969 2.9297 2.6562 2.9297 2.6562 6.8359h0.3125q1.6016-1.8359 1.6016-6.25 0-3.9453-2.2656-7.2265-2.2656-3.3203-5.8594-5.0781-3.5938-1.7969-5.1563-1.7969h-10.547v-3.0859h52.266v3.0859h-8.5156v32.813q0 1.4453 1.6797 2.3047 1.7188 0.8203 3.75 0.8203v1.6015h-17.891v-1.6015q1.9922 0 3.7109-0.7813 1.7188-0.7812 1.7188-2.3437v-5.8985q-16.758 13.438-30 13.438l-0.39063-4.6484q13.242 0 30.391-11.992v-23.711zm-3.5938 37.148z" fill="black" stroke="black" stroke-opacity="0.5"></path><path class="AnimatedStroke__3zv3D" id="path4168" d="m197.26 991.58h-9.6094v8.9844h-12.188q-2.2656 0-3.6328 0.8984-1.3672 0.8985-1.3672 2.2266 0 1.5625 1.9531 3.125 2.1875-0.3906 4.2969-0.3906 7.2266 0 11.406 2.7734 4.2188 2.7344 4.2188 7.3828 0 4.0625-3.2812 6.7188-3.2422 2.6562-7.6562 2.6562-4.1797 0-7.0312-2.3437v-1.9531q1.6016 1.1718 4.2969 1.1718t4.6484-1.8359q1.9922-1.875 1.9922-4.4141 0-3.2422-2.7344-5.5078-2.6953-2.3047-6.6406-2.3047-4.6875 0-8.2031 2.6563-3.5156 2.6172-3.5156 6.7187 0 4.8047 4.5703 8.2813 4.6094 3.4375 11.055 3.4375 8.5547 0 12.5-3.125l-2.3438 5.4687h-10.547q-11.133 0-16.719-3.3203-5.5469-3.3203-5.5469-9.9609 0-3.5156 2.6953-6.4063 2.6953-2.9297 7.0703-4.1406-3.9062-1.9531-3.9062-5.0781 0-2.2656 2.3828-3.8672t5.8203-1.6016h9.375v-6.25h-25.625v-3.125h42.266v3.125z" fill="black" stroke="black" stroke-opacity="0.5"></path></g></g></svg>
7-
</a> -->
8-
<a href="https://asknepal.info/" target="_blank" rel="noopener noreferrer" class="list-group-item list-group-item-action text-center"><img src="https://asknepal.info/assets/logo@2-ed80b092ec146211381dae1ef0d4953a72b038fe4a1bb3e3fe56bade20845517.png"/></a>
918
</div>
19+
{% endfor %}
20+
</div>

‎assets/img/team/animesh.png‎

275 KB
Loading

‎blog/index.html‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
enabled: true
66
---
77
<div class="row">
8-
<div class="col-md-12">
8+
<div class="col-md-12 mb-4">
99
<h1 class="text-center mb-4">Blog</h1>
1010
</div>
1111

@@ -22,19 +22,25 @@ <h3 class="card-title"><a href="{{ post.url | relative_url }}">{{ post.title }}<
2222
{% endfor %}
2323
</div>
2424

25-
<div class="row">
26-
{% if paginator.total_pages > 1 %}
27-
<ul class="paginator-links-list d-flex justify-content-between">
28-
{% if paginator.previous_page %}
29-
<li>
30-
<a class="paginator-link btn btn-primary" href="{{ paginator.previous_page_path | prepend: site.baseurl }}">Previous</a>
31-
</li>
32-
{% endif %}
33-
{% if paginator.next_page %}
34-
<li>
35-
<a class="btn btn-primary" href="{{ paginator.next_page_path | prepend: site.baseurl }}">Next</a>
36-
</li>
25+
<div class="row mb-4">
26+
{% if paginator.total_pages > 1 %}
27+
<div class="col-12">
28+
<ul class="paginator-links-list d-flex justify-content-center list-unstyled">
29+
{% if paginator.previous_page %}
30+
<li>
31+
<a class="paginator-link btn btn-primary" href="{{ paginator.previous_page_path | prepend: site.baseurl }}">
32+
Previous
33+
</a>
34+
</li>
35+
{% endif %}
36+
{% if paginator.next_page %}
37+
<li>
38+
<a class="ml-4 btn btn-primary" href="{{ paginator.next_page_path | prepend: site.baseurl }}">
39+
Next
40+
</a>
41+
</li>
42+
{% endif %}
43+
</ul>
44+
</div>
3745
{% endif %}
38-
</ul>
39-
{% endif %}
40-
</div>
46+
</div>

‎fellowship2025/index.html‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
layout: page
33
title: Fellowship
44
---
5-
<style>
6-
div.fellowship-section{
7-
font-size: 16px;
8-
font-weight: 400;
9-
margin-top: 0;
10-
/* font-style: italic; */
11-
margin-bottom: 140px;
12-
text-transform: none;
13-
line-height: 1.7;
145

15-
}
16-
p.section-text {
6+
<style>
7+
div.fellowship-section {
8+
font-size: 16px;
9+
font-weight: 400;
10+
margin-top: 0;
11+
/* font-style: italic; */
12+
margin-bottom: 140px;
13+
text-transform: none;
14+
line-height: 1.7;
15+
}
16+
p.section-text {
1717
font-size: 16px;
1818
margin-top: 0;
1919
margin-bottom: 20px;
@@ -24,21 +24,18 @@
2424
margin-top: 0;
2525
margin-bottom: 20px;
2626
}
27-
27+
2828
h3.fellowship-heading {
2929
font-size: 24px;
3030
margin-top: 0;
3131
margin-bottom: 20px;
3232
}
33-
.custom_li{
33+
.custom_li {
3434
margin-top: 4%;
35-
}
36-
</style>
35+
}
36+
</style>
3737

38-
{% include fellowship_about.html %}
39-
{% include fellowship_components.html %}
40-
{% include fellowship_outcomes.html %}
38+
{% include fellowship_about.html %}
39+
{% include fellowship_components.html %}
40+
{% include fellowship_outcomes.html %}
4141
{% include fellowship_details.html %}
42-
43-
44-

0 commit comments

Comments
 (0)