From e528c725c6e74e8b1c782df367652a63aff669eb Mon Sep 17 00:00:00 2001 From: Evan O'Connell Date: Sun, 18 Aug 2013 18:33:35 -0400 Subject: Cleans up the default theme --- themes/default/footer.php | 18 ++++------- themes/default/header.php | 10 +++---- themes/default/include/functions.php | 20 +------------ themes/default/include/primary.css | 58 ++++++++++++++++++++++++++---------- themes/default/index.php | 6 ++-- themes/default/navigation.php | 46 ++++++++++------------------ 6 files changed, 73 insertions(+), 85 deletions(-) diff --git a/themes/default/footer.php b/themes/default/footer.php index afadce7..db656ce 100644 --- a/themes/default/footer.php +++ b/themes/default/footer.php @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - + $phpversion = preg_replace('/[a-z-]/', '', phpversion()); $mtime = explode(' ', microtime()); $totaltime = $mtime[0] + $mtime[1] - $starttime; @@ -26,25 +26,19 @@ $debug_output = sprintf("Page generated in %.3f seconds | Memory: real(%.3fmb) p - - + \ No newline at end of file diff --git a/themes/default/header.php b/themes/default/header.php index a9b043b..0ade800 100644 --- a/themes/default/header.php +++ b/themes/default/header.php @@ -23,18 +23,16 @@ $starttime = explode(' ', microtime()); $starttime = $starttime[1] + $starttime[0]; ?> - - + + -3rd Infantry Division - 8 years strong - ArmaII Unit +Bayonet CMS - - + \ No newline at end of file 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 @@ . - */ - /* 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; diff --git a/themes/default/index.php b/themes/default/index.php index 3da1144..fc2137b 100644 --- a/themes/default/index.php +++ b/themes/default/index.php @@ -33,12 +33,12 @@ include self::$header;
- + - +
diff --git a/themes/default/navigation.php b/themes/default/navigation.php index d90365a..012c95f 100644 --- a/themes/default/navigation.php +++ b/themes/default/navigation.php @@ -1,34 +1,20 @@ +
@@ -46,7 +46,7 @@ include self::$header; - +
- - -Query("SELECT * FROM `bayonet_navigation` ORDER BY `weight`"); - $nav = $db->Fetch($result); - foreach ($nav as $link) { - echo ''; - } - ?> - - + + -- cgit