Skip to content

Commit

Permalink
Merge pull request #2 from PettingStrings/fix-fadein
Browse files Browse the repository at this point in the history
Fix fade in
  • Loading branch information
PettingStrings authored May 2, 2024
2 parents b87807a + c13eadc commit 96c9091
Show file tree
Hide file tree
Showing 17 changed files with 2,445 additions and 1,252 deletions.
3 changes: 0 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,3 @@ gem "dotenv"
gem "github-pages"
gem "jekyll"
gem "jekyll-github-metadata"
gem "wdm",">=0.1.0"

gem "webrick", "~> 1.8"
138 changes: 73 additions & 65 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,53 +1,63 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.1.2)
base64
bigdecimal
activesupport (6.0.5)
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
base64 (0.2.0)
bigdecimal (3.1.5)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.11.1)
colorator (1.1.0)
commonmarker (0.23.10)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
dnsruby (1.70.0)
simpleidn (~> 0.2.1)
dotenv (2.8.1)
drb (2.2.0)
ruby2_keywords
commonmarker (0.23.4)
concurrent-ruby (1.1.10)
dnsruby (1.61.9)
simpleidn (~> 0.1)
dotenv (2.7.6)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
ethon (0.16.0)
ethon (0.15.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
execjs (2.9.1)
faraday (2.9.0)
faraday-net_http (>= 2.0, < 3.2)
faraday-net_http (3.1.0)
net-http
ffi (1.16.3-x64-mingw-ucrt)
execjs (2.8.1)
faraday (1.10.0)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.3)
multipart-post (>= 1.2, < 3)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
ffi (1.15.5)
forwardable-extended (2.6.0)
gemoji (3.0.1)
github-pages (228)
github-pages (226)
github-pages-health-check (= 1.17.9)
jekyll (= 3.9.3)
jekyll (= 3.9.2)
jekyll-avatar (= 0.7.0)
jekyll-coffeescript (= 1.1.1)
jekyll-commonmark-ghpages (= 0.4.0)
jekyll-commonmark-ghpages (= 0.2.0)
jekyll-default-layout (= 0.1.4)
jekyll-feed (= 0.15.1)
jekyll-gist (= 1.5.0)
Expand Down Expand Up @@ -81,10 +91,10 @@ GEM
jemoji (= 0.12.0)
kramdown (= 2.3.2)
kramdown-parser-gfm (= 1.1.0)
liquid (= 4.0.4)
liquid (= 4.0.3)
mercenary (~> 0.3)
minima (= 2.5.1)
nokogiri (>= 1.13.6, < 2.0)
nokogiri (>= 1.13.4, < 2.0)
rouge (= 3.26.0)
terminal-table (~> 1.4)
github-pages-health-check (1.17.9)
Expand All @@ -93,17 +103,17 @@ GEM
octokit (~> 4.0)
public_suffix (>= 3.0, < 5.0)
typhoeus (~> 1.3)
html-pipeline (2.14.3)
html-pipeline (2.14.1)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.8.0)
i18n (1.14.1)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.9.3)
jekyll (3.9.2)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (>= 0.7, < 2)
i18n (~> 0.7)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 2.0)
kramdown (>= 1.17, < 3)
Expand All @@ -119,11 +129,11 @@ GEM
coffee-script-source (~> 1.11.1)
jekyll-commonmark (1.4.0)
commonmarker (~> 0.22)
jekyll-commonmark-ghpages (0.4.0)
commonmarker (~> 0.23.7)
jekyll-commonmark-ghpages (0.2.0)
commonmarker (~> 0.23.4)
jekyll (~> 3.9.0)
jekyll-commonmark (~> 1.4.0)
rouge (>= 2.0, < 5.0)
rouge (>= 2.0, < 4.0)
jekyll-default-layout (0.1.4)
jekyll (~> 3.0)
jekyll-feed (0.15.1)
Expand Down Expand Up @@ -211,32 +221,32 @@ GEM
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.4)
listen (3.8.0)
liquid (4.0.3)
listen (3.7.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mini_portile2 (2.8.6)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.21.1)
mutex_m (0.2.0)
net-http (0.4.1)
uri
nokogiri (1.16.0-x64-mingw-ucrt)
minitest (5.15.0)
multipart-post (2.1.1)
nokogiri (1.13.6)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
octokit (4.22.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.7)
racc (1.7.3)
rb-fsevent (0.11.2)
racc (1.6.0)
rb-fsevent (0.11.1)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.6)
rexml (3.2.5)
rouge (3.26.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
Expand All @@ -246,35 +256,33 @@ GEM
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sawyer (0.9.2)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
faraday (> 0.8, < 2.0)
simpleidn (0.2.1)
unf (~> 0.1.4)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
typhoeus (1.4.1)
thread_safe (0.3.6)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
tzinfo (1.2.9)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.9.1-x64-mingw-ucrt)
unf_ext (0.0.8.1)
unicode-display_width (1.8.0)
uri (0.13.0)
wdm (0.1.1)
webrick (1.8.1)
zeitwerk (2.5.4)

