php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-22 19:31:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

only add navbar-default when no other class is set (e.g. navbar-inverse)

Browse Source 
fixes #1553
This commit is contained in:
Carsten Brandt
2013-12-17 10:42:21 +01:00
parent 4ed1c2fcb6
commit d6866256df
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/yii/bootstrap/CHANGELOG.md
View File

@ -5,6 +5,7 @@ Yii Framework 2 bootstrap extension Change Log
----------------------------
- Enh #1474: Added option to make NavBar 100% width (cebe)
- Enh #1553: Only add navbar-default class to NavBar when no other class is specified (cebe)
2.0.0 alpha, December 1, 2013
-----------------------------

5
extensions/yii/bootstrap/NavBar.php
View File

@ -67,7 +67,10 @@ class NavBar extends Widget
{
parent::init();
$this->clientOptions = false;
Html::addCssClass($this->options, 'navbar navbar-default');
Html::addCssClass($this->options, 'navbar');
if ($this->options['class'] == 'navbar') {
Html::addCssClass($this->options, 'navbar-default');
}
Html::addCssClass($this->brandOptions, 'navbar-brand');
if (empty($this->options['role'])) {
$this->options['role'] = 'navigation';