Merge pull request #3 from eoconnell/masterHEADmaster

Some more stuff

2 files changed, 44 insertions, 34 deletions

diff --git a/themes/default/include/functions.php b/themes/default/include/functions.php
index 4aeeb14..4a401fd 100644
--- a/themes/default/include/functions.php
+++ b/themes/default/include/functions.php
@@ -1,22 +1,4 @@
 <?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 
 	/* EVERY THEME SHOULD HAVE THIS FILE WITH THE FUNCTIONS OPENCONTENT() & CLOSECONTENT() */
 	
@@ -55,4 +37,4 @@
 	  CloseContent();
 	}
 
-?>
+?>
\ No newline at end of file
diff --git a/themes/default/include/primary.css b/themes/default/include/primary.css
index 7bed7ce..6a7747a 100644
--- a/themes/default/include/primary.css
+++ b/themes/default/include/primary.css
@@ -1,37 +1,62 @@
+
 	/*********************************
  	 **  	  Layout Styles			**
  	 *********************************/
  	 div.container {
 		width: 990px;
-		/* width: 1000px; */
-		color: #000000;
-		 margin: auto auto;
+		color: black;
+		margin: auto auto;
 		text-align: left; /* IE 5 fix */
 	}
  	div.banner {
-	  	/* width: 990px; */
-	  	text-align:center;
-		/* margin: auto auto; */
+	  	height: 100px;
 	}
-	div.nav {
-		/*width: 990px; */
-		height: 28px;
+		.banner h1 {
+			margin: 0;
+			padding-left: 15px;
+			line-height: 100px;
+			color: white;
+			font-weight: bold;
+		}
+	nav {
+		height: 32px;
 		background: #284c75;
-		background-image:url('../images/navbackground.jpg');
-		color: #000000;
+		background: #41678d; /* Old browsers */
+		background: -moz-linear-gradient(top,  #41678d 0%, #41678d 45%, #224567 55%, #224567 100%); /* FF3.6+ */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#41678d), color-stop(45%,#41678d), color-stop(55%,#224567), color-stop(100%,#224567)); /* Chrome,Safari4+ */
+		background: -webkit-linear-gradient(top,  #41678d 0%,#41678d 45%,#224567 55%,#224567 100%); /* Chrome10+,Safari5.1+ */
+		background: -o-linear-gradient(top,  #41678d 0%,#41678d 45%,#224567 55%,#224567 100%); /* Opera 11.10+ */
+		background: -ms-linear-gradient(top,  #41678d 0%,#41678d 45%,#224567 55%,#224567 100%); /* IE10+ */
+		background: linear-gradient(to bottom,  #41678d 0%,#41678d 45%,#224567 55%,#224567 100%); /* W3C */
+		filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#41678d', endColorstr='#224567',GradientType=0 ); /* IE6-9 */
 		text-align:center;
-		/* margin: auto auto; */
 		font-size:14px;
+		border-radius: 2px;
+	}
+	nav a {
+		color: white !important;
+		font-weight: bold;
+	}
+	nav ul {
+		list-style: none;
+		margin: 0;
+		padding-left: 20px;
+		line-height: 32px;
 	}
+		nav li {
+			float: left;
+			margin-right: 2em;
+		}
 	table.main {
-		background-image:url('../images/sandbackground.jpg');
+		/*background-image:url('../images/sandbackground.jpg');*/
 	 	padding: 0px;
 		color:#ffffff;
 	 	width:990px;
 	 	/*width: 1134px; */
 	 	 /* width: 1234px; */
 	 	margin: auto auto;
-		background-color:#a3a2a0;
+	 	margin-top: 20px;
+		/*background-color:#a3a2a0;*/
 	}
 
 	table.main td {
@@ -56,6 +81,8 @@
 		color:#5e5e5e;
 		background-color:#333333;
 		border-top: 1px solid #5e5e5e;
+		margin-top: 30px;
+		padding: 15px;
 	}	
 	
 	/*********************************
@@ -70,7 +97,7 @@
 		border:1px solid #333333; 
 	}
  	div.contentHeading {
-		background-image:url(../images/blockbackground.jpg);
+		background-image:url('../images/blockbackground.jpg');
 		background-repeat:repeat-x;
 		background-color:#112f50;
 		height:25px;
@@ -85,6 +112,7 @@
 		/*background-color:#383838;
 		color:white; */
 		background-color:#f1f1f1;
+		/*width: 644px !important;*/
 	}	
 	div.content img {
 		padding:10px;