Minor fixes

symfony2admingenerator · Jun 18, 2014 · d16bb80 · d16bb80
1 parent 07b7e1f
commit d16bb80
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/Menu/DefaultMenuBuilder.php b/Menu/DefaultMenuBuilder.php
@@ -12,7 +12,7 @@ class DefaultMenuBuilder extends AdmingeneratorMenuBuilder
     public function navbarMenu(FactoryInterface $factory, array $options)
     {
         $menu = $factory->createItem('root');
-        $menu->setChildrenAttributes(array('id' => 'main_navigation', 'class' => 'nav'));
+        $menu->setChildrenAttributes(array('id' => 'main_navigation', 'class' => 'nav navbar-nav'));
 
         $overwrite = $this->addDropdown($menu, 'Replace this menu');
 

diff --git a/Resources/public/css/bootstrap-extended.css b/Resources/public/css/bootstrap-extended.css
@@ -176,7 +176,7 @@ input.btn.btn-reset:hover {
     cursor: text;
 }
 
-.list_scope_group .btn [class^="glyphicon-"] {
+.list_scope_group .btn [class^="fa-"] {
     font-size: 12px;
 }
 
@@ -186,21 +186,26 @@ input.btn.btn-reset:hover {
     font-size: 14px;
 }
 
+/* Fix active link */
+li.active > a {
+    color: #fff;
+}
+
 /* Fix cursor */
-a:hover > [class^="glyphicon-"]:before,
-a:hover > [class*=" glyphicon-"]:before,
-button:hover > [class^="glyphicon-"]:before,
-button:hover > [class*=" glyphicon-"]:before {
+a:hover > [class^="fa-"]:before,
+a:hover > [class*=" fa-"]:before,
+button:hover > [class^="fa-"]:before,
+button:hover > [class*=" fa-"]:before {
     cursor: pointer;
 }
 
 /* Fix icons */
-[class^="glyphicon-"],
-[class*=" glyphicon-"],
-[class^="glyphicon-"]:focus,
-[class*=" glyphicon-"]:focus,
-*:focus > [class^="glyphicon-"],
-*:focus > [class*=" glyphicon-"] {
+[class^="fa-"],
+[class*=" fa-"],
+[class^="fa-"]:focus,
+[class*=" fa-"]:focus,
+*:focus > [class^="fa-"],
+*:focus > [class*=" fa-"] {
     background-image: none !important;
 }