+++ /dev/null
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
- <title>freenode</title>
- <link href="css/mock1.css" rel="stylesheet" />
-</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
- </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>
- <div class="box-container">
- <a href="about" class="box">
- <img src="" alt="chat" height="60px" width="60px" /><br />
- Know what freenode is
- </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
- </a>
- </div>
->>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0
- </div>
-
- <div class="main">
- <h1>News</h1>
- <div class="art">
- <h3 class="art">Some News</h3>
- <p class="art-date">2016-02-21 by spb</p>
- <p class="art-ingress">Fancy news article's ingress text here. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus placerat ultricies euismod. Maecenas dolor mauris, posuere mollis eros vel, auctor rhoncus quam...</p>
- <p class="art-link"><a href="">Read More</a></p>
- </div>
- <div class="art">
- <h3 class="art">Another News</h3>
- <p class="art-date">2016-01-19 by christel</p>
- <p class="art-ingress">Some other news article's ingress here. Phasellus nec erat rhoncus, pretium orci eget, ullamcorper ipsum. Fusce sit amet felis a augue sodales commodo id eget justo. Phasellus id nisl nec elit porta pellentesque in egestas nibh. Vivamus mollis ligula lectus, in mollis nibh pharetra vitae...</p>
- <p class="art-link"><a href="">Read More</a></p>
- </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
- </div>
- <span class="footerline"></span>
- <div class="footerchild">
- Some links
- </div>
- <span class="footerline"></span>
- <div class="footerchild">
- <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>
- </div>
-</body>
-</html>
->>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0
projects / irc / freenode / web-7.0.git / commitdiff