PLATFORMS
x64-mingw-ucrt
x86_64-linux

DEPENDENCIES
dotenv
github-pages
jekyll
jekyll-github-metadata
wdm (>= 0.1.0)
webrick (~> 1.8)

BUNDLED WITH
2.4.22
2.3.14
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ This is a personal website built with `Jekyll` and hosted on `Github Pages`, whi
To get a local copy up and running follow these simple steps.

`The commands and instructions I provide are for MacOS - please look up the specific commands for your OS on your own.`

Tested on: ruby 3.1.2p20 Ubuntu WSL
### Prerequisites

* [NodeJS](https://nodejs.org/en/)
Expand Down
2 changes: 1 addition & 1 deletion _config_dev.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
baseurl: "/home" # the subpath of your site, e.g. /blog
baseurl: "" # the subpath of your site, e.g. /blog
5 changes: 0 additions & 5 deletions _includes/section-projects.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ <h3>{{project.name}}</h3>
Demo
</a>
{% endif %}
{% if project.github %}
<a class="highlight-link" href="{{project.github}}" target="_blank" rel="noreferrer">
Github
</a>
{% endif %}
{% if project.tags %}
<div class="tag-wrapper">
{% for tag in project.tags %}
Expand Down
2 changes: 1 addition & 1 deletion _js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $(document).ready(function() {
});

/* particlesJS.load(@dom-id, @path-json, @callback (optional)); */
particlesJS.load('landing', 'assets/particles_default.json', function() {});
particlesJS.load('landing', 'assets/particles.json', function() {});

// Typing Text
var element = document.getElementById('txt-rotate');
Expand Down
2 changes: 1 addition & 1 deletion _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<link rel="manifest" href="{{ "/assets/favicon/site.webmanifest" | prepend: site.baseurl }}">

<link rel="stylesheet" href="{{ "/assets/css/main.min.css" | prepend: site.baseurl }}">
<!--<link rel="stylesheet" href="{{ "/assets/css/vendors.min.css" | prepend: site.baseurl }}">-->
<link rel="stylesheet" href="{{ "/assets/css/vendors.min.css" | prepend: site.baseurl }}">

<script src="{{ "/assets/js/vendors.min.js" | prepend: site.baseurl }}"></script>
<script src="{{ "/assets/js/app.min.js" | prepend: site.baseurl }}"></script>
Expand Down
3 changes: 2 additions & 1 deletion _sass/main.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* Imports */

@import url("https://fonts.googleapis.com/css?family=Raleway&display=swap");
@import url("https://fonts.googleapis.com/css?family=Josefin+Sans&display=swap");

Expand All @@ -17,7 +18,7 @@ $bg-color: #272727;//rgba(43, 45, 47, 1);
$card-bg-color: linear-gradient(
145deg,
rgba(115, 115, 115, 0.15) 15%,
rgb(25, 26, 27) 80%
rgba(43, 45, 47, 1) 80%
);
$primary-color: #ff073a;

Expand Down
Loading

0 comments on commit 96c9091

Please sign in to comment.