conflict resolved and blog page added to the html pages

Anjaliavv51 · Oct 15, 2024 · e2c072f · e2c072f
1 parent dabf53a
commit e2c072f
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/Html-files/Electronic.html b/Html-files/Electronic.html
@@ -746,7 +746,7 @@
                                 <a class="nav-link" href="contact.html" style="color: black;">Contact us</a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link" href="../blog.html" style="color: black;">Blog</a>
+                                <a class="nav-link" href="blog.html" style="color: black;">Blog</a>
                                 </li>
                             <li class="nav-item" style="list-style-type: none;">
                                 <a class="nav-link" href="cart.html" style="color: black;">

diff --git a/Html-files/about.html b/Html-files/about.html
@@ -618,7 +618,7 @@
               <a class="nav-link" href="contact.html" style="color: black;">Contact us</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="../blog.html" style="color: black;">Blog</a>
+              <a class="nav-link" href="blog.html" style="color: black;">Blog</a>
               </li>
           <li class="nav-item" style="list-style-type: none;">
             <a class="nav-link" href="cart.html" style="color: black;">

diff --git a/blog.html → Html-files/blog.html b/blog.html → Html-files/blog.html
diff --git a/Html-files/contact.html b/Html-files/contact.html
@@ -566,7 +566,7 @@
                                 <a class="nav-link" href="services.html" style="color: black;">Services</a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link" href="../blog.html" style="color: black;">Blog</a>
+                                <a class="nav-link" href="blog.html" style="color: black;">Blog</a>
                                 </li>
                             <li class="nav-item">
                                 <a class="nav-link" href="#" style="color: black;">Contact us</a>

diff --git a/Html-files/menu.html b/Html-files/menu.html
@@ -327,7 +327,7 @@
                                 <a class="nav-link" href="contact.html" style="color: black;">Contact us</a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link" href="../blog.html" style="color: black;">Blog</a>
+                                <a class="nav-link" href="blog.html" style="color: black;">Blog</a>
                                 </li>
                             <li class="nav-item" style="list-style-type: none;">
                                 <a class="nav-link" href="cart.html" style="color: black;">

diff --git a/Html-files/services.html b/Html-files/services.html
@@ -354,7 +354,7 @@
                                 <a class="nav-link" href="contact.html" style="color: black;">Contact us</a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link" href="../blog.html" style="color: black;">Blog</a>
+                                <a class="nav-link" href="blog.html" style="color: black;">Blog</a>
                                 </li>
                             <li class="nav-item" style="list-style-type: none;">
                                 <a class="nav-link" href="cart.html" style="color: black;">

diff --git a/index.html b/index.html
@@ -405,7 +405,7 @@
                     </li>
 
                     <li class="nav-item">
-                    <a class="nav-link" href="blog.html" style="font-family: var(--ff-philosopher); color: black;">Blog</a>
+                    <a class="nav-link" href="Html-files/about.html" style="font-family: var(--ff-philosopher); color: black;">Blog</a>
                     </li>
 
                     <li class="nav-item">