Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dropdown item font size fix at beer page #246

Open
wants to merge 87 commits into
base: evie_feature
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
d955b7b
jump to top of page
hosseinSafari Oct 3, 2019
58e1dce
Merge branch 'master' into patch-1
hosseinSafari Oct 4, 2019
dc8fc46
i love beer page
elvensmile Oct 7, 2019
36fbae4
added workflow branches
Love-and-logic Oct 8, 2019
2f410df
revised header text, fixed icon title to Dev.to
Love-and-logic Oct 8, 2019
96cf651
Merge pull request #177 from elvensmile/feature/i-love-beer-page
Oct 8, 2019
9a280c5
Merge branch 'master' into features
Oct 8, 2019
e14f9a9
Merge pull request #179 from Love-and-logic/features
Oct 8, 2019
acd81bb
Update to "Why Hacktoberfest is awesome" list
Kbarias Oct 8, 2019
e990b6e
I have moved CSS code to a styles.css
hosseinSafari Oct 9, 2019
8518013
I have moved JS code to scripts.js
hosseinSafari Oct 9, 2019
a52973b
I've removed js and CSS codes from index.html
hosseinSafari Oct 9, 2019
d4a39f2
Merge branch 'master' into patch-1
hosseinSafari Oct 9, 2019
b4ded46
Added my name to contributors list
daniellaskinner Oct 12, 2019
e9f44f9
Merge pull request #188 from daniellaskinner/master
Oct 12, 2019
fca1cf5
Merge pull request #183 from Kbarias/master
Oct 12, 2019
0ca1d8e
Merge pull request #149 from hosseinSafari/patch-1
Oct 12, 2019
d5d93c5
Revert "jump to top of page"
Evie-Skinner18 Oct 12, 2019
c818cb3
Merge pull request #190 from Evie-Skinner18/revert-149-patch-1
Oct 12, 2019
b151c12
added link to github
devakisj1 Oct 12, 2019
f86929e
create halloween.html and halloween.css
anth-dev Oct 12, 2019
55997a6
add basic structure and link stylesheets
anth-dev Oct 12, 2019
f8c78ae
add images and script to swap them
anth-dev Oct 12, 2019
35d9434
format code
anth-dev Oct 12, 2019
e75de74
set width and height of image
anth-dev Oct 12, 2019
6215471
edit jackolantern pictures
anth-dev Oct 12, 2019
9a3a93b
add Halloween information
anth-dev Oct 12, 2019
2488c89
Add information about Stingy Jack
anth-dev Oct 12, 2019
3880ebe
Add more paragraphs
anth-dev Oct 12, 2019
660b685
Add more about Stingy Jack
anth-dev Oct 12, 2019
0268b1f
Add another paragraph
anth-dev Oct 12, 2019
8e26080
Adjust the image size
anth-dev Oct 12, 2019
cb76067
Add some style
anth-dev Oct 12, 2019
adca989
Start building CSS grid
anth-dev Oct 13, 2019
80dcfdd
Add html and body height
anth-dev Oct 13, 2019
065b296
Fixed the grid
anth-dev Oct 13, 2019
53cf262
Work on the grid
anth-dev Oct 13, 2019
4c7ff8a
Start building navigation
anth-dev Oct 13, 2019
f756e5a
Style navigation
anth-dev Oct 13, 2019
0cd2112
Add reset to CSS file
anth-dev Oct 13, 2019
2b80d8e
Change the color of navigation element
anth-dev Oct 13, 2019
777c738
Adjust typography
anth-dev Oct 13, 2019
bae4937
Change p::first-letter size and adjust h1
anth-dev Oct 13, 2019
2fb202e
Remove a linked stylesheet
anth-dev Oct 13, 2019
f98a838
Adjust h1 and jackolantern margins
anth-dev Oct 13, 2019
b44e6d4
add myself to contributors
anth-dev Oct 13, 2019
a0664ca
Hola buenas tardes, he agregado un murciélago al website. Saludos!
Oct 13, 2019
76a5f00
changed contact link to competition and added competition page with a…
daniellaskinner Oct 13, 2019
f0174ad
Merge pull request #191 from devakisj1/features
Oct 14, 2019
8ebc024
Merge pull request #192 from anth-dev/master
Oct 14, 2019
743edc4
Merge pull request #193 from anth-dev/patch-1
Oct 14, 2019
369ea21
Merge pull request #195 from CristianSoncco/master
Oct 14, 2019
476f498
Merge pull request #196 from daniellaskinner/Nelly_feature
Oct 14, 2019
ffd77dd
Added a .gitignore with some basic rules inside
Oct 14, 2019
1ca56db
Removed DS Store file
Oct 14, 2019
b5c7945
Clear .vscode from git catch (Fix .gitignore)
Oct 14, 2019
65c9d16
Merge pull request #199 from PatricNox/master
Oct 14, 2019
efdd4f9
added halloween page to event dropdown
Oct 14, 2019
4d3fee4
added reason why Hacktoberfest is awesome, rearranged alpahbetically,…
HaileyB0311 Oct 15, 2019
fdacff0
saw an issue on navlink and add design
jjdechavez Oct 15, 2019
ea5ddd8
Edit Contributing Guidelines
will-chow Oct 17, 2019
b9b9b26
Edit cleanup contributing guidelines
will-chow Oct 17, 2019
4ad5ff0
Add some edits
will-chow Oct 17, 2019
16df3b3
Merge pull request #200 from lemrkcz/link-to-halloween-page
Oct 17, 2019
dc66998
Merge pull request #204 from HaileyB0311/add-Hailey-Barnett
Oct 17, 2019
ed4e4c9
Merge pull request #211 from will-chow/Edit-contributing-guidelines
Oct 17, 2019
85336c4
Change so all three images have hover captions
lukes-code Oct 20, 2019
41dce0f
Added Day of the Dead
Oct 20, 2019
2e1d8eb
added interactivity
jcoyle37 Oct 21, 2019
b1078d8
javascript movement library
jcoyle37 Oct 21, 2019
4660381
interactivity improvements
jcoyle37 Oct 21, 2019
37636f6
player image created
jcoyle37 Oct 21, 2019
97bfb4b
Merge branch 'master' into add-eprendes
Oct 21, 2019
a34537c
Merge pull request #205 from jjdechavez/issue-navlink-add-design
Oct 21, 2019
2a32be7
the size of words on header have been improved at main page and at be…
Themvp07 Oct 21, 2019
a51fad7
Added an effect to the beer
santos-jadson Oct 22, 2019
50f9e50
Merge pull request #216 from lukes-code/patch-1
Oct 22, 2019
5781d1d
Merge pull request #217 from eprendes/add-eprendes
Oct 22, 2019
48aed4d
Merge pull request #218 from jcoyle37/master
Oct 22, 2019
17293e1
Merge pull request #220 from Themvp07/master
Oct 22, 2019
9524cd8
Merge pull request #221 from Jadson1197/help-beer
Oct 22, 2019
17ea5f1
Fixes #223
kodypeterson Oct 22, 2019
ba2cb5c
Merge pull request #224 from kodypeterson/patch-1
Oct 22, 2019
718894b
Add files via upload
infy815 Oct 24, 2019
90111d9
Competition Page form rendered and js validation
infy815 Oct 24, 2019
93f3819
Dropdown font size fix
infy815 Oct 25, 2019
c424daa
There is another: Find the point!
infy815 Oct 25, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

