Skip to content

Commit

Permalink
Merge pull request #158 from chingu-voyages/feature-104/team-page/Pau…
Browse files Browse the repository at this point in the history
…laR-05

update css and files
  • Loading branch information
PaulaR-05 committed Jun 8, 2023
2 parents 1bb57f2 + ebaa32a commit cb886bc
Show file tree
Hide file tree
Showing 8 changed files with 450 additions and 54 deletions.
92 changes: 46 additions & 46 deletions Style-guide.md → docs/Style-guide.md
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
# Front-end Style Guide

## Layout

The designs were created to the following widths:

- Desktop: 1440px
- iPhone: 393px
- Android: 360px

## Colors

### Primary

- Yellow: hsla(40, 100%, 67%, 1)
- Orange: hsla(2, 70%, 53%, 1)
- Cyan: hsla(186, 71%, 31%, 1)
- Turquoise: hsla(194, 85%, 21%, 1)

### Neutral

- White: hsla(0, 0%, 100%, 1)
- Faded Gray: hsla(330, 3%, 49%, 1))
- Dark Gray: hsla(330, 2%, 19%, 1)
- Faded Turquoise: hsla(194, 27%, 26%, 1)
- Faded Orange: hsla(2, 60%, 64%, 1)
- Faded Yellow: hsla(40, 41%, 61%, 1)
- Black: hsla(0, 0%, 0%, 1)

## Typography

### Body Copy

- Font size (inputs): Varied (32, 40, 64, 128, 160...)

### Font

- Family: [Dokdo](https://fonts.google.com/specimen/Dokdo)
- Weight: 400

## Cursors

We created two custom cursors, each in 3 color variations for the players to use during their turn.

## Icons

# Front-end Style Guide

## Layout

The designs were created to the following widths:

- Desktop: 1440px
- iPhone: 393px
- Android: 360px

## Colors

### Primary

- Yellow: hsla(40, 100%, 67%, 1)
- Orange: hsla(2, 70%, 53%, 1)
- Cyan: hsla(186, 71%, 31%, 1)
- Turquoise: hsla(194, 85%, 21%, 1)

### Neutral

- White: hsla(0, 0%, 100%, 1)
- Faded Gray: hsla(330, 3%, 49%, 1))
- Dark Gray: hsla(330, 2%, 19%, 1)
- Faded Turquoise: hsla(194, 27%, 26%, 1)
- Faded Orange: hsla(2, 60%, 64%, 1)
- Faded Yellow: hsla(40, 41%, 61%, 1)
- Black: hsla(0, 0%, 0%, 1)

## Typography

### Body Copy

- Font size (inputs): Varied (32, 40, 64, 128, 160...)

### Font

