Skip to content

Commit 5c4690c

Browse files
TooTouchTooTouch
committed
dual part reorder
1 parent da22df9 commit 5c4690c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+7118
-6970
lines changed

‎.gitignore

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
*~
2-
*.gem
3-
.bundle
4-
.sass-cache
5-
_site
6-
Gemfile.lock
1+
*~
2+
*.gem
3+
.bundle
4+
.sass-cache
5+
_site
6+
Gemfile.lock

‎.idea/dna.github.io.iml

+11-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎COPYING

+674-674
Large diffs are not rendered by default.

‎Gemfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
source "https://rubygems.org"
2-
3-
require 'json'
4-
require 'open-uri'
5-
versions = JSON.parse(open('https://pages.github.com/versions.json').read)
6-
gem 'github-pages', versions['github-pages'], group: :jekyll_plugins
1+
source "https://rubygems.org"
2+
3+
require 'json'
4+
require 'open-uri'
5+
versions = JSON.parse(open('https://pages.github.com/versions.json').read)
6+
gem 'github-pages', versions['github-pages'], group: :jekyll_plugins

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
# DNA.github.io
1+
# DNA.github.io

‎_config.yml

+46-46
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
1-
# Welcome to Jekyll!
2-
#
3-
# This config file is meant for settings that affect your whole blog, values
4-
# which you are expected to set up once and rarely edit after that. If you find
5-
# yourself editing this file very often, consider using Jekyll's data files
6-
# feature for the data you need to update frequently.
7-
#
8-
# For technical reasons, this file is *NOT* reloaded automatically when you use
9-
# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
10-
11-
# Site settings
12-
# These are used to personalize your new site. If you look in the HTML files,
13-
# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
14-
# You can create any custom variable you would like, and they will be accessible
15-
# in the templates via {{ site.myvariable }}.
16-
title: DataNetworkAnalysis
17-
description: > # this means to ignore newlines until "baseurl:"
18-
Material theme based on <a href="http://materializecss.com">Materialize.css</a> for jekyll sites
19-
baseurl: ""
20-
url: "https://datanetworkanalysis.github.io"
21-
permalink: /:year/:month/:day/:title
22-
repository:
23-
paginate: 5
24-
25-
# MatJek specific configurations
26-
github_profile: "https://github.com/DataNetworkAnalysis"
27-
user: "DNA"
28-
user_email: "[email protected]"
29-
contact_url: "https://jaehyukheo.typeform.com/to/IWCIaB"
30-
google_tracking_id: "UA-153506145-1"
31-
google_site_verification: "UA-153506145-1"
32-
disqus_shortname: "DNAteam"
33-
34-
# Build settings
35-
markdown: kramdown
36-
gems:
37-
- jekyll-feed
38-
- jekyll-paginate
39-
- jekyll-seo-tag
40-
- jekyll-sitemap
41-
exclude:
42-
- Gemfile
43-
- Gemfile.lock
44-
sass:
45-
style: compressed
46-
future: true
1+
# Welcome to Jekyll!
2+
#
3+
# This config file is meant for settings that affect your whole blog, values
4+
# which you are expected to set up once and rarely edit after that. If you find
5+
# yourself editing this file very often, consider using Jekyll's data files
6+
# feature for the data you need to update frequently.
7+
#
8+
# For technical reasons, this file is *NOT* reloaded automatically when you use
9+
# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
10+
11+
# Site settings
12+
# These are used to personalize your new site. If you look in the HTML files,
13+
# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
14+
# You can create any custom variable you would like, and they will be accessible
15+
# in the templates via {{ site.myvariable }}.
16+
title: DataNetworkAnalysis
17+
description: > # this means to ignore newlines until "baseurl:"
18+
Material theme based on <a href="http://materializecss.com">Materialize.css</a> for jekyll sites
19+
baseurl: ""
20+
url: "https://datanetworkanalysis.github.io"
21+
permalink: /:year/:month/:day/:title
22+
repository:
23+
paginate: 5
24+
25+
# MatJek specific configurations
26+
github_profile: "https://github.com/DataNetworkAnalysis"
27+
user: "DNA"
28+
user_email: "[email protected]"
29+
contact_url: "https://jaehyukheo.typeform.com/to/IWCIaB"
30+
google_tracking_id: "UA-153506145-1"
31+
google_site_verification: "UA-153506145-1"
32+
disqus_shortname: "DNAteam"
33+
34+
# Build settings
35+
markdown: kramdown
36+
gems:
37+
- jekyll-feed
38+
- jekyll-paginate
39+
- jekyll-seo-tag
40+
- jekyll-sitemap
41+
exclude:
42+
- Gemfile
43+
- Gemfile.lock
44+
sass:
45+
style: compressed
46+
future: true

