Skip to content

[WIP] Major changes to website layouts #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
raniceyue wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Major changes to website layouts #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ GEM
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
eventmachine (1.2.7-x64-mingw32)
ffi (1.15.0)
ffi (1.15.0-x64-mingw32)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
i18n (1.8.9)
Expand Down Expand Up @@ -57,6 +59,8 @@ GEM
nokogiri (1.11.2)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogiri (1.11.2-x64-mingw32)
racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.6)
Expand All @@ -74,6 +78,8 @@ GEM
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
sassc (2.4.0-x64-mingw32)
ffi (~> 1.9)
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
Expand All @@ -98,6 +104,7 @@ GEM

PLATFORMS
ruby
x64-mingw32

DEPENDENCIES
jekyll
Expand Down
339 changes: 0 additions & 339 deletions LICENSE
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion _data/navbar.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

links:
- name: home
url: /
url: ./
sublinks:
- name: beamerman
url: /beamerman
Expand Down
30 changes: 8 additions & 22 deletions _includes/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<a class="has-text-black" onclick="window.scroll(0,0)">BACK TO TOP</a>
</div>-->
<!--Footer Main Section-->
<div class="has-background-grey-darker">
<div class="has-background-black">
<div class="container columns">

<!--Link Section-->
Expand All @@ -32,13 +32,9 @@ <h3>Recent Posts</h3>
</li>
{% endfor %}
</div>

<!-- Contact links -->
<div class="column is-size-2" style="display: flex">
{% unless site.facebook_username == %}
<a href="http://www.facebook.com/{{site.facebook_username}}" target="_blank" class="has-text-white"><i class="fab fa-facebook"></i></a>
{% endunless %}
{% unless site.twitter_username == %}
<a href="http://www.twitter.com/{{site.twitter_username}}" target="_blank" class="has-text-white"><i class="fab fa-twitter"></i></a>
{% endunless %}
{% unless site.instagram_username == %}
<a href="http://www.instagram.com/{{site.instagram_username}}" target="_blank" class="has-text-white"><i class="fab fa-instagram"></i></a>
{% endunless %}
Expand All @@ -51,22 +47,12 @@ <h3>Recent Posts</h3>
{% unless site.youtube_channel_id == %}
<a href="http://www.youtube.com/channel/{{site.youtube_channel_id}}" target="_blank" class="has-text-white"><i class="fab fa-youtube"></i></a>
{% endunless %}
{% unless site.reddit_username == %}
<a href="http://www.reddit.com/u/{{site.reddit_username}}" target="_blank" class="has-text-white"><i class="fab fa-reddit"></i></a>
{% endunless %}
{% unless site.behance_username == %}
<a href="http://www.behance.com/{{site.behance_username}}" target="_blank" class="has-text-white"><i class="fab fa-behance"></i></a>
{% endunless %}
{% unless site.dribbble_username == %}
<a href="http://www.dribbble.com/{{site.dribbble_username}}" target="_blank" class="has-text-white"><i class="fab fa-dribbble"></i></a>
{% endunless %}
{% unless site.spotify_username == %}
<a href="http://open.spotify.com/user/{{site.spotify_username}}" target="_blank" class="has-text-white"><i class="fab fa-spotify"></i></a>
{% endunless %}
</div>
</div>
</div>
<div class="has-background-black has-text-centered has-text-white" id="credits">
<i class="far fa-copyright"></i> {{ "now" | date: "%Y" }} | <a href="https://github.com/thedevslot/WhatATheme" target="_blank" rel="noopener noreferrer">WhatATheme</a> - A Theme made with <i class="fas fa-heart has-text-danger"></i> by <a href="https://www.twitter.com/thedevslot" target="_blank" rel="noopener noreferrer">TheDevsLot</a> Powered by <a href="https://jekyllrb.com/" target="_blank">Jekyll</a>

