Cleaner dropdown menu

css/reset.css

@@ -83,7 +83,7 @@ a {
  */
 .wrap {
 	min-width: 280px;
-	max-width: 900px;
+	max-width: 850px;
 	width: 60%;
 
 	margin: 0 auto;

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;
 	}

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>';