‎_includes/about.html

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
<div class="col s12 tag-div">
2-
<div class="user-pic center-align">
3-
<a href="{{site.github_profile}}" target="_blank"><img class="circle hoverable z-depth-1" src="{{site.baseurl}}/assets/res/user.png"></a>
4-
</div>
5-
<div class="user-intro center-align">
6-
<h4 class="hidden">DNA is</h4>
7-
</div>
8-
<div class="user-content">
9-
<h3 style="color:rgb(29, 85, 73)">WHAT IS DNA?</h3>
10-
<p>
11-
DNA means that an individual has his or her own direction, is the space to find and plan for what he or she wants, achieve goals, and deliver information to the next generation.
12-
</p>
13-
<p>
14-
<h3 style="color:rgb(29, 85, 73)">RULES</h3>
15-
<ul>
16-
<li>No discrimination in age, sex and academic background</li>
17-
<li>Study on various domains</li>
18-
<li>Various information sharing and feedback</li>
19-
</ul>
20-
</p>
21-
</div>
1+
<div class="col s12 tag-div">
2+
<div class="user-pic center-align">
3+
<a href="{{site.github_profile}}" target="_blank"><img class="circle hoverable z-depth-1" src="{{site.baseurl}}/assets/res/user.png"></a>
4+
</div>
5+
<div class="user-intro center-align">
6+
<h4 class="hidden">DNA is</h4>
7+
</div>
8+
<div class="user-content">
9+
<h3 style="color:rgb(29, 85, 73)">WHAT IS DNA?</h3>
10+
<p>
11+
DNA means that an individual has his or her own direction, is the space to find and plan for what he or she wants, achieve goals, and deliver information to the next generation.
12+
</p>
13+
<p>
14+
<h3 style="color:rgb(29, 85, 73)">RULES</h3>
15+
<ul>
16+
<li>No discrimination in age, sex and academic background</li>
17+
<li>Study on various domains</li>
18+
<li>Various information sharing and feedback</li>
19+
</ul>
20+
</p>
21+
</div>
2222
</div>

‎_includes/categories.html

+28-28
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
<div class="col s12 cat-div">
2-
<div class="cat-list">
3-
{% for cat in site.categories %}
4-
{% capture test %}{{cat[0] | slice: 0}}{% endcapture %}
5-
{% capture testup %}{{cat[0] | slice: 0 | upcase}}{% endcapture %}
6-
<a class="cat-chip" href="#{{cat[0] | slugify}}{% if test == testup %}_cap{% endif %}"><div class="chip z-depth-1">{{cat[0]}}</div></a>
7-
{% endfor %}
8-
</div>
9-
<div class="divider"></div>
10-
<div class="cat-index">
11-
{% for cat in site.categories %}
12-
{% capture test %}{{cat[0] | slice: 0}}{% endcapture %}
13-
{% capture testup %}{{cat[0] | slice: 0 | upcase}}{% endcapture %}
14-
<h4 id="{{cat[0] | slugify}}{% if test == testup %}_cap{% endif %}">{{cat[0]}}</h4>
15-
<ul class="cat-post">
16-
{% for post in cat[1] %}
17-
<a class="post-title" href="{{site.baseurl}}{{post.url}}" target="_blank">
18-
<li>
19-
{{post.title}}
20-
<small class="post-date">{{post.date | date_to_string}}</small>
21-
</li>
22-
</a>
23-
{% endfor %}
24-
</ul>
25-
{% endfor %}
26-
</div>
27-
</div>
28-
1+
<div class="col s12 cat-div">
2+
<div class="cat-list">
3+
{% for cat in site.categories %}
4+
{% capture test %}{{cat[0] | slice: 0}}{% endcapture %}
5+
{% capture testup %}{{cat[0] | slice: 0 | upcase}}{% endcapture %}
6+
<a class="cat-chip" href="#{{cat[0] | slugify}}{% if test == testup %}_cap{% endif %}"><div class="chip z-depth-1">{{cat[0]}}</div></a>
7+
{% endfor %}
8+
</div>
9+
<div class="divider"></div>
10+
<div class="cat-index">
11+
{% for cat in site.categories %}
12+
{% capture test %}{{cat[0] | slice: 0}}{% endcapture %}
13+
{% capture testup %}{{cat[0] | slice: 0 | upcase}}{% endcapture %}
14+
<h4 id="{{cat[0] | slugify}}{% if test == testup %}_cap{% endif %}">{{cat[0]}}</h4>
15+
<ul class="cat-post">
16+
{% for post in cat[1] %}
17+
<a class="post-title" href="{{site.baseurl}}{{post.url}}" target="_blank">
18+
<li>
19+
{{post.title}}
20+
<small class="post-date">{{post.date | date_to_string}}</small>
21+
</li>
22+
</a>
23+
{% endfor %}
24+
</ul>
25+
{% endfor %}
26+
</div>
27+
</div>
28+

