Skip to content

Commit 8c01a38

Browse files
brmatolacodeasashu
brmatola
authored and
codeasashu
committed
Refactoring (#10)
* Moved urls and social from _config.yml to _data/ * Cleaned up and refactored _layout/default.html into _includes/(css|header|js|main|meta).html * Removed links to my personal facebook, twitter, etc. * Dropped analytics to bottom of default.html for loading speed * added .gitignore to drop _site from tracking * added .gitignore to drop _site from tracking * actually removed _site/* from tracking
1 parent 820cbc2 commit 8c01a38

Some content is hidden

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

49 files changed

+265
-4439
lines changed

‎.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<<<<<<< HEAD
2+
_site/*
3+
=======
4+
_site/
5+
>>>>>>> c22baf3586a6803fe1400ab40691b19cd8ad5855

‎Gemfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
11
source 'https://rubygems.org'
2-
gem 'github-pages', group: :jekyll_plugins
2+
3+
group :jekyll_plugins do
4+
gem 'jekyll'
5+
gem 'jekyll-paginate'
6+
gem 'jekyll-gist'
7+
gem 'jekyll-watch'
8+
gem 'kramdown'
9+
gem 'rouge'
10+
end

‎Gemfile.lock

+10-87
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,12 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
RedCloth (4.2.9)
5-
activesupport (4.2.6)
6-
i18n (~> 0.7)
7-
json (~> 1.7, >= 1.7.7)
8-
minitest (~> 5.1)
9-
thread_safe (~> 0.3, >= 0.3.4)
10-
tzinfo (~> 1.1)
114
addressable (2.4.0)
12-
coffee-script (2.4.1)
13-
coffee-script-source
14-
execjs
15-
coffee-script-source (1.10.0)
165
colorator (0.1)
17-
ethon (0.8.1)
18-
ffi (>= 1.3.0)
19-
execjs (2.6.0)
206
faraday (0.9.2)
217
multipart-post (>= 1.2, < 3)
228
ffi (1.9.10)
23-
gemoji (2.1.0)
24-
github-pages (71)
25-
RedCloth (= 4.2.9)
26-
github-pages-health-check (= 1.1.0)
27-
jekyll (= 3.0.3)
28-
jekyll-coffeescript (= 1.0.1)
29-
jekyll-feed (= 0.5.1)
30-
jekyll-gist (= 1.4.0)
31-
jekyll-github-metadata (= 1.11.0)
32-
jekyll-mentions (= 1.1.2)
33-
jekyll-paginate (= 1.1.0)
34-
jekyll-redirect-from (= 0.10.0)
35-
jekyll-sass-converter (= 1.3.0)
36-
jekyll-seo-tag (= 1.3.3)
37-
jekyll-sitemap (= 0.10.0)
38-
jekyll-textile-converter (= 0.1.0)
39-
jemoji (= 0.6.2)
40-
kramdown (= 1.10.0)
41-
liquid (= 3.0.6)
42-
mercenary (~> 0.3)
43-
rdiscount (= 2.1.8)
44-
redcarpet (= 3.3.3)
45-
rouge (= 1.10.1)
46-
terminal-table (~> 1.4)
47-
github-pages-health-check (1.1.0)
48-
addressable (~> 2.3)
49-
net-dns (~> 0.8)
50-
octokit (~> 4.0)
51-
public_suffix (~> 1.4)
52-
typhoeus (~> 0.7)
53-
html-pipeline (2.4.0)
54-
activesupport (>= 2, < 5)
55-
nokogiri (>= 1.4)
56-
i18n (0.7.0)
57-
jekyll (3.0.3)
9+
jekyll (3.1.6)
5810
colorator (~> 0.1)
5911
jekyll-sass-converter (~> 1.0)
6012
jekyll-watch (~> 1.1)
@@ -63,71 +15,42 @@ GEM
6315
mercenary (~> 0.3.3)
6416
rouge (~> 1.7)
6517
safe_yaml (~> 1.0)
66-
jekyll-coffeescript (1.0.1)
67-
coffee-script (~> 2.2)
68-
jekyll-feed (0.5.1)
6918
jekyll-gist (1.4.0)
7019
octokit (~> 4.2)
71-
jekyll-github-metadata (1.11.0)
72-
octokit (~> 4.0)
73-
jekyll-mentions (1.1.2)
74-
html-pipeline (~> 2.3)
75-
jekyll (~> 3.0)
7620
jekyll-paginate (1.1.0)
77-
jekyll-redirect-from (0.10.0)
78-
jekyll (>= 2.0)
79-
jekyll-sass-converter (1.3.0)
80-
sass (~> 3.2)
81-
jekyll-seo-tag (1.3.3)
82-
jekyll (~> 3.0)
83-
jekyll-sitemap (0.10.0)
84-
jekyll-textile-converter (0.1.0)
85-
RedCloth (~> 4.0)
21+
jekyll-sass-converter (1.4.0)
22+
sass (~> 3.4)
8623
jekyll-watch (1.3.1)
8724
listen (~> 3.0)
88-
jemoji (0.6.2)
89-
gemoji (~> 2.0)
90-
html-pipeline (~> 2.2)
91-
jekyll (>= 3.0)
92-
json (1.8.1)
9325
kramdown (1.10.0)
9426
liquid (3.0.6)
9527
listen (3.0.6)
9628
rb-fsevent (>= 0.9.3)
9729
rb-inotify (>= 0.9.7)
9830
mercenary (0.3.6)
99-
mini_portile2 (2.0.0)
100-
minitest (5.4.3)
10131
multipart-post (2.0.0)
102-
net-dns (0.8.0)
103-
nokogiri (1.6.7.2)
104-
mini_portile2 (~> 2.0.0.rc2)
10532
octokit (4.3.0)
10633
sawyer (~> 0.7.0, >= 0.5.3)
107-
public_suffix (1.5.3)
10834
rb-fsevent (0.9.7)
10935
rb-inotify (0.9.7)
11036
ffi (>= 0.5.0)
111-
rdiscount (2.1.8)
112-
redcarpet (3.3.3)
11337
rouge (1.10.1)
11438
safe_yaml (1.0.4)
11539
sass (3.4.22)
11640
sawyer (0.7.0)
11741
addressable (>= 2.3.5, < 2.5)
11842
faraday (~> 0.8, < 0.10)
119-
terminal-table (1.5.2)
120-
thread_safe (0.3.5)
121-
typhoeus (0.8.0)
122-
ethon (>= 0.8.0)
123-
tzinfo (1.2.2)
124-
thread_safe (~> 0.1)
12543

12644
PLATFORMS
12745
ruby
12846

12947
DEPENDENCIES
130-
github-pages
48+
jekyll
49+
jekyll-gist
50+
jekyll-paginate
51+
jekyll-watch
52+
kramdown
53+
rouge
13154

13255
BUNDLED WITH
133-
1.11.2
56+
1.12.5

‎_config.yml

+6-39
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,15 @@
11
title: John Smith
22
description: My Personal Blog
33
author: John Smith
4-
logo: http://aboutashu.com/hcz-jekyll-blog/static/img/avatar.png
4+
logo: static/img/avatar.png
55
github: https://github.com/ashutosh2k12
66
about: Freelance developer
7+
8+
baseurl: ""
9+
url: "http://aboutashu.com/hcz-jekyll-blog"
10+
711
disqus_shortname: aboutashu
812
google_analytics: UA-72862926-1
9-
urls:
10-
- text: Home
11-
url: /
12-
icon: fa-home
13-
layout: post
14-
- text: About
15-
url: /about/
16-
icon: fa-comments
17-
- text: Projects
18-
url: /projects/
19-
icon: fa-desktop
20-
- text: Resume
21-
url: '#'
22-
icon: fa-graduation-cap
23-
- text: Github
24-
url: https://github.com/ashutosh2k12
25-
icon: fa-github
26-
- text: XML Feed
27-
url: /feed.xml
28-
icon: fa-feed
29-
target: _blank
30-
31-
social:
32-
- icon: fa-facebook
33-
link: '#'
34-
- icon: fa-skype
35-
link: '#'
36-
- icon: fa-twitter
37-
link: '#'
38-
- icon: fa-linkedin
39-
link: '#'
40-
- icon: fa-stack-exchange
41-
link: '#'
4213

4314
share:
4415
twitter_username: \#
@@ -48,12 +19,8 @@ share:
4819
enableTags: true
4920
tagarray: []
5021

51-
url: "http://aboutashu.com/hcz-jekyll-blog"
52-
baseurl: "/hcz-jekyll-blog"
5322
paginate: 20
5423
per_page: 20
5524
paginate_path: "/page:num/"
5625
markdown: kramdown
57-
gems:
58-
- jekyll-paginate
59-
- jekyll-gist
26+
gems: [jekyll-paginate, jekyll-gist]

‎_data/social.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[
2+
{
3+
"icon": "fa-facebook",
4+
"link": ""
5+
},
6+
{
7+
"icon": "fa-twitter",
8+
"link": ""
9+
},
10+
{
11+
"icon": "fa-linkedin",
12+
"link": ""
13+
},
14+
{
15+
"icon": "fa-stack-exchange",
16+
"link": ""
17+
}
18+
]

‎_data/urls.json

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[
2+
{
3+
"text": "Home",
4+
"url": "/",
5+
"icon": "fa-home",
6+
"layout": "post"
7+
},
8+
{
9+
"text": "About",
10+
"url": "/about/",
11+
"icon": "fa-comments"
12+
},
13+
{
14+
"text": "Projects",
15+
"url": "/projects",
16+
"icon": "fa-desktop"
17+
},
18+
{
19+
"text": "Resume",
20+
"url": "#",
21+
"icon": "fa-graduation-cap",
22+
"layout": "post"
23+
},
24+
{
25+
"text": "Github",
26+
"url": "",
27+
"icon": "fa-github"
28+
},
29+
{
30+
"text": "XML Feed",
31+
"url": "/feed.xml",
32+
"icon": "fa-feed",
33+
"target": _blank
34+
}
35+
]

‎_includes/css.html

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
2+
<!-- Custom Fonts -->
3+
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
4+
5+
<!-- FontAwesome icons -->
6+
<link rel="stylesheet" href="https://use.fontawesome.com/74dfc6cf47.css">
7+
8+
<!-- Core BootStrap CSS -->
9+
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
10+
<!-- Material Design CSS -->
11+
<link rel="stylesheet" href="/{{ site.baseurl }}static/css/bootstrap-material-design.min.css">
12+
13+
<!-- syntax highlighting CSS -->
14+
<link rel="stylesheet" href="/{{ site.baseurl }}static/css/syntax.css">
15+
16+
<!-- Custom CSS -->
17+
<link rel="stylesheet" href="/{{ site.baseurl }}static/css/thickbox.css">
18+
<link rel="stylesheet" href="/{{ site.baseurl }}static/css/main.css">
19+
<link rel="stylesheet" href="/{{ site.baseurl }}static/css/projects.css">
20+
21+
<script type="text/javascript">
22+
//loadingImage is relative to project dir
23+
var tb_pathToImage = "/{{ site.baseurl }}static/img/loadingAnimation.gif";
24+
</script>

‎_includes/header.html

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<div class="header-panel shadow-z-2">
2+
<div class="container">
3+
<div class="row">
4+
<div class="col-md-3 col-sm-4 col-xs-12">
5+
<div class="row-picture">
6+
<img id="about" class="logo-img" src="{{ site.logo }}" height="75px" width="75px">
7+
</div>
8+
<div class="row-details">
9+
<h4 class="list-group-item-heading">{{ site.author }}</h4>
10+
<p class="list-group-item-text">{{ site.about }}</p>
11+
{% include social_links.html %}
12+
</div>
13+
<div class="navbar-header pull-right">
14+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
15+
<span class="sr-only">Toggle navigation</span>
16+
<i class="fa fa-2x fa-bars"></i>
17+
</button>
18+
</div>
19+
</div>
20+
<div class="col-md-9 col-sm-8 col-xs-12">
21+
<h2 class="blog-title-pro">{{ page.title }}</h2>
22+
<p class="info">
23+
{% if page.date %}
24+
<span class="time">{{ page.date | date_to_string }}</span>
25+
{% endif %}
26+
{% if page.categories.size > 0 %}
27+
<span class="categories">
28+
&raquo;
29+
{% for category in page.categories %}
30+
<a href="category/{{ category }}">{{ category }}</a>
31+
{% if forloop.last == false %}, {% endif %}
32+
{% endfor %}
33+
</span>
34+
{% endif %}
35+
</p>
36+
</div>
37+
</div>
38+
</div>
39+
</div>

‎_includes/js.html

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
3+
<script src="//code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
4+
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
5+
<script src="/{{ site.baseurl }}static/js/thickbox-compressed.js"></script>
6+
<script src="/{{ site.baseurl }}static/js/material.min.js"></script>
7+
<script src="/{{ site.baseurl }}static/js/main.js"></script>
8+
<script src="/{{ site.baseurl }}static/js/projects.js"></script>

‎_includes/main.html

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<div class="container main outer">
2+
<div class="row">
3+
<div class="col-md-3 col-xs-12">
4+
{% include sidemenu.html %}
5+
</div>
6+
<div class="col-md-9 col-xs-12 full">
7+
{{ content }}
8+
<div class="row">
9+
<div class="col-md-12 col-xs-12 footer">
10+
<footer>
11+
© 2016 Brad Matola <a href="#">Privacy link</a> - Powered by Jekyll.
12+
</footer>
13+
<div align="center">
14+
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
15+
<ins class="adsbygoogle"
16+
style="display:block"
17+
data-ad-client="ca-pub-0776433630785969"
18+
data-ad-slot="9690958902"
19+
data-ad-format="auto"></ins>
20+
<script>(adsbygoogle = window.adsbygoogle || []).push({});</script>
21+
</div>
22+
</div>
23+
</div>
24+
</div> <!-- end /.col-md-9 -->
25+
</div> <!-- end /.row -->
26+
</div>

0 commit comments

Comments
 (0)