<!-- Website credits bottom bar -->
<div class="container is-vcentered has-text-centered has-text-white">
<i class="far fa-copyright"></i> {{ "now" | date: "%Y" }} | <a href="https://github.com/thedevslot/WhatATheme" target="_blank" rel="noopener noreferrer">WhatATheme</a> - A Theme made with <i class="fas fa-heart has-text-danger"></i> by <a href="https://www.twitter.com/thedevslot" target="_blank" rel="noopener noreferrer">TheDevsLot</a> Powered by <a href="https://jekyllrb.com/" target="_blank">Jekyll</a>
</div>
</div>
</footer>
4 changes: 3 additions & 1 deletion _includes/head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
<title>{{site.title}}</title>
<link rel="stylesheet" href="{% if site.baseurl %}{{site.baseurl}}{% else %}{% endif %}/assets/css/style.css">
<script src="https://kit.fontawesome.com/6a97161b76.js" crossorigin="anonymous"></script>
<link rel="shortcut icon" href="{% if site.favicon-url %}{{site.favicon-url}}{% else %}{{ 'assets/images/logo.png' | absolute_url }}{% endif %}" type="image/x-icon">
{% if site.favicon-url %}
<link rel="shortcut icon" href="{{site.favicon-url}}" type="image/x-icon">
{% endif %}
</head>
162 changes: 82 additions & 80 deletions _includes/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,94 +1,96 @@
<nav class="navbar is-black is-fixed-top" role="navigation" aria-label="main navigation" id="navbar">
<div class="container">
<section class="section" id="nav-section">
<nav class="navbar is-black is-fixed-top" role="navigation" aria-label="main navigation" id="navbar">
<div class="container">

<!-- logo or branding image on left side -->
<div class="navbar-brand">
<a class="navbar-item"
href="{% if page.layout == 'default' %}{{site.url}}{{site.baseurl}}/#{% else %}{{site.url}}{{site.baseurl}}/{% endif %}">
<strong>{{site.title}}</strong>
</a>
<div class="navbar-burger" data-target="navbar-menu">
<span></span>
<span></span>
<span></span>
<!-- logo or branding image on left side -->
<div class="navbar-brand">
<a class="navbar-item"
href="{% if page.layout == 'default' %}{{site.url}}{{site.baseurl}}/#{% else %}{{site.url}}{{site.baseurl}}/{% endif %}">
<strong>{{site.title}}</strong>
</a>
<div class="navbar-burger" data-target="navbar-menu">
<span></span>
<span></span>
<span></span>
</div>
</div>
</div>

