Skip to content

Commit

Permalink
RESEARCH section added, BLOG moved to MORE
Browse files Browse the repository at this point in the history
  • Loading branch information
jvillasr committed Oct 4, 2023
1 parent ecd249c commit 44224d1
Show file tree
Hide file tree
Showing 9 changed files with 221 additions and 32 deletions.
12 changes: 6 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ gem "webrick"
# If you have any plugins, put them here!
group :jekyll_plugins do
gem "jekyll-feed"
gem 'jekyll-admin', "0.9.0"
gem 'jekyll-admin', "0.11.1"
end

# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
# and associated library.
install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
gem "tzinfo", "~> 1.2"
gem "tzinfo-data"
end
# install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
# gem "tzinfo", "~> 1.2"
# gem "tzinfo-data"
# end

# Performance-booster for watching directories on Windows
gem "wdm", :install_if => Gem.win_platform?
# gem "wdm", :install_if => Gem.win_platform?
99 changes: 99 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
GEM
remote: http://rubygems.org/
specs:
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
backports (3.24.1)
colorator (1.1.0)
concurrent-ruby (1.2.2)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
ffi (1.15.5)
forwardable-extended (2.6.0)
google-protobuf (3.24.3-x86_64-darwin)
http_parser.rb (0.8.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jekyll (4.3.1)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 1.0)
jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0)
kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (>= 0.3.6, < 0.5)
pathutil (~> 0.9)
rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)
jekyll-admin (0.11.1)
jekyll (>= 3.7, < 5.0)
sinatra (>= 1.4)
sinatra-contrib (>= 1.4)
jekyll-feed (0.17.0)
jekyll (>= 3.7, < 5.0)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.4)
listen (3.7.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
multi_json (1.15.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (5.0.3)
rack (1.6.13)
rack-protection (1.5.5)
rack
rack-test (2.1.0)
rack (>= 1.3)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.6)
rouge (4.1.3)
safe_yaml (1.0.5)
sass-embedded (1.68.0-x86_64-darwin)
google-protobuf (~> 3.23)
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
sinatra-contrib (1.4.7)
backports (>= 2.0)
multi_json
rack-protection
rack-test
sinatra (~> 1.4.0)
tilt (>= 1.3, < 3)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
tilt (2.3.0)
unicode-display_width (2.5.0)
webrick (1.8.1)

PLATFORMS
x86_64-darwin-21

DEPENDENCIES
jekyll
jekyll-admin (= 0.11.1)
jekyll-feed
rack
webrick

BUNDLED WITH
2.4.20
7 changes: 7 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,13 @@ defaults:
description: ""
tags:
- ""
# -
# scope:
# type: 'blogs'
# values:
# layout: blog
# title: "BLOG"
# permalink: /blog/
-
scope:
type: 'pages'
Expand Down
16 changes: 8 additions & 8 deletions _data/projects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
link:
image: https://cdn.pixabay.com/photo/2016/06/25/12/55/art-1478831_960_720.jpg
description: Lorem ipsum dolor sit amet consectetur, adipisicing elit. Voluptas adipisci tempore illo accusantium consequatur doloremque dignissimos quo, maxime eius cum enim recusandae qui, delectus ea autem architecto? Velit natus, tempora, quaerat voluptates consectetur magnam aliquid veritatis cumque tempore ipsam delectus eveniet distinctio hic quod reiciendis excepturi beatae doloribus, recusandae ex sed sapiente aliquam deleniti! Quis commodi culpa doloremque quaerat rem natus! Vero ipsam expedita id at quidem. In sit voluptatibus error cum? Minima sunt porro, architecto natus accusantium earum rerum voluptate recusandae fugit, error consequatur, quibusdam dolore quod minus culpa ipsa laudantium odit distinctio exercitationem dolorum. Sunt iste cumque a quae reprehenderit sed dolorum, culpa hic dolores saepe asperiores illum consectetur vitae tenetur dolorem voluptatum totam in repellat voluptatibus laudantium deleniti quasi. Adipisci animi cupiditate eligendi optio nemo accusantium sed quo expedita modi dolor autem atque natus, non excepturi. Eaque inventore quis aperiam vel quae dicta tenetur, placeat facilis, natus dignissimos molestias quidem dolor ad voluptate nam harum maxime. Commodi illum esse iste eaque, saepe praesentium, vero adipisci necessitatibus tenetur maiores sit voluptate eos facere doloribus. Explicabo neque quibusdam, sint nihil reprehenderit alias asperiores aperiam rem voluptas quas, in qui odio quos similique at. Illo voluptas temporibus enim laudantium quas?
#- name: Fourth Project
# link:
# image: https://cdn.pixabay.com/photo/2015/07/17/22/43/student-849822_960_720.jpg
# description: Lorem ipsum dolor sit amet consectetur, adipisicing elit. Voluptas adipisci tempore illo accusantium consequatur doloremque dignissimos quo, maxime eius cum enim recusandae qui, delectus ea autem architecto? Velit natus, tempora, quaerat voluptates consectetur magnam aliquid veritatis cumque tempore ipsam delectus eveniet distinctio hic quod reiciendis excepturi beatae doloribus, recusandae ex sed sapiente aliquam deleniti! Quis commodi culpa doloremque quaerat rem natus! Vero ipsam expedita id at quidem. In sit voluptatibus error cum? Minima sunt porro, architecto natus accusantium earum rerum voluptate recusandae fugit, error consequatur, quibusdam dolore quod minus culpa ipsa laudantium odit distinctio exercitationem dolorum. Sunt iste cumque a quae reprehenderit sed dolorum, culpa hic dolores saepe asperiores illum consectetur vitae tenetur dolorem voluptatum totam in repellat voluptatibus laudantium deleniti quasi. Adipisci animi cupiditate eligendi optio nemo accusantium sed quo expedita modi dolor autem atque natus, non excepturi. Eaque inventore quis aperiam vel quae dicta tenetur, placeat facilis, natus dignissimos molestias quidem dolor ad voluptate nam harum maxime. Commodi illum esse iste eaque, saepe praesentium, vero adipisci necessitatibus tenetur maiores sit voluptate eos facere doloribus. Explicabo neque quibusdam, sint nihil reprehenderit alias asperiores aperiam rem voluptas quas, in qui odio quos similique at. Illo voluptas temporibus enim laudantium quas?
#- name: Fifth Project
# link:
# image: https://cdn.pixabay.com/photo/2016/12/02/02/10/idea-1876659_960_720.jpg
# description: Lorem ipsum dolor sit amet consectetur, adipisicing elit. Voluptas adipisci tempore illo accusantium consequatur doloremque dignissimos quo, maxime eius cum enim recusandae qui, delectus ea autem architecto? Velit natus, tempora, quaerat voluptates consectetur magnam aliquid veritatis cumque tempore ipsam delectus eveniet distinctio hic quod reiciendis excepturi beatae doloribus, recusandae ex sed sapiente aliquam deleniti! Quis commodi culpa doloremque quaerat rem natus! Vero ipsam expedita id at quidem. In sit voluptatibus error cum? Minima sunt porro, architecto natus accusantium earum rerum voluptate recusandae fugit, error consequatur, quibusdam dolore quod minus culpa ipsa laudantium odit distinctio exercitationem dolorum. Sunt iste cumque a quae reprehenderit sed dolorum, culpa hic dolores saepe asperiores illum consectetur vitae tenetur dolorem voluptatum totam in repellat voluptatibus laudantium deleniti quasi. Adipisci animi cupiditate eligendi optio nemo accusantium sed quo expedita modi dolor autem atque natus, non excepturi. Eaque inventore quis aperiam vel quae dicta tenetur, placeat facilis, natus dignissimos molestias quidem dolor ad voluptate nam harum maxime. Commodi illum esse iste eaque, saepe praesentium, vero adipisci necessitatibus tenetur maiores sit voluptate eos facere doloribus. Explicabo neque quibusdam, sint nihil reprehenderit alias asperiores aperiam rem voluptas quas, in qui odio quos similique at. Illo voluptas temporibus enim laudantium quas?
- name: MINATO
link:
image: https://cdn.pixabay.com/photo/2015/07/17/22/43/student-849822_960_720.jpg
description: Lorem ipsum dolor sit amet consectetur, adipisicing elit. Voluptas adipisci tempore illo accusantium consequatur doloremque dignissimos quo, maxime eius cum enim recusandae qui, delectus ea autem architecto? Velit natus, tempora, quaerat voluptates consectetur magnam aliquid veritatis cumque tempore ipsam delectus eveniet distinctio hic quod reiciendis excepturi beatae doloribus, recusandae ex sed sapiente aliquam deleniti! Quis commodi culpa doloremque quaerat rem natus! Vero ipsam expedita id at quidem. In sit voluptatibus error cum? Minima sunt porro, architecto natus accusantium earum rerum voluptate recusandae fugit, error consequatur, quibusdam dolore quod minus culpa ipsa laudantium odit distinctio exercitationem dolorum. Sunt iste cumque a quae reprehenderit sed dolorum, culpa hic dolores saepe asperiores illum consectetur vitae tenetur dolorem voluptatum totam in repellat voluptatibus laudantium deleniti quasi. Adipisci animi cupiditate eligendi optio nemo accusantium sed quo expedita modi dolor autem atque natus, non excepturi. Eaque inventore quis aperiam vel quae dicta tenetur, placeat facilis, natus dignissimos molestias quidem dolor ad voluptate nam harum maxime. Commodi illum esse iste eaque, saepe praesentium, vero adipisci necessitatibus tenetur maiores sit voluptate eos facere doloribus. Explicabo neque quibusdam, sint nihil reprehenderit alias asperiores aperiam rem voluptas quas, in qui odio quos similique at. Illo voluptas temporibus enim laudantium quas?
# - name: Fifth Project
# link:
# image: https://cdn.pixabay.com/photo/2016/12/02/02/10/idea-1876659_960_720.jpg
# description: Lorem ipsum dolor sit amet consectetur, adipisicing elit. Voluptas adipisci tempore illo accusantium consequatur doloremque dignissimos quo, maxime eius cum enim recusandae qui, delectus ea autem architecto? Velit natus, tempora, quaerat voluptates consectetur magnam aliquid veritatis cumque tempore ipsam delectus eveniet distinctio hic quod reiciendis excepturi beatae doloribus, recusandae ex sed sapiente aliquam deleniti! Quis commodi culpa doloremque quaerat rem natus! Vero ipsam expedita id at quidem. In sit voluptatibus error cum? Minima sunt porro, architecto natus accusantium earum rerum voluptate recusandae fugit, error consequatur, quibusdam dolore quod minus culpa ipsa laudantium odit distinctio exercitationem dolorum. Sunt iste cumque a quae reprehenderit sed dolorum, culpa hic dolores saepe asperiores illum consectetur vitae tenetur dolorem voluptatum totam in repellat voluptatibus laudantium deleniti quasi. Adipisci animi cupiditate eligendi optio nemo accusantium sed quo expedita modi dolor autem atque natus, non excepturi. Eaque inventore quis aperiam vel quae dicta tenetur, placeat facilis, natus dignissimos molestias quidem dolor ad voluptate nam harum maxime. Commodi illum esse iste eaque, saepe praesentium, vero adipisci necessitatibus tenetur maiores sit voluptate eos facere doloribus. Explicabo neque quibusdam, sint nihil reprehenderit alias asperiores aperiam rem voluptas quas, in qui odio quos similique at. Illo voluptas temporibus enim laudantium quas?
4 changes: 4 additions & 0 deletions _includes/dropdown.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
</a>
{% endunless %}
{% endfor %}
<!-- Additional links -->
<a href="https://jvillasr.github.io/blog" class="navbar-item has-text-grey-light">
New Page
</a>
<!-- <hr class="navbar-divider">
<a class="navbar-item">
Report an issue
Expand Down
4 changes: 2 additions & 2 deletions _includes/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<a class="navbar-item" href="{{site.url}}{{site.baseurl}}/#about">ABOUT</a>
<a class="navbar-item" href="{{site.url}}{{site.baseurl}}/#contact">CONTACT</a>
<a class="navbar-item" href="{{site.url}}{{site.baseurl}}/#research">RESEARCH</a>
<a class="navbar-item {% if page.layout == 'blog' %}is-active{% endif %}"
href="{{site.url}}{{site.baseurl}}/blog">BLOG</a>
<!-- <a class="navbar-item {% if page.layout == 'blog' %}is-active{% endif %}"
href="{{site.url}}{{site.baseurl}}/blog">BLOG</a> -->
{% include dropdown.html %}
</div>

Expand Down
58 changes: 58 additions & 0 deletions _includes/navbar_edited.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<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>
</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">
<a class="navbar-item {% if page.layout == 'default' %}is-active{% endif %}"
href="{% if page.layout == 'default' %}{{site.url}}{{site.baseurl}}/#{% else %}{{site.url}}{{site.baseurl}}/{% endif %}">HOME</a>
<a class="navbar-item" href="{{site.url}}{{site.baseurl}}/#about">ABOUT</a>
<a class="navbar-item" href="{{site.url}}{{site.baseurl}}/#contact">CONTACT</a>
<a class="navbar-item" href="{{site.url}}{{site.baseurl}}/#research">RESEARCH</a>
<!-- <a class="navbar-item" href="{{site.url}}{{site.baseurl}}/#research">RESUME</a> -->
<a class="navbar-item {% if page.layout == 'blog' %}is-active{% endif %}"
href="{{site.url}}{{site.baseurl}}/blog">BLOG</a>
{% include dropdown.html %}
</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');
});
});
}
});
</script>
19 changes: 3 additions & 16 deletions _includes/research.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,10 @@
<div class="hero-body">
<div class="container has-text-centered">
<div class="section">
<p class="subtitle is-uppercase has-text-weight-medium has-text-grey">Research</p>
</div>
<div class="columns is-centered is-multiline is-mobile">
{% for research in site.data.research %}
<div class="column is-one-third">
<div class="has-background-black card">
<figure class="image is-3by1"
style="background-image: url({{research.image}});">
</figure>
<div class="card-content">
<h1 class="title has-text-white is-size-4">{{ research.name }}</h1>
<p class="has-text-white has-text-weight-light content">{{ research.description | truncate: 80 }}</p>
</div>
</div>
</div>
{% endfor %}
<h1 class="title is-uppercase has-text-weight-semibold has-text-black">Research</h1>
</div>
{% include project-card.html %}
</div>
</div>
</section>
</div>
34 changes: 34 additions & 0 deletions assets/css/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,40 @@ a.navbar-item.is-active {
}
}

#research {
.columns {
.column {
border-radius: 0.5rem;
.image {
background-position: center;
background-repeat: no-repeat;
background-size: cover;
}
/* Add margin or padding to separate the project cards */
margin-bottom: 20px; /* Adjust the value as needed */
}
}

#project-card {
-webkit-box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, 0.1);
-moz-box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, 0.1);
box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, 0.1);
transform: scale(0.95);
transition: all 0.5s ease;
margin-bottom: 0.5rem !important;
display: inline-table;
&:hover {
transform: scale(0.975);
}
}
.card {
transition: all 0.25s ease;
&:hover {
background-color: rgba($color: #000000, $alpha: 0.90)!important;
}
}
}

#project {
.columns {
.column {
Expand Down

0 comments on commit 44224d1

Please sign in to comment.