class_management_system

commit 3065b00af0538c6660e2b4ea5285aa6c7e09a5af
parent 008c813252d4e31016873725f66566ae53bbf4ee
Author: John Kubach <johnkubach@gmail.com>
Date:   Fri,  5 Apr 2019 19:01:15 -0400

Merge branch HTML-designs

Diffstat:
A
src/html/Rowan_University_seal.svg.png
 | 
0

M
src/html/index.html
 | 
30
++++++++++++++++++++++++++++++

2 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/src/html/Rowan_University_seal.svg.png b/src/html/Rowan_University_seal.svg.png
Binary files differ.
diff --git a/src/html/index.html b/src/html/index.html
@@ -72,12 +72,15 @@ h3
 	margin-left: auto;
 	margin-right: auto;
 }
+<<<<<<< HEAD
 h4 
 { 
 	color: #57150B; 
 	margin-left: auto;
 	margin-right: auto;
 }
+=======
+>>>>>>> HTML-designs
 
 .tablink 
 {
@@ -103,7 +106,11 @@ h4
 	color: #57150B;
 	display: none;
 	padding: 20px 20px;
+<<<<<<< HEAD
 	height: auto;
+=======
+	height: 100%;
+>>>>>>> HTML-designs
 }
 
 #Home {background-color: white;}
@@ -124,6 +131,7 @@ h4
 <!––The Home page––> 
 <div id="Home" class="tabcontent">
 	<center>
+<<<<<<< HEAD
 	<img src="img/Rowan_University_seal.svg.png" alt="Rowan University">
 	<h1>Rowan Curricular Proposal Management System</h1>	
 	</center>
@@ -913,13 +921,22 @@ h4
 		<h3>-Additional Supporting Documentation</h3>
 	</a>
 	
+=======
+	<img src="Rowan_University_seal.svg.png" alt="Rowan University">
+	<h1>Rowan Curricular Proposal Management System</h1>	
+	</center>
+>>>>>>> HTML-designs
 </div>
 
 <!––The Download page––> 
 <div id="Download" class="tabcontent">
 	<center>
 	<h1>Download Page</h1>
+<<<<<<< HEAD
 	
+=======
+	</center>
+>>>>>>> HTML-designs
 
 	<h3>Proposal</h3>
 
@@ -968,8 +985,11 @@ h4
 	<h1>
 		<a href="#" class="button">Download</a>
 	</h1>
+<<<<<<< HEAD
 	
 	</center>
+=======
+>>>>>>> HTML-designs
 </div>
 
 <!––The Upload page––> 
@@ -1014,11 +1034,18 @@ h4
 		<h3>Comments</h3>
 		<textarea name="comments" cols="100" rows="10"></textarea><br>
 	</form>
+<<<<<<< HEAD
 	<center>
 	<h1>
 		<a href="#" class="button">Upload</a>
 	</h1>
 	</center>
+=======
+	
+	<h1>
+		<a href="#" class="button">Upload</a>
+	</h1>
+>>>>>>> HTML-designs
 </div>
 
 
@@ -1074,6 +1101,7 @@ function openPage(pageName, elmnt, color)
 
 document.getElementById("defaultOpen").click();
 
+<<<<<<< HEAD
 function fieldappear(that) 
 {
     if (that.value == "form_A") 
@@ -1141,4 +1169,6 @@ function fieldappear(that)
     }
 }
 
+=======
+>>>>>>> HTML-designs
 </script>
 \ No newline at end of file