Skip to content

Styling changes, added content to homepage #8

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Nov 13, 2022
Merged

Styling changes, added content to homepage #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
87e1aae
Added links to the footer
Nov 12, 2022
2695174
Change favicon to logo
Nov 13, 2022
0943991
Styling changes
Nov 13, 2022
ea85914
Merge branch 'ComputerScienceHouse:main' into main
wilsonmcdade Nov 13, 2022
27c5e27
Added content to the homepage
Nov 13, 2022
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
14 changes: 9 additions & 5 deletions src/static/css/devcade.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
:root {
--csh-primary: #B0197E;
--csh-secondary: #E11C52;
--csh-tertiary: #340526;
--bg: #25021A;
--fg: #FFFFFF;
}
Expand Down Expand Up @@ -170,6 +171,10 @@ img.header {
vertical-align: middle;
}

.title:hover {
text-decoration: none;
}

#uname {
margin-top: auto;
margin-bottom: auto;
Expand Down Expand Up @@ -309,13 +314,12 @@ a:hover {

#feet {
width: 100%;
background-color: black;
background-color: var(--csh-tertiary);
color: white;
justify-content: center;
display: flex;
}

#feet-flex {
.feet-flex {
margin: auto;
display: flex;
justify-content: space-around;
padding: 10px 0px;
Expand All @@ -332,8 +336,8 @@ a:hover {
grid-template-columns: 1fr 1fr;
grid-template-rows: auto auto auto auto;
grid-template-areas:
"a b"
"a d"
"b d"
"c e";
}

Expand Down
Binary file modified src/static/favicon.ico
View file
Open in desktop
Binary file not shown.
Binary file added src/static/images/cabinetirl.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 8 additions & 1 deletion src/templates/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +84,26 @@ <h1>{% block headertext %}{%endblock%}</h1>
<!-- <div id="spaceholder"><h1>L</h1></div> -->
<div id="content">{% block content %}{% endblock %}</div>
<div id="feet">
<div id="feet-flex">
<div class="feet-flex">
<p>"For developers, by developers"</p>
</div>
<div class="feet-flex">
<a href="https://github.com/topics/devcade?q=org%3AComputerScienceHouse">
<div class="social">
<img
alt="github"
src="{{ url_for('static', filename='icons/github.svg') }}"
/>
</div>
</a>
<a href="https://instagram.com/ComputerScienceHouse">
<div class="social">
<img
alt="instagram"
src="{{ url_for('static', filename='icons/instagram.svg') }}"
/>
</div>
</a>
</div>
</div>
</body>
Expand Down
67 changes: 36 additions & 31 deletions src/templates/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,52 @@
{% extends "header.html" %} {% block content %}
<div id="homeGrid">
<div id="about-devcade-wrapper" class="subcontent">
<h2>About Devcade</h2>
<h2>What is Devcade?</h2>
<p>
THIS LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES OF ANY KIND AND
APPLE HEREBY DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS LICENSE
AGREEMENT. DEFINITIONS "Contribution" means: in the executable runs,
unless that component of this License Agreement along with the Program.
Contributors may not be used for further modification of any change.
Devcade is a fully custom arcade machine made by members at RIT's
<a href="https://csh.rit.edu">Computer Science House</a>. Devcade is an arcade built for
developers, by developers. The arcade cabinet, software, and games for Devcade were all
built by CSHers in the 2022 Fall semester.
</p>
<p>
The arcade cabinet was first shown off at the 2022
<a href="https://rochester.makerfaire.com/">Rochester Makerfaire</a>. This cabinet is the
first of its kind, but hopefully not the last.
</p>
<p></p>
<img style="width: 100%" src="{{ url_for('static', filename='images/cabinetirl.jpg') }}"></img>
</div>
<div id="about-team-wrapper" class="subcontent">
<h2>Who are we?</h2>
<p>
You must include a text page in any such claims; this section do not see
how to contact you by electronic and paper mail. If the Program in a
reasonable royalty for Your past and future use of the Covered Code with
only those rights customarily provided to end users, business partners and
the rights conveyed herein. Licensor and every Contributor ("Indemnified
Contributor") against any losses, damages and costs (collectively
"Losses") arising from claims, lawsuits and other legal actions brought by
a third party. Agreement, and without further action by the making, using
or redistributing the Work as permitted above, be liable to You under this
Agreement, and without further action by the terms of this License or (ii)
withdraw Your litigation claim is necessary to implement that API, you
must indicate in any resulting litigation.
Devcade is being actively developed by a group of students at RIT's
<a href="https://csh.rit.edu">Computer Science House</a>.
</p>
<p>
The Devcade project is led by <a href="https://noahemke.com">Noah Emke</a>,
a third year Game Design and Deveopment major here at RIT. Noah leads a team of
about 20 CSH members, ranging from first years to fifth years. Many of these team
members are making their own games for the cabinet, some are working on the backend
API and databases, some on the onboard software, and some on the physical design of the
cabinet itself -- there really is something for everyone on this project.
</p>
<p>

</p>
</div>
<div id="about-csh-wrapper" class="subcontent">
<h2>What's CSH?</h2>
<h2>What is CSH?</h2>
<p>
Since 1976, <a href="https://csh.rit.edu">Computer Science House</a> has provided
a living, learning environment for its members. Computer Science House is a special
interest house at RIT with mulitple lounges, workrooms, study areas, and a datacenter, all on
a dorm hall floor.
</p>
<p>
You must include a text page in any such claims; this section do not see
how to contact you by electronic and paper mail. If the Program in a
reasonable royalty for Your past and future use of the Covered Code with
only those rights customarily provided to end users, business partners and
the rights conveyed herein. Licensor and every Contributor ("Indemnified
Contributor") against any losses, damages and costs (collectively
"Losses") arising from claims, lawsuits and other legal actions brought by
a third party. Agreement, and without further action by the making, using
or redistributing the Work as permitted above, be liable to You under this
Agreement, and without further action by the terms of this License or (ii)
withdraw Your litigation claim is necessary to implement that API, you
must indicate in any resulting litigation.
Computer Science House provides its members with unique facilities, a strong social atmosphere,
and has a strong emphasis on hands-on learning. CSH has a rich history of large-scale projects,
including multiple internet-connected vending machine, providing a <a href="https://schedulemaker.csh.rit.edu/">schedule maker</a> to RIT students,
and now Devcade.
</p>
</div>
</div>
Expand Down