Skip to content

Commit

Permalink
Merge pull request #8 from matthewincardona/gh-pages
Browse files Browse the repository at this point in the history
Add favicon, fade-in animation, and fix double scrollbars
  • Loading branch information
Nolski authored Oct 12, 2023
2 parents 0675a77 + 8ecfb7a commit 30503f5
Show file tree
Hide file tree
Showing 3,516 changed files with 130 additions and 402,723 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
_site/
.sass-cache/
.jekyll-cache/
.jekyll-metadata
node_modules
36 changes: 27 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,36 @@
# Open Work Definition
Built with Jekyll, Tailwind, and :heart:.
Built with Jekyll, Tailwind, and :heart:

## Development & Deployment

Install Jekyll on your system, or from the local repository. On Linux, the latter can be accomplished using the commands

```bash
bundle install
```

A local webserver can now be created using the command

```bash
bundle exec jekyll serve
```

Or if you're using a system-wide Jekyll install, such as one from a package repo, run just

```bash
jekyll serve
```

A build for deployment can be created using

## Local Development
This project doesn't work with the GitHub pages version of Jekyll when running locally. Instead, un-comment the regular Jekyll version in the Gemfile and comment out the GitHub pages version. It should look similar to this:
```
gem "jekyll", "~> 4.3"
jekyll build
# or
# gem "github-pages", "~> 227", group: :jekyll_plugins
bundle exec jekyll build
```

Be sure to run the server with live reload enabled to make sure Tailwind regenerates static files:
<br>
`bundle exec jekyll serve --livereload
`
### Pushing With GitHub Actions
You may run into this GitHub actions error when deploying the site
`
Expand Down
2 changes: 1 addition & 1 deletion _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<img class="absolute z-[-1] lg:left-[-15%] lg:top-[50px] lg:max-w-[20rem] right-[10%] bottom-[-10%] max-w-[30rem]"
src="./assets/img/background-shapes/footer-bg.svg" alt="">
<div class="grid lg:grid-cols-7 lg:justify-center my-6 inner--large gap-6">
<img class="ml-8 lg:ml-0 order-1 lg:order-[-1] w-56 lg:col-span-2 lg:m-auto" src="assets/img/icons/rit-libre-corps.svg" alt="">
<img class="ml-8 lg:ml-0 order-1 lg:order-[-1] w-56 lg:col-span-2 lg:m-auto" src="assets/img/icons/rit-libre-corps.png" alt="">
<div class="pb-4 lg:pb-0 lg:pl-8 lg:col-span-5 lg:flex border-b-2 lg:border-b-0 lg:border-l-2 border-black ml-8 justify-between gap-12">
<p>Open Work Definition 0.1 was written by Stephen Jacobs, Director, Open@RIT with contributions from Michael Nolan, Associate Director, Open@RIT, and Karsten Wade, Principal Community Architect, Red Hat, Inc.</p>
<p class="text-lg whitespace-nowrap mt-8 lg:mt-0 lg:text-right">
Expand Down
46 changes: 25 additions & 21 deletions _layouts/default.html
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
<!DOCTYPE html>
<html lang="{{ site.lang | default: "en-US" }}">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta charset="utf-8">
<title>{{ site.title }}</title>
<!-- add tw-elements -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tw-elements/dist/css/index.min.css" />
<link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
</head>

<div class="relative lg:mb-20">
<html lang="{{ site.lang | default: " en-US" }}">

<head>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta charset="utf-8">
<title>{{ site.title }}</title>
<!-- add tw-elements -->
<link rel="shortcut icon" type="image/svg" href="favicon.svg">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tw-elements/dist/css/tw-elements.min.css" />
<link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
</head>

<div class="relative lg:mb-20">
{% include navigation.html %}
</div>
<body>
<main class="w-full mt-10 max-w-6xl m-auto">
{{ content }}
</main>
{% include footer.html %}
<script src="https://cdn.jsdelivr.net/npm/tw-elements/dist/js/index.min.js"></script>
</body>
</html>

<body>
<main class="fade-in w-full mt-10 max-w-6xl m-auto">
{{ content }}
</main>
{% include footer.html %}
<script src="https://cdn.jsdelivr.net/npm/tw-elements/dist/js/tw-elements.umd.min.js"></script>
</body>

</html>
1 change: 0 additions & 1 deletion _site/CNAME

This file was deleted.

27 changes: 0 additions & 27 deletions _site/README.md

This file was deleted.

Loading

0 comments on commit 30503f5

Please sign in to comment.