Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
language: ruby
rvm:
- 2.4.0
- 2.5.5
- 2.6.3

before_install:
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ highlighter: rouge
sass:
sass_dir: _sass
style: :compressed
plugins: [jekyll-paginate, jekyll-seo-tag, jekyll-feed]
plugins: [jekyll-paginate, jekyll-seo-tag]
exclude: [".jekyll-cache", "Gemfile", "Gemfile.lock", "type-on-strap.gemspec", "*.gem", ".idea", "vendor/*",
"LICENSE", "README.md", "screenshot.png", "assets/package.json", "assets/node_modules", "assets/gulpfile.js"]

Expand Down
41 changes: 20 additions & 21 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,30 @@
<!-- canonical address -->
<link rel="canonical" href="{{ page.url | replace:'index.html','' | absolute_url }}">

<!-- RSS -->
<link rel="alternate" type="application/atom+xml" title="{{ site.title }}" href="{{ 'feed.xml' | absolute_url }}"/>

<!-- external scripts -->
{% if page.scripts %}
<!-- page-specific scripts -->
{% for script in page.scripts %}
<script src="{{ script.url | relative_url }}"
{%- if script.hash %}
integrity="{{ script.hash }}"
crossorigin="anonymous"
{%- endif -%}></script>
{% endfor %}
<!-- page-specific scripts -->
{% for script in page.scripts %}
<script src="{{ script.url | relative_url }}"
{%- if script.hash %}
integrity="{{ script.hash }}"
crossorigin="anonymous"
{%- endif -%}></script>
{% endfor %}
{% endif %}

<!-- external style sheets -->
{%- if page.styles -%}
<!-- page-specific style sheets -->
{% for style in page.styles %}
<link rel="stylesheet" href="{{ style.url | relative_url }}"
{%- if style.hash %}
integrity="{{ style.hash }}"
crossorigin="anonymous"
{%- endif -%}>
{% endfor %}
<!-- page-specific style sheets -->
{% for style in page.styles %}
<link rel="stylesheet" href="{{ style.url | relative_url }}"
{%- if style.hash %}
integrity="{{ style.hash }}"
crossorigin="anonymous"
{%- endif -%}>
{% endfor %}
{% endif %}

<!-- seo -->
<!-- seo tags -->
{% seo %}
</head>
8 changes: 8 additions & 0 deletions _sass/external/_font-deja-vu.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
$deja-font-path: "../../assets/fonts/dejavu-sans-mono-bold" !default;

@font-face {
font-family: 'DejaVu Sans Mono';
font-display: auto;
font-weight: 700;
src: url('#{$deja-font-path}/DejaVuSansMono-Bold.ttf') format("truetype");
}
28 changes: 14 additions & 14 deletions _sass/home.scss
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
.home_content {
text-align: center;
margin-left: 16px;
margin-right: 16px;
text-align: center;
margin-left: 16px;
margin-right: 16px;
}

#button {
font-size: xx-large;
font-weight: 900;
color: white;
background-color: #9f03ff;
padding: 16px;
border-radius: 16px;
text-shadow: black 8px;
transition: 0.6s;
box-shadow: 0 0 .2rem rgba(0,0,0,.1),0 .2rem .4rem rgba(0,0,0,.2);
font-size: xx-large;
font-weight: 900;
color: white;
background-color: #9f03ff;
padding: 16px;
border-radius: 16px;
text-shadow: black 8px;
transition: 0.6s;
box-shadow: 0 0 .2rem rgba(0,0,0,.1),0 .2rem .4rem rgba(0,0,0,.2);
}

#button:hover{
background: #1794fe;
}
background: #1794fe;
}
4 changes: 3 additions & 1 deletion _sass/item.scss
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,13 @@

.skill {
display: inline-block;
font-family: monospace;
font-family: 'DejaVu Sans Mono';
font-weight: bold;
font-size: 15px;
border-radius: 4px;
padding: 4px 6px;
margin: 2px 1px;
width: max-content;
background: grey;
box-shadow: 0 0 .2rem rgba(0,0,0,.1),0 .2rem .4rem rgba(0,0,0,.2);
}
1 change: 1 addition & 0 deletions _sass/type-on-strap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
@import 'external/syntax';
@import 'external/font-awesome';
@import 'external/source-sans-pro';
@import 'external/font-deja-vu';
// Base
@import 'base/global';
@import 'base/utility';
Expand Down
Binary file not shown.
25 changes: 10 additions & 15 deletions assets/js/calendar.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* global FullCalendar */

const CALENDAR_ID = 't8iphvpqadetnf7ccpb2c7pnjk@group.calendar.google.com'
const CALENDAR_KEY = 'AIzaSyBplGV41n0rSD_NK612JhLTxePXXeyo0iE'

const SMALL_DEVICE_WIDTH = 600

const DATE_24HR_FORMAT = {
hour: '2-digit',
minute: '2-digit',
Expand All @@ -16,29 +16,24 @@ let calendarElement
document.addEventListener('DOMContentLoaded', () => {
calendarElement = document.querySelector('#calendar')

let defaultView = 'dayGridMonth'
if (window.innerWidth < SMALL_DEVICE_WIDTH) {
defaultView = 'listYear'
}

calendar = new FullCalendar.Calendar(calendarElement, {
plugins: ['dayGrid', 'googleCalendar', 'list', 'timeGrid'],
defaultView: defaultView,
header: { center: 'dayGridMonth, timeGridWeek, listYear'},
defaultView: 'listYear',
header: { center: 'dayGridMonth, timeGridWeek, listYear' },
titleFormat: { year: 'numeric', month: 'short', day: 'numeric' },
buttonText: { dayGridMonth:'Month', timeGridWeek:'Week', list:'All', today:'Today'},
buttonText: { dayGridMonth: 'Month', timeGridWeek: 'Week', list: 'All', today: 'Today' },
firstDay: 1,
height: 800,
googleCalendarApiKey: CALENDAR_KEY,
events: {
googleCalendarId: CALENDAR_ID,
events: {
googleCalendarId: CALENDAR_ID,
failure: onLoadFailed
},
},
eventTimeFormat: DATE_24HR_FORMAT,
views: {
// month view
dayGridMonth: {
displayEventEnd: true,
displayEventEnd: true
},
// week view
week: {
Expand All @@ -60,7 +55,7 @@ document.addEventListener('DOMContentLoaded', () => {
calendar.render()
})

function onLoadFailed(error) {
function onLoadFailed (error) {
calendarElement.innerHTML =
`<div id="calendar-error">
<h3>Could not load calendar</h3>
Expand Down
19 changes: 8 additions & 11 deletions assets/js/navbar.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
document.addEventListener("DOMContentLoaded", function (event) {
document.addEventListener('DOMContentLoaded', () => {
// Display the menu items on smaller screens
const pull = document.querySelector('#pull')
const menu = document.querySelector('nav ul')

/*
* Display the menu items on smaller screens
*/
var pull = document.getElementById('pull');
var menu = document.querySelector('nav ul');

pull.addEventListener('click', function (e) {
menu.classList.toggle('hide');
});
});
pull.addEventListener('click', () => {
menu.classList.toggle('hide')
})
})