Skip to content

Commit d16bb80

Browse files
committed
Minor fixes
1 parent 07b7e1f commit d16bb80

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

Menu/DefaultMenuBuilder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class DefaultMenuBuilder extends AdmingeneratorMenuBuilder
1212
public function navbarMenu(FactoryInterface $factory, array $options)
1313
{
1414
$menu = $factory->createItem('root');
15-
$menu->setChildrenAttributes(array('id' => 'main_navigation', 'class' => 'nav'));
15+
$menu->setChildrenAttributes(array('id' => 'main_navigation', 'class' => 'nav navbar-nav'));
1616

1717
$overwrite = $this->addDropdown($menu, 'Replace this menu');
1818

Resources/public/css/bootstrap-extended.css

+16-11
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ input.btn.btn-reset:hover {
176176
cursor: text;
177177
}
178178

179-
.list_scope_group .btn [class^="glyphicon-"] {
179+
.list_scope_group .btn [class^="fa-"] {
180180
font-size: 12px;
181181
}
182182

@@ -186,21 +186,26 @@ input.btn.btn-reset:hover {
186186
font-size: 14px;
187187
}
188188

189+
/* Fix active link */
190+
li.active > a {
191+
color: #fff;
192+
}
193+
189194
/* Fix cursor */
190-
a:hover > [class^="glyphicon-"]:before,
191-
a:hover > [class*=" glyphicon-"]:before,
192-
button:hover > [class^="glyphicon-"]:before,
193-
button:hover > [class*=" glyphicon-"]:before {
195+
a:hover > [class^="fa-"]:before,
196+
a:hover > [class*=" fa-"]:before,
197+
button:hover > [class^="fa-"]:before,
198+
button:hover > [class*=" fa-"]:before {
194199
cursor: pointer;
195200
}
196201

197202
/* Fix icons */
198-
[class^="glyphicon-"],
199-
[class*=" glyphicon-"],
200-
[class^="glyphicon-"]:focus,
201-
[class*=" glyphicon-"]:focus,
202-
*:focus > [class^="glyphicon-"],
203-
*:focus > [class*=" glyphicon-"] {
203+
[class^="fa-"],
204+
[class*=" fa-"],
205+
[class^="fa-"]:focus,
206+
[class*=" fa-"]:focus,
207+
*:focus > [class^="fa-"],
208+
*:focus > [class*=" fa-"] {
204209
background-image: none !important;
205210
}
206211

0 commit comments

Comments
 (0)