‎_includes/footer.html

+42-42
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
</main>
2-
<footer class="page-footer teal">
3-
<div class="container">
4-
<div class="row">
5-
<div class="col s12">
6-
<img src="{{site.baseurl}}/assets/res/logo.png" alt="logo"/>
7-
<p class="grey-text text-lighten-4">{{site.description}}</p>
8-
</div>
9-
</div>
10-
</div>
11-
<div class="footer-copyright">
12-
<div class="container">
13-
&#xA9; {{"now" | date: "%Y"}} {{site.title}}. All rights reserved. Powered by <a href="https://github.com/ShawnTeoh/matjek">MatJek</a>.
14-
</div>
15-
</div>
16-
</footer>
17-
<script src="//code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
18-
<script src="//cdnjs.cloudflare.com/ajax/libs/materialize/0.99.0/js/materialize.min.js"></script>
19-
{% for js in layout.js %}
20-
{% if js contains "//" %}
21-
<script src="{{js}}"></script>
22-
{% else %}
23-
<script src="{{site.baseurl}}/assets/js/{{js}}"></script>
24-
{% endif %}
25-
{% endfor %}
26-
{% for js in page.js %}
27-
{% if js contains "//" %}
28-
<script src="{{js}}"></script>
29-
{% else %}
30-
<script src="{{site.baseurl}}/assets/js/{{js}}"></script>
31-
{% endif %}
32-
{% endfor %}
33-
{% if site.google_tracking_id %}
34-
<script>
35-
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})
36-
(window,document,'script','//www.google-analytics.com/analytics.js','ga');
37-
ga('create', '{{site.google_tracking_id}}', 'auto');
38-
ga('send', 'pageview');
39-
</script>
40-
{% endif %}
41-
<script src="{{site.baseurl}}/assets/js/main.js"></script>
42-
</body>
1+
</main>
2+
<footer class="page-footer teal">
3+
<div class="container">
4+
<div class="row">
5+
<div class="col s12">
6+
<img src="{{site.baseurl}}/assets/res/logo.png" alt="logo"/>
7+
<p class="grey-text text-lighten-4">{{site.description}}</p>
8+
</div>
9+
</div>
10+
</div>
11+
<div class="footer-copyright">
12+
<div class="container">
13+
&#xA9; {{"now" | date: "%Y"}} {{site.title}}. All rights reserved. Powered by <a href="https://github.com/ShawnTeoh/matjek">MatJek</a>.
14+
</div>
15+
</div>
16+
</footer>
17+
<script src="//code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
18+
<script src="//cdnjs.cloudflare.com/ajax/libs/materialize/0.99.0/js/materialize.min.js"></script>
19+
{% for js in layout.js %}
20+
{% if js contains "//" %}
21+
<script src="{{js}}"></script>
22+
{% else %}
23+
<script src="{{site.baseurl}}/assets/js/{{js}}"></script>
24+
{% endif %}
25+
{% endfor %}
26+
{% for js in page.js %}
27+
{% if js contains "//" %}
28+
<script src="{{js}}"></script>
29+
{% else %}
30+
<script src="{{site.baseurl}}/assets/js/{{js}}"></script>
31+
{% endif %}
32+
{% endfor %}
33+
{% if site.google_tracking_id %}
34+
<script>
35+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})
36+
(window,document,'script','//www.google-analytics.com/analytics.js','ga');
37+
ga('create', '{{site.google_tracking_id}}', 'auto');
38+
ga('send', 'pageview');
39+
</script>
40+
{% endif %}
41+
<script src="{{site.baseurl}}/assets/js/main.js"></script>
42+
</body>
4343
</html>

0 commit comments

Comments
 (0)