### Bits n bobs ###
.DS_Store
3 changes: 0 additions & 3 deletions .vscode/settings.json

This file was deleted.

66 changes: 34 additions & 32 deletions Contributing Guidelines.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# How to Contribute to this Project

You can contribute to this project for:

1. Resolving issues
2. Feature suggestion

Follow the guidelines mentioned in PR_Template.md file

Follow the guidelines mentioned in [PR_Template.md](https://github.com/Evie-Skinner18/happy_hacktoberfest_19/blob/master/PR_Template.md) file

## Working on Issues ##
## Working on Issues

- If you want to contribute by working on resolving issues, please state the same as a comment for the Issue.
- Wait for repo maintainers to assign that issue to you.
Expand All @@ -16,60 +16,62 @@ Follow the guidelines mentioned in PR_Template.md file

<hr/>

## Basics ##
## Basics

1. Create an account on GitHub

2. Fork this repository to your own GitHub by clicking on the 'Fork' button (on the right)

3. Now you have your own remote copy of the project! Clone this remote repository to your machine so you'll have a local copy:

`git clone https://github.com/Evie-Skinner18/happy_hacktoberfest_19.git`
```markdown
git clone https://github.com/Evie-Skinner18/happy_hacktoberfest_19.git
```

4. Open up the code in a code editor (e.g Atom, Visual Studio Code, Sublime Text, Notepad... ;-> ). Add your meaningful
contribution!

5. Commit your changes from the root directory of the project (happy_hacktoberfest_19):
`git add .`
`git commit -m "[Write a message that briefly explains the change you've made]"`
```markdown
git add .
git commit -m "[Write a message that briefly explains the change you've made]"
```

6. Push your changes from the local repository on your machine to the forked remote repository on your GitHub:
`git push`
```markdown
git push
```

7. Make a pull request to ask for your changes to be integrated (merged) into the original happy_hacktoberfest_19 that you forked
from Evie-Skinner18 back in step 2. On your GitHub, click the 'Pull Request' button and ensure that the base fork is 'base
fork: Evie-Skinner18/happy_hacktoberfest_19' and the head fork is '[your GitHub name]/happy_hacktoberfest_19'.
7. Make a pull request to ask for your changes to be integrated (merged) into the original happy_hacktoberfest_19 that you forked from Evie-Skinner18 back in step 2. On your GitHub, click the `Pull Request` button and ensure that the base fork is `base fork: Evie-Skinner18/happy_hacktoberfest_19` and the head fork is `[your GitHub name]/happy_hacktoberfest_19`.

8. I will review your contribution and merge it into the original master branch!

If these instructions are unclear, here is an excellent video from the lads at Lingonsaft who organised a cracking Hacktoberfest
website last year: https://www.youtube.com/watch?v=DIj2q02gvKs&t=133s
website last year: [youtube video "How to pull request with git and github"](https://www.youtube.com/watch?v=DIj2q02gvKs&t=133s)

_Remember hackers, Hacktoberfest is about quality over quantity. However, this repository is aimed mostly at those who are
beginners to open source and to coding in general, so if this is your first ever open source contribution, don't hesitate to correct
a spelling mistake or change something very small. Enjoy!_
_Remember hackers, Hacktoberfest is about quality over quantity. However, this repository is aimed mostly at those who are beginners to open source and to coding in general, so if this is your first ever open source contribution, don't hesitate to correct a spelling mistake or change something very small. Enjoy!_

<<<<<<< HEAD:Contributing Guidelines.md
<hr/>
=======
# List of contributors:

- Evie-Skinner18
- mssreerag
- Ischaan
- ferlu
- devnoorfatima
- askhilsinghal1234
- ViktorKauter
- KamleshSilag
- MikailSeremet
- WorkInProgress-Development
- jerilMJ
>>>>>>> 2032f0ed5de7610a6a1e6ebfb7625f43a0a4d083:contributing.md
- [Evie-Skinner18](https://github.com/Evie-Skinner18)
- [mssreerag](https://github.com/mssreerag)
- [Ischaan](https://github.com/Ischaan)
- [ferlu](https://github.com/ferlu)
- [devnoorfatima](https://github.com/devnoorfatima)
- [askhilsinghal1234](https://github.com/askhilsinghal1234)
- [ViktorKauter](https://github.com/ViktorKauter)
- [KamleshSilag](https://github.com/KamleshSilag)
- [MikailSeremet](https://github.com/MikailSeremet)
- [WorkInProgress-Development](https://github.com/WorkInProgress-Development)
- [jerilMJ](https://github.com/jerilMJ)


## More Help

- How to make a pull request on GitHub: https://www.digitalocean.com/community/tutorials/how-to-create-a-pull-request-on-github
- GitHub git flow: https://guides.github.com/introduction/flow/
- Git cheat sheet: https://www.git-tower.com/blog/git-cheat-sheet/
- [How to make a pull request on GitHub](https://www.digitalocean.com/community/tutorials/how-to-create-a-pull-request-on-github)
- [GitHub git flow](https://guides.github.com/introduction/flow/)
- [Git cheat sheet](https://www.git-tower.com/blog/git-cheat-sheet/)
- [Git Documentation](https://git-scm.com/doc)

# Happy coding!
6 changes: 6 additions & 0 deletions Contributors.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,9 @@
- Fabrizvi
- Erfaniaa
- Sanjulapro
- ElisePlecnik
- Elvensmile
- daniellaskinner
- anth-dev
- haileyb0311
- Themvp07
2 changes: 1 addition & 1 deletion about.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<li><a href="#!" class="dropdown-trigger" data-target="dropdown1">Events<i class="material-icons right">arrow_drop_down</i></a></li>
<li><a href="about.html">About</a></li>
<li><a href="./beachtime.html">BEACH TIME WOOHOO</a></li>
<a href="#!" class="btn waves-effect waves-light blue accent">GitHub</a>
<a href="https://github.com/Evie-Skinner18/happy_hacktoberfest_19" class="btn waves-effect waves-light blue accent">GitHub</a>
</ul>
<ul class="sidenav" id="mobile-menu">
<li><a href="#!">Home</a></li>
Expand Down
6 changes: 5 additions & 1 deletion beachtime.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="./css/beachtime.css">
<script src="js/leap-0.6.4.min.js"></script>
</head>
<body>
<!-- Inspired by: https://dribbble.com/shots/2656483-Stop-and-watch-the-sunset -->
Expand All @@ -16,7 +17,7 @@
<div class="sun-2"></div>
<div class="sun-3"></div>
<div class="sun-4">
<div class="face">
<div id="face" class="face">
<div class="left-eye"></div>
<div class="right-eye"></div>
<div class="smile"></div>
Expand Down Expand Up @@ -80,8 +81,11 @@
<div class="shadow-r-l-arm"></div>
<div class="shadow-head"></div>
</div>
<canvas id="playerCanvas" width="100" height="200"></canvas>
</div>

<!-- button to take the user back home -->
<a href="./index.html"> <div class="btn btn-info">Bye bye sun!</div></a>
<script src="js/beachtime.js" type="text/javascript"></script>
</body>
</html>
Loading