diff --git a/css/reset.css b/css/reset.css index e1256c1e4a0560ba591d82f243074ce7c8986b17..c1a2a1381521e1a18e454e0f65677ff92a531874 100644 --- a/css/reset.css +++ b/css/reset.css @@ -83,7 +83,7 @@ a { */ .wrap { min-width: 280px; - max-width: 900px; + max-width: 850px; width: 60%; margin: 0 auto; diff --git a/css/style.css b/css/style.css index 99a415cb6c4898b1437fa08f3d4451dbd8f8e5d1..79c29ca0ef90f98f4ad98e154d8c8411dee454d5 100644 --- a/css/style.css +++ b/css/style.css @@ -148,10 +148,10 @@ h2{ /** * Give some extra space to single-page wrappers + */ .content { - padding: 50px 0px; + padding: 10px 0px; } - */ .content ul, .content ol, .items li ul { padding: 20px 30px; } diff --git a/functions.php b/functions.php index 947a798770656e45e7b8148e2da98c1442feb210..1d4d287a3b9b152ddcf8958c470ed31ff14ef5bc 100644 --- a/functions.php +++ b/functions.php @@ -122,25 +122,17 @@ function article_img($slug){ } function print_item($item, $class){ - echo '<li '.$class.'>'; + echo '<li class="'.$class.'">'; echo '<a href="'.menu_url($item).'" title="'.menu_title($item).'">'; echo menu_name($item).' </a></li>'; } function build_menu($parent, $tree){ foreach($tree[$parent] as $i => $item){ - if(menu_active($item)){ - $class='class="active"'; - $expand="true"; - $collapse="collapse in"; - }else{ - $class=''; - $expand='false'; - $collapse="collapse"; - } + $class=menu_active($item)?'active':''; if(array_key_exists($item->id, $tree)){ - echo '<li '.$class.' id="btn'.$item->id.'" data-toggle="collapse" data-target="#submenu'.$item->id.'" aria-expanded="'.$expand.'"><a href="#" >'.menu_name($item).'</a>'; - echo '<ul class="nav navbar-nav '.$collapse.'" id="submenu'.$item->id.'" role="menu" aria-labelledby="btn'.$item->id.'" >'; + echo '<li class="dropdown '.$class.'"><a class="dropdown-toggle" data-toggle="dropdown" href="#">'.menu_name($item).'<span class="caret"></span></a>'; + echo '<ul class="dropdown-menu">'; build_menu($item->id, $tree); echo '</ul>'; echo '</li>';