52 stylesheet.css
View file
@@ -12,6 +12,7 @@
*/

/*Page Body*/
<<<<<<< HEAD
html,
body {
background-image: url(contents/circuit-board.png);
@@ -22,6 +23,17 @@ body {
}
#wrapper {
min-height:100%;
=======
body{
background-image: url(contents/circuit-board.png);
font-family: ubuntu, arial;
margin:0;
padding:0;
height:100%;
}
#wrapper{
min-height:100%;
>>>>>>> 9de3e0e4a215e474ca54749f10f89a3c51e5b349
position:relative;
}

@@ -54,11 +66,17 @@ header h1{
max-height:100%;
max-width:100%;
}
<<<<<<< HEAD

/*Header Navigation
---------------------------------------------------------------------*/
#head{/*only for linking purposes.*/}

=======
/*Header Navigation
---------------------------------------------------------------------*/
}
>>>>>>> 9de3e0e4a215e474ca54749f10f89a3c51e5b349
nav ul{list-style-type: none;}

nav li{display: inline;}
@@ -131,6 +149,7 @@ nav li{display: inline;}

/*Main
------------------------------------------------------------------*/
<<<<<<< HEAD
main {
padding-left: 1em;
padding-right: 1em;
@@ -141,6 +160,21 @@ main {
margin: auto;
width: 80%;
border-radius: 1em;
=======
main{
padding-left: 1em;
padding-right: 1em;
padding-top: .5em;
padding-bottom: 5em;
margin-bottom: 5em;
width: 80%;
margin: auto;
background-color: whitesmoke;
border-radius: 1em;
>>>>>>> 9de3e0e4a215e474ca54749f10f89a3c51e5b349
}
#spacer{
padding-bottom: 10em;
}
article{
/*aricle formating*/
@@ -149,6 +183,7 @@ article{
padding-bottom: -1em;
margin-bottom: -.8em;
}
<<<<<<< HEAD
#spacer {
padding-bottom:11em;

@@ -167,6 +202,23 @@ footer {
left:0;
margin-bottom: -.5em;
}
=======
/*Footer
-------------------------------------------------------------------*/
footer{
background-color: #393A3C;
color: white;
text-align: center;
font-family: ubuntu, verdana;
width:100%;
height: 8.5em;
position:absolute;
bottom:0;
left:0;
}


>>>>>>> 9de3e0e4a215e474ca54749f10f89a3c51e5b349
footer table{
margin: auto;
margin-top: 1em;
53 templates/template.html
View file
@@ -8,37 +8,44 @@
<link rel="icon" type="image/png" sizes="20X20" href="../contents/Logo.png">
</head>
<body>
<header>
<img src="contents/Logo.png" alt="logo" id="logoright"/>
<img src="contents/Logo.png" alt="logo" id="logoleft"/>
<div id="head">
<h1>#_</h1>
</div>
<nav id="main_nav">
<ul>
<li><a class="page_nav" href="index.html">Home</a></li>
<li><a class="page_nav" href="news/index.html">News</a></li>
<li><a class="page_nav" href="about/index.html">About</a></li>
<li><a class="page_nav" href="Resources/index.html">Resources</a></li>
<li><a class="page_nav" href="projects/index.html">Projects</a></li>
<li><a class="page_nav" href="contact.html">Contact</a></li>
</ul>
</nav>
<div id="wrapper">
<header id="head">
<table id="main_nav">
<tbody>
<tr>
<td><img src="../contents/Logo.png" alt="logo" id="logo"/></td>
<td id="titleWrapper"><h1>#Engineering_</h1></td>
<nav>
<td><a class="page_nav" href="../index.html">Home</a></td>
<td><a class="page_nav" href="../news/index.html">News</a></td>
<td><a class="page_nav" href="../about/index.html">About</a></td>
<td><a class="page_nav" href="../Resources/index.html">Resources</a></td>
<td><a class="page_nav" href="../projects/index.html">Projects</a></td>
<td><a class="page_nav" href="../contact.html">Contact</a></td>
</nav>
</tr>
</tbody>
</table>
</header>
<main>
<article>
<h2></h2>
</article>
</main>
<div id="spacer"></div>
<footer>
<nav>
<ul>
<li><a class="footer_page_nav" href="contact.html">Contact Us</a></li> |
<li><a target=" _blank" class="footer_page_nav" href="../contents/Application.pdf">Join</a></li> |
<li><a target="_blank" class="footer_page_nav" href="https://www.facebook.com/geeksandgadgetsclub">Facebook Page</a></li>
</ul>
<nav>
<table>
<tbody>
<td><a target="_blank" href="https://www.facebook.com/geeksandgadgetsclub"><img src="../contents/Facebook.png"/></a></td>
<td><a target="_blank" href="https://twitter.com/MUGandG"><img src="../contents/Twitter.png"</a></td>
<td><a target="_blank" href="https://www.youtube.com/channel/UCKewnEQIee3QeGMmJXzo3uA"><img src="../contents/YouTube.png"</a></td>
<td><a target="_blank" href="https://github.com/MUGeeksandGadgets"><img src="../contents/GitHub.png"</a></td>
</tbody>
</table>
</nav>
<text>Geeks and Gadgets 2016</text>
<p>Marshall Geeks and Gadgets 2016</p>
</footer>
</div>
</body>
</html>