Merge branch 'master' of github.com:user890104/initfest

This commit is contained in:
Vencislav Atanasov 2015-09-30 21:13:03 +03:00
commit dbadd97c7f
2 changed files with 2 additions and 3 deletions

View File

@ -267,7 +267,6 @@ nav .menu > li:hover {
.menu li.fa a { .menu li.fa a {
padding-top: 0;
position: absolute; position: absolute;
display: block; display: block;
top: 0; top: 0;
@ -281,7 +280,7 @@ nav ul a {
color: #000; color: #000;
text-decoration: none; text-decoration: none;
display: block; display: block;
padding: 1.5em 0.4em; padding: 1.9em 0.4em 1.5em 0.4em;
} }
nav ul .sub-menu { nav ul .sub-menu {

View File

@ -2,7 +2,7 @@
get_header(); get_header();
/* Some special pages (the ones describing the event, team, etc. need a special submenu */ /* Some special pages (the ones describing the event, team, etc. need a special submenu */
if ( preg_match('/^(about|ideas-and-recommendations|feedback|team|history|volunteers)/', $pagename) ) { if ( preg_match('/^(about|ideas-and-recommendations|feedback|team|history|volunteers|code-of-conduct)/', $pagename) ) {
wp_nav_menu( array( 'theme_location' => 'subnav-menu', 'container_class' => 'content subnav cf' ) ); wp_nav_menu( array( 'theme_location' => 'subnav-menu', 'container_class' => 'content subnav cf' ) );
} }