From 65a1d4d2d8c0ecaf081bec0580e9ff7f639cf9de Mon Sep 17 00:00:00 2001
From: bjcreal <bjcreal@umich.edu>
Date: Sun, 5 Jun 2022 17:11:18 -0400
Subject: [PATCH] merge conflicts

---
 templates/eng.html | 101 +++++++++++++++++++++++++++++++--------------
 1 file changed, 71 insertions(+), 30 deletions(-)

diff --git a/templates/eng.html b/templates/eng.html
index 73e5f76a..c344ecc6 100644
--- a/templates/eng.html
+++ b/templates/eng.html
@@ -22,47 +22,57 @@
         <a> tags, where href="url_for('X')" where X is the name of the route's
         function (ex. 'get_lsa_ai')
        -->
-
-        <p style="font-size: 20px">
-          CS-ENG:
-        </p>
-
-        <p>
-          <a href ="{{ url_for('get_eng_hardware') }}">Computer Hardware</a>
+       <div class="eng_title">
+          <p style="font-size: 20px"><strong>
+            CS-ENG:
+        </strong></p>
+       </div>
+          <div class="pathButton">
+            <a href ="{{ url_for('get_eng_hardware') }}">Computer Hardware</a>
+          </div>
           <br>
-          <a href ="{{ url_for('get_eng_infrastructure') }}">Computing Infrastructure</a>
+          <div class="pathButton">
+            <a href ="{{ url_for('get_eng_infrastructure') }}">Computing Infrastructure</a>
+          </div>
           <br>
-          <a href ="{{ url_for('get_eng_intelligent_systems') }}">Intelligent Systems</a>
+          <div class="pathButton">
+            <a href ="{{ url_for('get_eng_intelligent_systems') }}">Intelligent Systems</a>
+          </div>
           <br>
-          <a href ="{{ url_for('get_eng_software') }}">Software Development</a>
+          <div class="pathButton">
+            <a href ="{{ url_for('get_eng_software') }}">Software Development</a>
+          </div>
           <br>
-          <a href ="{{ url_for('get_eng_theory') }}">Theory of Computation</a>
+          <div class="pathButton">
+            <a href ="{{ url_for('get_eng_theory') }}">Theory of Computation</a>
+          </div>
           <br>
-          <a href ="{{ url_for('get_eng_webtech') }}">Web Technology and Applications</a>
-        </p>
+          <div class="pathButton">
+            <a href ="{{ url_for('get_eng_webtech') }}">Web Technology and Applications</a>
+          </div>
 
         <p style="font-size: 20px">
           CS-LSA:
         </p>
 
         <p>
-          <a href="{{ url_for('get_lsa_ai') }}">Artificial Intelligence</a>
-          <br>
-          Bioinformatics
-          <br>
-          Data and Information
-          <br>
-          Economics and Computation
-          <br>
-          Robotics and Vision
-          <br>
-          Security
-          <br>
-          Software Development
-          <br>
-          Software Systems
-          <br>
-          Theory of Computation
+            <a href="{{ url_for('get_lsa_ai') }}">Artificial Intelligence</a>
+            <br>
+            <a href="{{ url_for('get_lsa_bio') }}">Bioinformatics</a>
+            <br>
+            <a href="{{ url_for('get_lsa_data_and_info') }}">Data and Information</a>
+            <br>
+            <a href="{{ url_for('get_lsa_econ') }}">Economics and Computation</a>
+            <br>
+            <a href="{{ url_for('get_lsa_robotics') }}">Robotics and Vision</a>
+            <br>
+            <a href="{{ url_for('get_lsa_security') }}">Security</a>
+            <br>
+            <a href="{{ url_for('get_lsa_software_development') }}">Software Development</a>
+            <br>
+            <a href="{{ url_for('get_lsa_software_systems') }}">Software Systems</a>
+            <br>
+            <a href="{{ url_for('get_lsa_theory') }}"></a>
         </p>
 
 
@@ -116,6 +126,37 @@
 body {
     font-size: 14px;
 }
+a:link {
+    color:black;
+    text-decoration: none;
+}
+a:visited {
+    color:black;
+    text-decoration: none;
+}
+a:hover {
+    color:black;
+    text-decoration: none;
+}
+a:active {
+    color:black;
+    text-decoration: none;
+}
+.pathButton {
+    width:180px;
+    background-color: #d1d1d1;
+    font-size: 16px;
+    padding:10px 0;
+}
+.eng_title {
+    height: 50px;
+    width:180px;
+    position: absolute;
+    top: 90px;
+    background-color: #95bcf0;
+    font-size: 650px;
+
+}
 .v9_320 {
     width: 100%;
     height: 1024px;
-- 
GitLab