- Family: [Dokdo](https://fonts.google.com/specimen/Dokdo)
- Weight: 400

## Cursors

We created two custom cursors, each in 3 color variations for the players to use during their turn.

## Icons

We created two custom icons which are used on the Leaderboard/History page: A rocket blasting off for a win, and a rocket crashing for a loss. But these could also be replaced by dots or other markers to represent previous game results.
9 changes: 4 additions & 5 deletions game_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
href="https://fonts.googleapis.com/css2?family=Dokdo&display=swap"
rel="stylesheet"
/>
<link rel="stylesheet" href="style.css" />
<link rel="stylesheet" href="src/css/style.css" />
<title>Array Game</title>
</head>
<body>
Expand Down Expand Up @@ -220,8 +220,7 @@ <h1>The Array Game</h1>
<a href="https://github.com/goodman2814" target="_blank">Alex</a>,
<a href="https://github.com/nazgul7d" target="_blank">Nazgul</a>,
<a href="https://github.com/PaulaR-05" target="_blank"> Gabriela</a>,
<a href="https://github.com/MoriahSWalker" target="_blank">Moriah</a>,
<a href="https://github.com/Foughty" target="_blank"> John</a>
<a href="https://github.com/Foughty" target="_blank">John</a>
</span>
</div>
<hr />
Expand All @@ -244,9 +243,9 @@ <h1>The Array Game</h1>
>
</span>
|
<a href="#" id="developersPage">Meet Team 05</a>
<a href="meet_team.html" id="developersPage">Meet Team 05</a>
</div>
</footer>
<script src="app.js"></script>
<script src="src/js/app.js"></script>
</body>
</html>
5 changes: 2 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
rel="stylesheet"
/>
<link rel="manifest" href="/site.webmanifest" />
<link rel="stylesheet" href="landingpage.css" />
<link rel="stylesheet" href="src/css/landingpage.css" />
<title>Array Game</title>
</head>
<body>
Expand All @@ -50,7 +50,6 @@ <h1>The Array Game</h1>
<a href="https://github.com/goodman2814" target="_blank">Alex</a>,
<a href="https://github.com/nazgul7d" target="_blank">Nazgul</a>,
<a href="https://github.com/PaulaR-05" target="_blank"> Gabriela</a>,
<a href="https://github.com/MoriahSWalker" target="_blank">Moriah</a>,
<a href="https://github.com/Foughty" target="_blank">John</a>
</span>
<hr />
Expand All @@ -73,6 +72,6 @@ <h1>The Array Game</h1>
|
<a href="#" id="developersPage">Meet Team 05</a>
</footer>
<script src="app.js"></script>
<script src="src/js/app.js"></script>
</body>
</html>
83 changes: 83 additions & 0 deletions meet_team.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link
href="https://fonts.googleapis.com/css2?family=Dokdo&family=Montserrat:wght@400;700&display=swap"
rel="stylesheet"
/>
<link rel="stylesheet" href="src/css/meetpage.css" />
<title>Meet the team</title>
</head>
<body>
<header>
<h1>The Array Game</h1>
</header>
<main>
<h1>Chingu Team 05</h1>
<p>is</p>
<div class="chingu_team">
<div class="chingu_member">
<a href="https://github.com/goodman2814" target="_blank"
>Alex Papparotto</a
>
<p>developer</p>
</div>
<div class="chingu_member">
<a href="https://github.com/nazgul7d" target="_blank"
>Nazgul Duisenbay</a
>
<p>developer</p>
</div>
<div class="chingu_member">
<a href="https://github.com/PaulaR-05" target="_blank"
>Gabriela de Paula</a
>
<p>developer</p>
</div>
<div class="chingu_member">
<a href="https://github.com/Foughty" target="_blank">John Foughty</a>
<p>Ux Research & Design</p>
</div>
</div>
<div class="chingu_acknowledgements">
<h1>Acknowledgements</h1>
<ul>
<li>Chingu Voyages & Jim Medlock</li>
<li>Angela L, Team Mentor</li>
</ul>
</div>
<a href="game_page.html" class="back_link">Back</a>
</main>
<footer>
<span> &lt;/&gt; with </span>❤️<span> by </span>
<span>
<a href="https://github.com/goodman2814" target="_blank">Alex</a>,
<a href="https://github.com/nazgul7d" target="_blank">Nazgul</a>,
<a href="https://github.com/PaulaR-05" target="_blank">Gabriela</a> &
<a href="https://github.com/Foughty" target="_blank">John</a>
</span>
<hr />
<span> © 2023 </span>
<span
>Inspired by <a href="https://www.chingu.io" target="_blank">Chingu</a>.
Built for Voyage 44. |
<a
href="https://github.com/chingu-voyages/v44-tier1-team-05"
target="_blank"
>View Source</a
>
|
<a
href="https://github.com/chingu-voyages/v44-tier1-team-05/"
target="_blank"
>Learn More</a
>
</span>
|
<a href="meet_team.html" id="developersPage">Meet Team 05</a>
</footer>
</body>
</html>
File renamed without changes.
Loading

0 comments on commit cb886bc

Please sign in to comment.