move matts code to branch, input club code, add optimized images.

pull/4/head
Kevin Falting 6 years ago
parent 693984efd3
commit 1a44a356ac
  1. 48
      README.md
  2. BIN
      header.jpg
  3. BIN
      img/devosan.png
  4. BIN
      img/devosan_thumbnail-min.png
  5. BIN
      img/header.png
  6. BIN
      img/originals/devosan.png
  7. BIN
      img/originals/devosan_background.png
  8. BIN
      img/originals/devosan_thumbnail.png
  9. 74
      index.html
  10. 58
      styles.css

@ -0,0 +1,48 @@
# Contributing
Please feel free to update this document. There's probably a bunch of ambiguous directions that I take for granted.
Feel free to ask any questions in the [Facebook group](https://www.facebook.com/groups/256151891980498) or when we meet up at the club.
## Create a Github account
[https://github.com/](https://github.com/)
## Install and get familiar with Git
Follow this guide to install Git [https://help.github.com/en/articles/set-up-git](https://help.github.com/en/articles/set-up-git). If you're feeling real motivated, that guide will pretty much walk you through everything I'm going to lay out here. Understanding Git is going to be really important. There are ways to work around it, but if you learn it, collaborating on code with others will be much easier. Other than the original website, here is a good starter resource [https://www.codecademy.com/learn/learn-git](https://www.codecademy.com/learn/learn-git)
## Fork the Repository (repo)
Click on the `Fork` button at the top right of the page. This will create a copy of the repository in your github account. The copy is linked to the original, so when you make a `pull request`, it knows where it's going.
![Image of repository with arrow to Fork Button](/img/header.jpg)
## Clone down your new copy of the repository to your computer
Open your terminal or command prompt and navigate to the directory you want to store the code. This is just like navigating the folders on your computer, just that you're doing it from the terminal - none of that fancy graphical user interface (gui) anymore! You can view a list of files and folders by typing `ls` (mac) or `dir` (windows) and hitting Enter. You can go into another folder by using the change directory command `cd folderName` and hitting Enter. You can navigate up a folder by typing `cd ..` and hitting Enter. Once you are in the folder you want to create the project folder in, click the `clone or download` button (It's green, top right) and copy the URL that it shows. Once you do that, go back to your terminal and type `git clone https://github.com/userName/repoName` Make sure to swap out the URL for the one you copied!
Success looks like this:
![successfully downloaded repo](/img/header.jpg)
## Let's make sure we're watching the original repository
If someone changes the original repo, you want to make sure you can get those changes to, so in the terminal, type `git remote add upstream https://github.com/code-osan/repoName` and hit Enter. You can run `git fetch upstream` to pull down any new changes to the original repo that others may have done. Make sure to do this each time you're about to tackle an issue or make changes to ensure you're working in the most up to date version.
## Make changes!
Open your code editor, I use [Visual Studio Code](https://code.visualstudio.com/), and open the folder that you just created. Once that's done, you should be able to see the files from the project, hopefully with some nice colors (syntax highlighting). Edit the code and save your files!
## Commit the changes you've made.
Git works by _staging_ the files you want to commit, and then you have to _commit_ them while providing a message. This is like a big save to the overall codebase. In your terminal, write `git add .` and hit Enter. This adds all of the changed files to the staging area. Then when you're ready, type in `git commit -m 'I promise to write a quick summary of my changes here using future tense language.'` and hit Enter.
## Now let's push the code back up to github!
After committing all of your changes (you can make multiple commits), it's time to push up the code. Type `git push` and hit Enter. At this point, if you've never done this before you may need to type in your github login credentials. You can also `git push` as many times as you like before you go to the next step.
## The Pull Request
At this point, you're ready to make a pull request, which is like saying _"Hey original repo, will you pull my changes into yours, please?"_ On your repo page, click `New Pull Request` and follow the instructions through submitting the pull request. We'll review it, merge it, or give you feedback!
## Rinse & Repeat
_self explanatory_
Here are some links that may be helpful for this process:
[Creating a pull request from a fork](https://help.github.com/en/articles/creating-a-pull-request-from-a-fork)
[Contributing](https://github.com/MarcDiethelm/contributing/blob/master/README.md)
[First Contributions](https://github.com/firstcontributions/first-contributions)
[GitHub Help and Documentation](https://help.github.com/en)
[How to Keep a Downstream git Repository Current with Upstream Repository Changes](https://medium.com/sweetmeat/how-to-keep-a-downstream-git-repository-current-with-upstream-repository-changes-10b76fad6d97)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 619 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 113 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 625 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 320 KiB

@ -10,51 +10,45 @@
<link rel="stylesheet" href="styles.css">
<title>{ dev } Osan</title>
<title>{dev}Osan</title>
</head>
<body>
<nav class="navbar fixed-top navbar-dark bg-dark">
<div class="content">
<span class="navbar-brand mb-0 h1">{ dev } Osan</span>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNavAltMarkup">
<div class="navbar-nav">
<a class="nav-item nav-link active" href="#">Top <span class="sr-only">(current)</span></a>
<a class="nav-item nav-link" href="#">Vision</a>
<a class="nav-item nav-link" href="#">Meet</a>
<a class="nav-item nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
</div>
<!-- Header information, above the fold -->
<div class="container-fluid">
<div class="row">
<div class="col col-12 col-sm-6">
<img src="img/header.jpg" class="img-fluid" alt="Responsive image">
</div>
<div class="col">asdf</div>
</div>
</nav>
<div class="jumbotron jumbotron-fluid">
<!-- This is potentially gaudy? -->
<!--<div class="container">
<h1 class="display-3">{ dev } Osan</h1>
<p class="lead">What is our catchphrase?</p>
</div>-->
</div>
<div class="main">
<div id="info">
<div class="row" id="vision">
<div class="container">
<div class="col s12">
<h1 class="display-4">Vision</h1>
<p class="lead">To create X, Y, and Z.</p>
</div>
</div>
</div>
<div class="row alt" id="meet">
<div class="container">
<div class="col s12">
<h1 class="display-4">Meet</h1>
<p class="lead">To create X, Y, and Z.</p>
</div>
</div>
<div class="row">
<div class="col col-12 col-sm-6">asdf2</div>
<div class="col">
<h1>{dev}Osan</h1>
<p>Software Development Club</p>
</div>
</div>
</div>
<!-- below the fold. Vision statement, Meeting info -->
<div class="container-fluid">
<div class="row">
<div class="col">asdf</div>
</div>
</div>
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
</body>
</html>
</html>

@ -1,55 +1,3 @@
.navbar {
z-index: +2;
}
.navbar .content {
float: left;
width: 60%;
margin: 0px auto;
}
.navbar .content span {
float: left;
}
.navbar .content .navbar-toggler {
float: right;
}
.jumbotron {
position: absolute;
top: 0px;
background: url("https://media.defense.gov/2016/May/10/2001535489/-1/-1/0/160509-F-LU738-221.JPG") no-repeat center center fixed;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
height: 40%;
width: 100%;
color: #fff;
}
.jumbotron .container {
float: left;
margin-top: 50px;
background: #3e3e3e;
opacity: 0.80;
max-width: 450px;
text-align: center;
}
.main {
position: absolute;
top: 40%;
width: 100%;
}
.main .lead {
font-size: 20pt;
}
.main .row {
padding: 70px 15px 70px 15px;
margin: 0px;
}
.main .alt {
position: absolute;
left: 0px;
width: 100%;
margin: 0px;
background: #e3e3e3;
}
* {
background-color: darkseagreen;
}
Loading…
Cancel
Save