<!-- children of navbar-menu must be navbar-start and/or navbar-end -->
<div class="navbar-menu has-background-black" id="navbar-menu">
<!-- navbar items | left side -->
<!-- <div class="navbar-start">
</div> -->
<!-- navbar items | right side -->
<div class="navbar-end">
{% for link in site.data.navbar.links %}
{% if link.sublinks %} <!-- If sublinks exist under this link, make dropdown -->
<!-- children of navbar-menu must be navbar-start and/or navbar-end -->
<div class="navbar-menu has-background-black" id="navbar-menu">
<!-- navbar items | left side -->
<!-- <div class="navbar-start">
</div> -->
<!-- navbar items | right side -->
<div class="navbar-end">
{% for link in site.data.navbar.links %}
{% if link.sublinks %} <!-- If sublinks exist under this link, make dropdown -->
<div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link is-uppercase" href="{{ link.url }}">
{{ link.name }}
</a>
<div class="navbar-dropdown has-background-black is-left">
{% for sublink in link.sublinks %}
<!--{% unless sitepage.url == '/' or sitepage.url == '/404' or sitepage.url == '/blog' %}-->
<a class="navbar-item has-text-grey-light {% if page.url == sitepage.url | absolute_url %}is-active{% endif %}"
href="{{ sublink.url }}">
{{ sublink.name }}
</a>
<!--{% endunless %}-->
{% endfor %}
{% if link.issue-tracker %}
<hr>
<a class="navbar-item has-text-grey-light" href="{{ link.issue-tracker.url }}">
{{ link.issue-tracker.name }}
</a>
{% endif %}
</div>
</div>
{% else %}
<a class="navbar-item is-uppercase" href="{{site.url}}{{site.baseurl}}/{{ link.url }}">{{ link.name }}</a>
{% endif %}
{% endfor %}
{% if site.data.navbar.more %}
<div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link is-uppercase" href="{{ link.url }}">
{{ link.name }}
<a class="navbar-link">
MORE
</a>
<div class="navbar-dropdown has-background-black is-left">
{% for sublink in link.sublinks %}
<!--{% unless sitepage.url == '/' or sitepage.url == '/404' or sitepage.url == '/blog' %}-->
<a class="navbar-item has-text-grey-light {% if page.url == sitepage.url | absolute_url %}is-active{% endif %}"
href="{{ sublink.url }}">
{{ sublink.name }}
{% for link in site.data.navbar.more %}
<a href="{{ link.url }}"
class="navbar-item has-text-grey-light {% if page.url == sitepage.url | absolute_url %}is-active{% endif %}">
{{ link.name }}
</a>
<!--{% endunless %}-->
{% endfor %}
{% if link.issue-tracker %}
<hr>
<a class="navbar-item has-text-grey-light" href="{{ link.issue-tracker.url }}">
{{ link.issue-tracker.name }}
</a>
{% endif %}
<!-- <hr class="navbar-divider">
<a class="navbar-item">
Report an issue
</a> -->
</div>
</div>
{% else %}
<a class="navbar-item is-uppercase" href="{{site.url}}{{site.baseurl}}/{{ link.url }}">{{ link.name }}</a>
{% endif %}
{% endfor %}
{% if site.data.navbar.more %}
<div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link">
MORE
</a>
<div class="navbar-dropdown has-background-black is-left">
{% for link in site.data.navbar.more %}
<a href="{{ link.url }}"
class="navbar-item has-text-grey-light {% if page.url == sitepage.url | absolute_url %}is-active{% endif %}">
{{ link.name }}
</a>
{% endfor %}
<!-- <hr class="navbar-divider">
<a class="navbar-item">
Report an issue
</a> -->
</div>
</div>
{% endif %}
</div>
</div>
</div>
</div>
</nav>
<!-- Bulma Navbar JS -->
<script>
document.addEventListener('DOMContentLoaded', function () {
/* Get all "navbar-burger" elements */
var $navbarBurgers = Array.prototype.slice.call(document.querySelectorAll('.navbar-burger'), 0);
/* Check if there are any navbar burgers */
if ($navbarBurgers.length > 0) {
/* Add a click event on each of them */
$navbarBurgers.forEach(function ($el) {
$el.addEventListener('click', function () {
/* Get the target from the "data-target" attribute */
var target = $el.dataset.target;
var $target = document.getElementById(target);
/* Toggle the class on both the "navbar-burger" and the "navbar-menu" */
$el.classList.toggle('is-active');
$target.classList.toggle('is-active');
</nav>
<!-- Bulma Navbar JS TODO: Move elsewhere-->
<script>
document.addEventListener('DOMContentLoaded', function () {
/* Get all "navbar-burger" elements */
var $navbarBurgers = Array.prototype.slice.call(document.querySelectorAll('.navbar-burger'), 0);
/* Check if there are any navbar burgers */
if ($navbarBurgers.length > 0) {
/* Add a click event on each of them */
$navbarBurgers.forEach(function ($el) {
$el.addEventListener('click', function () {
/* Get the target from the "data-target" attribute */
var target = $el.dataset.target;
var $target = document.getElementById(target);
/* Toggle the class on both the "navbar-burger" and the "navbar-menu" */
$el.classList.toggle('is-active');
$target.classList.toggle('is-active');
});
});
});
}
});
</script>
}
});
</script>
</section>
4 changes: 1 addition & 3 deletions _includes/project-card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<div class="columns is-centered is-multiline is-mobile">
{% for project in site.data.projects %}
<div class="column has-text-centered is-paddingless is-marginless is-one-third-widescreen is-one-third-desktop is-one-fifth-fullhd is-one-third-tablet is-two-fifths-mobile is-three-quarters-touch"
id="project-card">
Expand All @@ -13,5 +12,4 @@ <h1 class="title has-text-white is-size-4">{{ project.name }}</h1>
</div>
</a>
</div>
{% endfor %}
</div>
{% endfor %}
Loading