Made some changes

[irc/freenode/web-7.0.git] / index_mock1.html
diff --git a/index_mock1.html b/index_mock1.html

index 5798a3e354c6324c616b0eea99edae1a0857c1ea..05239a2396e60228c1f404a44e28c83521751d15 100644 (file)
--- a/index_mock1.html
+++ b/index_mock1.html
@@ -10,14 +10,42 @@
  </head>
  <body>
      <nav class="navbar">
+<<<<<<< HEAD
+        <img src="img/logos/coloured-alphabg.svg" class="nlogo" alt="Freenode" />
+        <ul class="navlinks">
+            <li href="" >Chat</li>
+            <li href="" >Collaborate</li>
+            <li href="" >Support&nbsp;</li>
+        </ul>
+=======
          <a href="index"><img src="img/logos/coloured-alphabg.svg" class="nlogo" alt="freenode" /></a>
          <a href="about" class="nlink">About</a>
          <a href="help" class="nlink">Help</a>
          <a href="contribute" class="nlink">Contribute</a>
          <a href="projects" class="nlink">Projects&nbsp;</a>
+>>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0
      </nav>
      <div class="container">
+        <div class="welcome-big">
+            <h1>Welcome to the new home of your projects.</h1>
+            <h3>freenode aims to maximize efficiency in development by allowing a collaborative and relaxed environment for developers while allowing users to get an answer for their problems.</h3>
+            <button type="button" class="welcome-learnmore">Learn More &gt;&gt;</button>
+        </div>
          <div class="jumbotron">
+<<<<<<< HEAD
+                <div href="" class="box">
+                    <img src="" alt="chat" height="60px" width="60px" /><br />
+                    Join a community
+                </div>
+                <div href="" class="box">
+                    <img src="" alt="group" height="60px" width="60px" /><br />
+                    Get my project on freenode
+                </div>
+                <div href="" class="box">
+                    <img src="" alt="support" height="60px" width="60px" /><br />
+                    Support freenode
+                </div>
+=======
              <h2 class="child">I want to...</h2>
              <div class="box-container">
                  <a href="about" class="box">
@@ -37,6 +65,7 @@
                      Know who's using freenode
                  </a>
              </div>
+>>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0
          </div>
          
          <div class="main">
@@ -55,6 +84,15 @@
              </div>
          </div>
      </div>
+<<<<<<< HEAD
+    <!--I do not even know why footer was put in the container-->
+        <div class="footer">
+                &nbsp;&copy; freenode 1995?-2016. All rights reserved.
+            <span class="footer-links">
+                <a href="/sitemap.xml">Sitemap</a> - <a href="/anotherlink.html">Another Link</a>
+            </span>
+        </div>
+=======
      
          <footer class="footer">
              <div class="footerchild">
@@ -75,3 +113,4 @@
      </div>
  </body>
  </html>
+>>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0