update readme, tweak formatting, and rearrange js

This commit updated the Readme to a more 'complete' version. There are some changes to the formatting, but nothing major. The javascript files have all been moved to a new js folder.
ephs · Mar 29, 2018 · 15b60a3 · 15b60a3
1 parent 53a5576
commit 15b60a3
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,9 @@
-# core
-A project to redesign the Eden Prairie High School's CORE page.
+# Core
+### A redesign of Eden Prairie High School's Core
+![Login Page](/img/login.png)
+This redesign of Core fixes the old, ugly, default Core page and replaces it with a pretty and modern look. The login page at https://ephs.github.io/core is fully functional, but due to the limitations of cross site scripting will log you in to the deafult website. The landing page mockup is only a demo. You can check it out [here](https://ephs.github.io/core/landing.html). 
+![Landing Page](/img/landing.png)
+
+Erik Duxstad (@eduxstad) and Avery Bartnik (@Jythonscript) created this prototype. 
 
 The original can be found [here](https://edenprairie_students.na.rapidbiz.com/).
diff --git a/css/skeleton.css b/css/skeleton.css
@@ -121,8 +121,12 @@ html {
   background-color: #828282;
 }
 
-.odd {
-  background-color: #8a8a8a8a;
+.class-row.odd {
+  background-color: #bfbfbf80;
+}
+
+.class-row:hover {
+  background-color: white;
 }
 
 .text {
@@ -162,6 +166,7 @@ html {
   border-top-width: 0px;
   border-right-width: 0px;
   cursor: pointer;
+  background-color: #68686880;
 }
 
 .two.columns.end {
@@ -207,6 +212,10 @@ html {
   margin: 0px;
 }
 
+.signup {
+  padding: 10px;
+}
+
 /* Table of contents
 ––––––––––––––––––––––––––––––––––––––––––––––––––
 - Grid

diff --git a/img/landing.png b/img/landing.png
diff --git a/img/login.png b/img/login.png
diff --git a/index.html b/index.html
@@ -28,7 +28,7 @@
 
   <!-- Script
   –––––––––––––––––––––––––––––––––––––––––––––––––– -->
-  <script src="login.js"></script>
+  <script src="js/login.js"></script>
 
 </head>
 <body>
@@ -40,7 +40,7 @@
       <div class="six columns" id="login-window">
         <img class="logo-image" src="img/eplogo.png">
         <h4>Core Login</h4>
-        <p id="login-message">Login to CORE with your Student ID and Password</p>
+        <p id="login-message">Login to Core with your Student ID and Password</p>
         <form name="school" method="post" id="login-form">
         <label for="idInput">Student ID</label>
       	<input placeholder="Student ID" id="idInput" type="text" name="username">

diff --git a/date.js → js/date.js b/date.js → js/date.js
diff --git a/landing.js → js/landing.js b/landing.js → js/landing.js
diff --git a/login.js → js/login.js b/login.js → js/login.js
diff --git a/landing.html b/landing.html
@@ -26,12 +26,11 @@
   <!-- Favicon
   –––––––––––––––––––––––––––––––––––––––––––––––––– -->
   <link rel="icon" type="image/png" href="img/eplogo.png">
-  <script src="landing.js"></script>
-
-
+
   <!-- Script
   –––––––––––––––––––––––––––––––––––––––––––––––––– -->
-  <script src="date.js"></script>
+  <script src="js/date.js"></script>
+  <script src="js/landing.js"></script>
 
 </head>
 <body onload="nextCoreDate()">
@@ -83,7 +82,7 @@ <h5 class="title-text">Core Date</h5>
           <h5 class="title-text">Sign Up for Classes</h5>
         </div>
         <div class="window">
-          <div class="text">
+          <div class="text signup">
           <!-- Classes Signup Title Row
   –––––––––––––––––––––––––––––––––––––––––––––––––– -->
           <div class="row" id="class-row-title">