Skip to content
This repository has been archived by the owner on Oct 1, 2022. It is now read-only.

Creation of website #69

Merged
merged 2 commits into from
Nov 4, 2017
Merged

Creation of website #69

merged 2 commits into from
Nov 4, 2017

Conversation

jrtechs
Copy link
Member

@jrtechs jrtechs commented Nov 3, 2017

No description provided.

Tjzabel
Tjzabel previously approved these changes Nov 3, 2017
Copy link
Member

@Tjzabel Tjzabel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I approve of this Pull Request. @ct-martin any final comments?

Copy link
Member

@jwflory jwflory left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall, this looks awesome! 🎉 💯 🎉 Nice work, @jrtechs! 👍

There were some minor changes and content additions that need to be fixed or changed. I left them as in-line comments. Once those are adjusted and either @ct-martin, @axk4545, or @Tjzabel add a technical review, this is good to merge. 🎬

docs/index.html Outdated
<div class="row">
<div class="col-sm-8">
<h2 class="mt-4">What is TigerOS?</h2>
<p>TigerOS is a Fedora Remix that beautifully utilizes linux to meet the demands of RIT students and faculty.</p>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor typo. linux => Linux

docs/index.html Outdated
<div class="col-sm-8">
<h2 class="mt-4">What is TigerOS?</h2>
<p>TigerOS is a Fedora Remix that beautifully utilizes linux to meet the demands of RIT students and faculty.</p>
<p>TigerOS is maintained and developed by the Rochester Intitute of Technology's <a href="http://ritlug.com/">Linux User Group</a></p>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor typo. Intitute => Institute

docs/index.html Outdated
<div class="card">
<img class="card-img-top" src="https://raw.githubusercontent.com/RITlug/ritlug.github.io/master/img/ritlug-large.png" alt="Ritlug">
<div class="card-body">
<p class="card-text">The RIT Linux Users Group is an RIT-sponsored club for new and experienced users of the Linux operating system.</p>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add the full, expanded version of our club description here? I think it's worth noting the emphasis on topics other than just Linux too.

The RIT Linux Users Group is an RIT-sponsored club for new and experienced users of the Linux operating system. Although our main focus is Linux, we often discuss other topics in FOSS and alternative operating systems like BSD.

And don't forget the hyperlinks for that description that we have on the website.

docs/index.html Outdated
<!-- Footer -->
<footer class="py-5 bg-dark">
<div class="container">
<p class="m-0 text-center text-white">&copy; 2017 TigerOS</p>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of TigerOS for the copyright, can we make that RITlug?

Copy link
Member

@jwflory jwflory Nov 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jrtechs Okay, we decided on a Creative Commons Attribution-ShareAlike license for our website content, like text and screenshots. Please change &copy; to <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">CC-BY-SA 4.0</a>

Thanks!

@jwflory
Copy link
Member

jwflory commented Nov 4, 2017

@jrtechs I realized one thing we didn't cover today in RITlug is how you can actually make a new change after you've submitted the pull request. To do this, all you have to do is add a new commit to the website-devel branch we created earlier.

git checkout website-devel
git add .
git commit -m "Add content fixes from comments in #69"
git push

Then, your fixes will auto-magically pop up in this pull request and we can merge it.

After the PR is merged, here's some helpful commands for you to run to get your branches back up to date and to start clean. This will pull the upstream changes in master back to your repository, push upstream changes to your fork, and then create a new branch (based off of upstream's master). So this also gives you a fresh branch to keep developing in too.

git checkout master
git pull upstream master
git push
git branch -d website-devel
git checkout -b website-devel

@jrtechs
Copy link
Member Author

jrtechs commented Nov 4, 2017

Just finished updating the website according to @jflory7 's suggestions.

Copy link
Member

@ct-martin ct-martin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving as a valid site, after it's working I want to make the header not a background css image and make it a properly embedded image as well as make Popper on a CDN (and strip out some of the stuff the prefab theme does that I don't like). For now though I'm going to approve the PR.

@jwflory
Copy link
Member

jwflory commented Nov 4, 2017

Woot! All looks good to me. Taking in @Tjzabel and @ct-martin's reviews and merging this one! Nice work everyone on getting the earlier messes cleaned up. PR closed! 🎬

@jwflory jwflory merged commit 73f2cfe into RITlug:master Nov 4, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants