Skip to content

Commit

Permalink
Majorly refactored CSS & file structure to make archiving simpler
Browse files Browse the repository at this point in the history
- Updated head declarations to use relative file paths more effectively.
- Created specific assets folders so each index.html has a matching assets folder within its directory. 
- Structure of archived pages is now consistent with the root index.html and its assets folder.
- Created master.css to hold styles that are constant for all versions.
- Removed duplicate styles from each year's individual style.css.
- This will hopefully will make implementing overall new/different layouts easier. (#21)
- Special favicon are now read directly from the main website's repo.
  • Loading branch information
TJScalzo committed Apr 29, 2020
1 parent 15805b4 commit 0f16565
Show file tree
Hide file tree
Showing 27 changed files with 1,215 additions and 1,601 deletions.
File renamed without changes.
101 changes: 101 additions & 0 deletions 2017/assets/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
@import url('https://fonts.googleapis.com/css?family=Crimson+Text');

@font-face {
font-family: Skorzhen;
src: url(./FTY-SKORZHEN-NCV.ttf);
font-weight: bold;
}

body, button {
font-family: 'Crimson Text', serif;
color: #38322F;
}

/* Header */
h1 {
margin: 0.67em 0;
}

h3 {
margin-top: 1em 0;
}

#title {
font-family: Skorzhen;
font-size: 1.75em;
padding: 0;
transform: scale(1,1);
-webkit-transform:scale(1,1); /* Safari and Chrome */
-moz-transform:scale(1,1); /* Firefox */
-ms-transform:scale(1,1); /* IE 9+ */
-o-transform:scale(1,1); /* Opera */
}

/* Buttons */
.button {
border: none !important;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
background-color: #A77C3C !important;
}
.button:hover {
background-color: #BA8A43 !important;
}
.button:active {
background-color: #C19656 !important;
}
.button div {
font-weight: bold;
padding: 10px 15px 12px 15px;
}
button.button {
padding: 10px 15px 12px 15px !important;
}

#bingo {
width: 8vw;
min-width: 130px;
padding: .5vw;
}
#bingo div {
padding: 5px 0px !important;
font-size: 35px !important;
transform: scale(1,1);
-webkit-transform:scale(1,1); /* Safari and Chrome */
-moz-transform:scale(1,1); /* Firefox */
-ms-transform:scale(1,1); /* IE 9+ */
-o-transform:scale(1,1); /* Opera */
}

/* Board */
#board {
font-size: 1.5em;
}

#boardHeader > .tile {
font-family: Skorzhen;
font-size: 3em;
border-width: 2px;
color: #62392D;
transform: scale(1,1);
-webkit-transform:scale(1,1); /* Safari and Chrome */
-moz-transform:scale(1,1); /* Firefox */
-ms-transform:scale(1,1); /* IE 9+ */
-o-transform:scale(1,1); /* Opera */
}

/* Tiles */
.tile {
border: 2px solid #62392D;
}

input[type=checkbox]:checked + div {
background-color: #62392D;
color: #fff;
}

div.tile:hover {
background-color: #BA8A43;
color: #fff;
}
File renamed without changes.
21 changes: 13 additions & 8 deletions 2017/index.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
<head>
<title>FRC Kickoff Bingo</title>
<link rel="stylesheet" href="./style.css" />
<link rel="stylesheet" href="./sweetalert2.css" />
<title>FRC Kickoff Bingo - 2017</title>
<link rel="stylesheet" href="/bingo/master.css" />
<link rel="stylesheet" href="./assets/style.css" />
<link rel="stylesheet" href="./assets/sweetalert2.css" />
<link rel="apple-touch-icon" sizes="180x180" href="/assets/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/assets/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/assets/favicon/favicon-16x16.png">
<link rel="manifest" href="/assets/favicon/site.webmanifest">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
<script src="../assets/sweetalert2/sweetalert2.min.js"></script>
<script type="text/javascript" src="../values.js"></script>
<script type="text/javascript" src="../bingo.js"></script>
<script src="/bingo/sweetalert2.min.js"></script>
<script type="text/javascript" src="/bingo/values.js"></script>
<script type="text/javascript" src="/bingo/bingo.js"></script>
<meta property="og:title" content="FRC Kickoff Bingo!" />
<meta property="og:description" content="STEAMWORKS edition 2017" />
</head>

<body>
<div id="header">
<img id="steamworks" src="../assets/img/first-steamworks-transparent-logo.png">
<img id="game-logo" src="./assets/first-steamworks-transparent-logo.png">
<div id="title">
<h1>FRC Kickoff Bingo!</h1>
<h3>2017 Edition</h3>
Expand All @@ -26,7 +31,7 @@ <h3>2017 Edition</h3>
<div id="board" class="unselect"></div>

<div id="footer">
<div class="button"><a href="https://www.twitch.tv/firstinspires" target="_blank">Watch the Stream</a></div>
<div class="button"><a href="https://www.twitch.tv/firstinspires/video/113503595" target="_blank">Watch the Stream</a></div>
<div class="button"><a href="https://firstfrc.blob.core.windows.net/frc2017/Manual/2017FRCGameSeasonManual.pdf" target="_blank" download>Download Manual</a></div>
<div class="button"><a href="https://github.com/team178/bingo" target="_blank">Source Code</a></div>
</div>
Expand Down
Loading

0 comments on commit 0f16565

Please sign in to comment.