Skip to content

Commit

Permalink
Fixed scaling and front page on mobile
Browse files Browse the repository at this point in the history
  • Loading branch information
Iain Majer authored and Iain Majer committed Jul 10, 2017
1 parent 9203890 commit dd46da8
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 9 deletions.
Binary file modified .sass-cache/bfa1df8bfba26aeac0be1b3d5776e17e204042d1/home.scssc
Binary file not shown.
4 changes: 3 additions & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ app.get('/', function (req, res) {

//About Me page
app.get('/about', function (req, res) {
res.render('about', { site: site, title: 'About Me', url: req.url })
var languages = utils.getLanguages();
var tools = utils.getTools();
res.render('about', { site: site, title: 'About Me', url: req.url, langs: languages, tools: tools })
})

//About Me page
Expand Down
2 changes: 1 addition & 1 deletion public/css/home.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/css/home.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions public/js/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
$(function () {

$('.button-collapse').sideNav({
draggable: true
});
menuWidth: 300, // Default is 300
edge: 'left', // Choose the horizontal origin
draggable: true // Choose whether you can drag to open on touch screens
}
);

}); // end of document ready
})(jQuery); // end of jQuery name space
16 changes: 15 additions & 1 deletion public/projects/portfolio/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,19 @@
"name":"Portfolio",
"version":"1.0",
"description":"This is a website to showcase my personal projects",
"git":"https://github.com/iainvm/portfolio"
"git":"https://github.com/iainvm/portfolio",
"languages":[
"JS",
"HTML",
"SCSS",
"pug",
"JSON"
],
"tools":[
"Node",
"npm",
"express",
"nginx",
"linux"
]
}
2 changes: 1 addition & 1 deletion scss/home.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.parallax-container {
min-height: 380px;
line-height: 0;
height: auto;
min-height:420px;
color: rgba(255, 255, 255, .9);

.section {
Expand Down
30 changes: 29 additions & 1 deletion utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,32 @@ exports.getProject = function(pName) {
}

return projects[pName];
};
};

exports.getLanguages = function() {
var projects = exports.getProjects();

var languages = {};

for (project in projects){
for (language in projects.languages){
languages[language] += 1;
}
}

return languages;
}

exports.getTools = function() {
var projects = exports.getProjects();

var tools = {};

for (project in projects){
for (tool in projects.tools){
tools[tool] += 1;
}
}

return tools;
}
4 changes: 3 additions & 1 deletion views/templates/main.pug
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
//- Main template used across the entire site
html
html(lang="en")
block vars
head
meta(http-equiv="Content-Type", content="text/html; charset=UTF-8")
meta(name="viewport", content="width=device-width, initial-scale=1")
//- Site title
title #{site.name} - #{title}

Expand Down

0 comments on commit dd46da8

Please sign in to comment.