From bfbb963a585e0a768c5b2d49bccc47c80f56ec3e Mon Sep 17 00:00:00 2001 From: andrewmbacon Date: Wed, 30 Jul 2014 11:01:37 -0400 Subject: [PATCH 1/6] Blank Page Added blank page template --- _notes/dwsync.xml | 2 +- content-blank.php | 15 +++++++++++++++ page-blank.php | 27 +++++++++++++++++++++++++++ sass/content.scss | 6 ------ style.css | 1 - 5 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 content-blank.php create mode 100644 page-blank.php diff --git a/_notes/dwsync.xml b/_notes/dwsync.xml index 039e1d1..8755dba 100644 --- a/_notes/dwsync.xml +++ b/_notes/dwsync.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/content-blank.php b/content-blank.php new file mode 100644 index 0000000..f3a5fcc --- /dev/null +++ b/content-blank.php @@ -0,0 +1,15 @@ + +
> +
+ +
+
+ ', '' ); ?> +
+
\ No newline at end of file diff --git a/page-blank.php b/page-blank.php new file mode 100644 index 0000000..b49ce8b --- /dev/null +++ b/page-blank.php @@ -0,0 +1,27 @@ + + + + + +
+
+ + +
+ +
+ + + diff --git a/sass/content.scss b/sass/content.scss index e79a748..26b2a16 100644 --- a/sass/content.scss +++ b/sass/content.scss @@ -27,7 +27,6 @@ code { /* PAGE --------------------------------------------------------------*/ #main { - border-radius: $border-radius-base; background-color: $contentBg; padding: $contentPadding; @@ -126,8 +125,3 @@ code { .comment-form-url { width: 50%; } - - - -/* In Page Calendars */ - diff --git a/style.css b/style.css index 5377792..f8aa101 100644 --- a/style.css +++ b/style.css @@ -7168,7 +7168,6 @@ code { width: 50%; } -/* In Page Calendars */ /* - - - - - - - - - - - - - - - - - - - == Captions - - - - - - - - - - - - - - - - - - - */ From 41e9ef3120871728e35d98d8f37091c21aa2a00d Mon Sep 17 00:00:00 2001 From: andrewmbacon Date: Wed, 30 Jul 2014 11:10:54 -0400 Subject: [PATCH 2/6] Secondary Nav Walker --- _notes/dwsync.xml | 2 +- inc/_notes/dwsync.xml | 2 +- inc/nav-walker.php | 517 +++++++++++++++++++++++++++++------------ sass/_notes/dwsync.xml | 2 +- 4 files changed, 365 insertions(+), 158 deletions(-) diff --git a/_notes/dwsync.xml b/_notes/dwsync.xml index 8755dba..c4f257f 100644 --- a/_notes/dwsync.xml +++ b/_notes/dwsync.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/inc/_notes/dwsync.xml b/inc/_notes/dwsync.xml index 04941a9..12f9ca3 100644 --- a/inc/_notes/dwsync.xml +++ b/inc/_notes/dwsync.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/inc/nav-walker.php b/inc/nav-walker.php index 07f7b42..cdf2485 100644 --- a/inc/nav-walker.php +++ b/inc/nav-walker.php @@ -1,156 +1,363 @@ - - * - * Note on $depth: Counterintuitively, $depth here means the "depth right before we start this menu". - * So basically add one to what you'd expect it to be - */ - function start_lvl(&$output, $depth, $args) - { - if(isset($args->with_search) && $args->with_search == true){ - add_filter('wp_nav_menu_items', 'search_menu_item', 1, 2); - } - - $tabs = str_repeat("\t", $depth); - // If we are about to start the first submenu, we need to give it a dropdown-menu class - if ($depth >= 0) { //really, level-1 or level-2, because $depth is misleading here (see note above) - $output .= "\n{$tabs}