diff --git a/functions.php b/functions.php
index d72f636..6ab5a2d 100644
--- a/functions.php
+++ b/functions.php
@@ -2,11 +2,11 @@
/**
* Based on TwentyTen functions and definitions
**/
-
-
-// enqueue styles
+
+
+// enqueue styles
wp_enqueue_style( 'style', get_stylesheet_uri() );
-
+
//include 'plugins/drop-caps/wp_drop_caps.php';
if (!function_exists('arl_kottke_archives')) {
include 'plugins/arl_kottke_archives.php';
@@ -59,6 +59,7 @@ function twentyten_setup() {
// This theme uses wp_nav_menu() in one locations.
register_nav_menus( array(
+ 'header-menu' => __( 'Header Menu', 'twentyten'),
'primary' => __( 'Footer Navigation Menu', 'twentyten' )
) );
}
@@ -268,9 +269,9 @@ add_shortcode('dropcap', 'theme_shortcode_dropcaps');
//build out our Portfolio Theme options
-add_option("melville_theme_footer", 'show');
+add_option("melville_theme_footer", 'show');
-$melville_footer = get_option('melville_theme_footer');
+$melville_footer = get_option('melville_theme_footer');
define('melville_footer',$melville_footer);
@@ -300,11 +301,11 @@ function melville_theme_options_page() { ?>
-
+
-
+
@@ -312,4 +313,4 @@ function melville_theme_options_page() { ?>
Melville theme for WordPress, made by Raygun.
-
\ No newline at end of file
+
diff --git a/header.php b/header.php
index fe43863..431386e 100644
--- a/header.php
+++ b/header.php
@@ -4,7 +4,7 @@
*
* Displays all of the
section and everything up till
*/
-
+
?>
>
@@ -14,7 +14,6 @@
-
-
+
<?php
/*
* Print the <title> tag based on what is being viewed.
@@ -62,14 +61,15 @@
<body <?php body_class(); ?>>
<div id="wrapper">
+<?php /* Our navigation menu. If one isn't filled out, wp_nav_menu falls back to wp_page_menu. The menu assiged to the primary position is the one used. If none is assigned, the menu with the lowest ID is used. */ ?>
+ <?php wp_nav_menu( array( 'container_class' => 'melville_menu', 'theme_location' => 'header-menu' ) ); ?>
+
<div id="header">
<?php $heading_tag = ( is_home() || is_front_page() ) ? 'h1' : 'div'; ?>
<<?php echo $heading_tag; ?> id="site-title">
<a href="<?php echo home_url( '/' ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>
</<?php echo $heading_tag; ?>>
<div id="site-description"><?php bloginfo( 'description' ); ?></div>
-
-
</div><!--#header-->
-
-<div id="content">
\ No newline at end of file
+
+<div id="content">
diff --git a/style.css b/style.css
index c04d63c..f8b9540 100644
--- a/style.css
+++ b/style.css
@@ -3,7 +3,7 @@ Theme Name: Melville
Theme URI: http://jacobhaddon.com/themes
Description: A clean journal theme with great typography
Version: 1.0.3
-Author: Jacob Haddon / Dalton Rooney
+Author: Jacob Haddon / Dalton Rooney
Author URI: jacobhaddon.com
Tags: clean, basic, typography, minimalist, white, single column
@@ -20,7 +20,7 @@ Original theme, Dalton Rooney - http://madebyraygun.com
.wf-active #site-title a, .wf-active #site-title a, .wf-active #content h1.entry-title, .wf-active #content h1.page-title, .wf-active #content h2.entry-title, .wf-active span.cap, .wf-inactive #site-title a, .wf-inactive #site-title a, .wf-inactive #content h1.entry-title, .wf-inactive #content h1.page-title, .wf-inactive #content h2.entry-title, .wf-inactive span.cap {
visibility: visible;
}
-
+
/* @end */
/* @group Reset */
@@ -160,12 +160,12 @@ hr {
span.dropcap{
font-weight:bold;
- font-family: 'OFLSortsMillGoudyRegular', Georgia, serif;
+ font-family: 'OFLSortsMillGoudyRegular', Georgia, serif;
float:left;
font-size: 3em;
line-height:1em;
margin: 8px 2px -10px 0;
- position:relative;
+ position:relative;
}
#content ul, #content ol {
@@ -185,7 +185,7 @@ span.dropcap{
#content pre {
margin: 20px 0;
padding: 10px;
- background-color: #fdfdfd;
+ background-color: #fdfdfd;
border: 1px solid #eeeeee;
}
@@ -202,7 +202,7 @@ span.dropcap{
text-align: center;
margin: 0 0 30px 0;
font-weight: normal;
- font-family: 'OFLSortsMillGoudyRegular', Georgia, serif;
+ font-family: 'OFLSortsMillGoudyRegular', Georgia, serif;
font-size: 1.8em;
line-height:1.2em;
text-decoration: none;
@@ -285,7 +285,7 @@ p.wp-caption-text {
.page-link {
margin: 20px 0 22px 0;
}
-
+
.page-link a:link, .page-link a:visited {
background: #f1f1f1;
color: #333;
@@ -334,8 +334,8 @@ div#header {
}
div#site-description {
- text-align: center;
-}
+ text-align: center;
+}
/* @end */
@@ -526,11 +526,11 @@ img.avatar {
}
#comments ol li.depth-2, #comments ol li.depth-3 {
- margin: 10px 0 0 20px;
+ margin: 10px 0 0 20px;
}
#commentform p.logged-in-as {
- font-size: 11px;
+ font-size: 11px;
}
.comment-meta {
@@ -538,7 +538,7 @@ img.avatar {
}
.comment-body p {
- margin: 10px 0 0 0;
+ margin: 10px 0 0 0;
width: 450px;
}
@@ -559,7 +559,7 @@ p.form-allowed-tags {
/* @group Menu */
#menu {
- width:810px;
+ width:810px;
margin: 0 auto;
border-right: 1px solid #cccccc;
border-left: 1px solid #cccccc;
@@ -568,13 +568,13 @@ p.form-allowed-tags {
box-shadow: 1px 4 20px #dddddd;
}
-#menu div.menu, #menu div.menu-footer {
background-color: #dadada;
border-bottom-style: double;
- border-bottom-color: #bbb;
+#menu div.menu, #menu div.menu-footer {
background-color: #dadada;
border-bottom-style: double;
+ border-bottom-color: #bbb;
border-bottom-width: 3px;
- border-top-style: double;
- border-top-color: #bbb;
+ border-top-style: double;
+ border-top-color: #bbb;
border-top-width: 3px;}
#menu div.menu ul, #menu div.menu-footer ul {
margin: 0 0 0 0;
padding: 10px 0 6px;
border-bottom: 1px solid #dddddd;
- text-align: center;
}
#menu div.menu li, #menu div.menu-footer li {
display: inline;
margin: 0 15px;
}
#menu div.menu li a, #menu div.menu-footer li a {
text-decoration: none;
font-family: 'OFLSortsMillGoudyRegular', Georgia, serif;
font-size: 18px;
font-style: italic;
text-decoration: none;
color: #555555;
}
#menu div.menu li a:hover, #menu div.menu-footer li a:hover {
color: #333333;
}
#menu div.menu ul li.current_page_item a, #menu div.menu-footer ul li.current_page_item a{
text-decoration: underline;
+ text-align: center;
}
#menu div.menu li, #menu div.menu-footer li {
display: inline;
margin: 0 15px;
}
#menu div.menu li a, #menu div.menu-footer li a {
text-decoration: none;
font-family: 'OFLSortsMillGoudyRegular', Georgia, serif;
font-size: 18px;
font-style: italic;
text-decoration: none;
color: #555555;
}
#menu div.menu li a:hover, #menu div.menu-footer li a:hover {
color: #333333;
}
#menu div.menu ul li.current_page_item a, #menu div.menu-footer ul li.current_page_item a{
text-decoration: underline;
color: #333333;
}
@@ -610,4 +610,22 @@ span.older-posts a, span.newer-posts a{
margin-right: 20px;
}
-/* @end */
\ No newline at end of file
+/* NEW THINGS! */
+
+#site-title {
+ padding-top: 30px;
+}
+
+/* menu styles */
+.melville_menu ul {list-style: none; padding:0px;}
+.melville_menu ul ul {display: none;position:absolute;background-color: white;}
+.melville_menu li {display:inline-block; padding-right: 20px;}
+.melville_menu li a {text-decoration: none;}
+.melville_menu li:hover ul {display: block;}
+.melville_menu li li {display:block; text-align: left; padding-top: 10px; padding-left: 5px;}
+
+.melville_menu li ul {}
+.melville_menu li li a {}
+.melville_menu { text-align: center; font-variant: small-caps;}
+
+/* @end */