</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 </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 </a>
->>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0
+ <!--navkinks-->
+ <a href="PIA" target="_blank"><img src="img/logos/PIALogo_black.svg" alt="Private internet access" class="nlogo" /></a>
</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 >></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>
+ <h2 class="child"> welcomr to fn, I want to...</h2>
<div class="box-container">
<a href="about" class="box">
<img src="" alt="chat" height="60px" width="60px" /><br />
- Know what freenode is
+ Chat
</a>
<a href="help" class="box">
<img src="" alt="support" height="60px" width="60px" /><br />
Get help
</a>
<a href="contribute" class="box">
- <img src="" alt="server" height="60px" width="60px" /><br />
- Contribute to freenode
- </a>
- <a href="projects" class="box">
<img src="" alt="gms" height="60px" width="60px" /><br />
- Know who's using freenode
+ Register a group
</a>
+ <!--<a href="PIA" class="box">
+ <img src="img/logos/newPIA.png" alt="Private internet access" height="60px" class="box-center"/><br />
+ </a>-->
</div>
->>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0
</div>
<div class="main">
</div>
</div>
</div>
-<<<<<<< HEAD
- <!--I do not even know why footer was put in the container-->
- <div class="footer">
- © 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">
- Hello dear
+ <h2>Freenode</h2>
+ <ul>
+ <li><a>About freenode</a></li>
+ <ul>
+ <li><a>Vision</a></li>
+ <li><a>Mission</a></li>
+ <li><a>Philosophy</a></li>
+ <li><a>Policies</a></li>
+ </ul>
+ <li><a>Using freenode</a></li>
+ <ul>
+ <li><a>Clients</a></li>
+ <li><a>Webchat</a></li>
+ <li><a>SASL</a></li>
+ </ul>
+ <li><a>Groups/Projects</a></li>
+ <ul>
+ <li><a></a></li>
+ </ul>
+ </ul>
</div>
- <span class="footerline"></span>
+
<div class="footerchild">
- Some links
+ <h2>Our sponsors</h2>
+ <p><a href="PIA" target="_blank"><img src="img/logos/pia-robot-original.svg" alt="PIA" height="20px" /> Private Internet Access</a></p>
</div>
- <span class="footerline"></span>
+
<div class="footerchild">
+ <h2>Social Media</h2>
<p><a>Some other links</a></p>
<p><a>Some other links</a></p>
<p><a>Some other links</a></p>
<p><a>Some other links</a></p>
</div>
</footer>
+ <footer class="copyright">
+ <img alt="CC-0 Logo" />
+ </footer>
</div>
</body>
</html>
->>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0
projects / irc / freenode / web-7.0.git / blobdiff