Resolved merge conflict in index.html

Author: Johnsd11

feather.png

@@ -10,32 +10,33 @@
 
 <div class="branding">
     <img src="Apache_Software_Foundation_Logo_(2016).svg.png" alt="Apache cTAKES Logo" />
+    <p>Apache cTAKES&trade; is an open-source project of the Apache Software Foundation</p>
 </div>
 
 <div class="landing-page">
-    <h1>Welcome to Apache cTAKES</h1>
-    <p>The Apache cTAKES website has moved to its new GitHub repository. Please follow the link below to access the documentation and other resources:</p>
-    <a href="https://github.com/apache/ctakes?tab=readme-ov-file#apache-ctakes">
-        Visit the Apache cTAKES GitHub Site
+    <h1>Welcome to Apache cTAKES&trade;</h1>
+    <p>The Apache cTAKES&trade; project has moved to a GitHub repository. Please follow the link below to access documentation and other resources:</p>
+    <a class="main-link" href="https://github.com/apache/ctakes?tab=readme-ov-file#apache-ctakes" target="_blank">
+        Visit the GitHub Wiki
     </a>
 </div>
 
-<div class="branding">
-    <p>Apache cTAKES is an open-source project of the Apache Software Foundation.</p>
-</div>
-
-<div class="navbar">
-    <ul>
-        <li><a href="https://www.apache.org/licenses/">License</a></li>
-        <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="https://www.apache.org/foundation/thanks.html">Thanks to our Sponsors</a></li>
-        <li><a href="https://www.apache.org/security/">Security</a></li>
-        <li><a href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy</a></li>
-        <li><a href="https://www.apache.org/">Apache Home</a></li>
-    </ul>
-</div>
-
 <footer>
+    <div class="footer-images">
+        <!--        <img src="pb-ctakes.jpg" alt="Image 1" class="footer-img">-->
+        <img src="pb-apache.PNG" alt="Image 2" class="footer-img">
+    </div>
+    <div class="navbar">
+        <ul>
+            <li><a href="https://www.apache.org/licenses/">License</a></li>
+            <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+            <li><a href="https://www.apache.org/foundation/thanks.html">Thanks to our Sponsors</a></li>
+            <li><a href="https://www.apache.org/security/">Security</a></li>
+            <li><a href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy</a></li>
+            <li><a href="https://www.apache.org/">Apache Home</a></li>
+        </ul>
+    </div>
+
     <p>This project is an Apache project and is part of a larger community of developers and users.</p>
 </footer>
 </body>

index.html

@@ -4,6 +4,30 @@ body {
     padding: 50px;
 }
 
+html, body {
+    height: 100%;
+    margin: 0;
+    display: flex;
+    flex-direction: column;
+}
+
+.main-link {
+    display: inline-block;
+    background-color: #007bff; /* Button color */
+    color: white; /* Text color */
+    font-size: 1.2rem;
+    padding: 12px 20px;
+    border-radius: 5px; /* Rounded corners */
+    text-decoration: none;
+    font-weight: bold;
+    transition: background 0.3s ease;
+}
+
+.main-link:hover {
+    background-color: #0056b3; /* Darker blue on hover */
+}
+
+
 .navbar ul {
     list-style-type: none;
     margin: 0;
@@ -13,7 +37,7 @@ body {
 
 .navbar li {
     display: inline;
-    margin: 10px;
+    margin: 10px;''
 }
 
 .navbar a {
@@ -29,15 +53,34 @@ body {
 .landing-page {
     max-width: 600px;
     margin: 20px auto;
+    flex: 1;
+}
+
+
+.navbar {
+    margin-left: 150px; /* Adjust based on image width */
+}
+
+footer p{
+    margin-left: 150px; /* Adjust based on image width */
 }
 
 footer {
     margin-top: 40px;
     font-size: 14px;
     color: #777;
+    background-color: #f8f9fa;
+    text-align: center;
+    padding: 10px 0;
 }
 
 .branding img {
     width: 450px; /* Adjust width as needed */
     height: auto; /* Maintain aspect ratio */
 }
+
+.footer-img {
+    width: 100px; /* Adjust width as needed */
+    height: auto; /* Maintain aspect ratio */
+    float: right;
+}