From 44224d14bf6d373e86fc4636107b6fff1438d69d Mon Sep 17 00:00:00 2001 From: jvillasr Date: Wed, 4 Oct 2023 10:51:07 +0200 Subject: [PATCH] RESEARCH section added, BLOG moved to MORE --- Gemfile | 12 ++--- Gemfile.lock | 99 ++++++++++++++++++++++++++++++++++++ _config.yml | 7 +++ _data/projects.yml | 16 +++--- _includes/dropdown.html | 4 ++ _includes/navbar.html | 4 +- _includes/navbar_edited.html | 58 +++++++++++++++++++++ _includes/research.html | 19 ++----- assets/css/style.scss | 34 +++++++++++++ 9 files changed, 221 insertions(+), 32 deletions(-) create mode 100644 Gemfile.lock create mode 100644 _includes/navbar_edited.html diff --git a/Gemfile b/Gemfile index d79593b..80b5261 100644 --- a/Gemfile +++ b/Gemfile @@ -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? diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..8db7974 --- /dev/null +++ b/Gemfile.lock @@ -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 diff --git a/_config.yml b/_config.yml index 57e5203..b107ff3 100644 --- a/_config.yml +++ b/_config.yml @@ -79,6 +79,13 @@ defaults: description: "" tags: - "" + # - + # scope: + # type: 'blogs' + # values: + # layout: blog + # title: "BLOG" + # permalink: /blog/ - scope: type: 'pages' diff --git a/_data/projects.yml b/_data/projects.yml index 0bc8081..940eea1 100644 --- a/_data/projects.yml +++ b/_data/projects.yml @@ -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? diff --git a/_includes/dropdown.html b/_includes/dropdown.html index b93fa20..f705666 100644 --- a/_includes/dropdown.html +++ b/_includes/dropdown.html @@ -11,6 +11,10 @@ {% endunless %} {% endfor %} + + + New Page + {% include dropdown.html %} diff --git a/_includes/navbar_edited.html b/_includes/navbar_edited.html new file mode 100644 index 0000000..3e36665 --- /dev/null +++ b/_includes/navbar_edited.html @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/_includes/research.html b/_includes/research.html index 353f34d..9b6fb16 100644 --- a/_includes/research.html +++ b/_includes/research.html @@ -2,23 +2,10 @@
-

Research

-
-
- {% for research in site.data.research %} -
-
-
-
-
-

{{ research.name }}

-

{{ research.description | truncate: 80 }}

-
-
-
- {% endfor %} +

Research

+ {% include project-card.html %}
+ \ No newline at end of file diff --git a/assets/css/style.scss b/assets/css/style.scss index 6935e57..a1d6af9 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -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 {