projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
roojs-bootstrap.js
[roojs1]
/
roojs-bootstrap-debug.js
diff --git
a/roojs-bootstrap-debug.js
b/roojs-bootstrap-debug.js
index
9f054a3
..
8f7c8a7
100644
(file)
--- a/
roojs-bootstrap-debug.js
+++ b/
roojs-bootstrap-debug.js
@@
-4415,8
+4415,12
@@
Roo.extend(Roo.bootstrap.NavGroup, Roo.bootstrap.Component, {
cfg.cls += ' nav-' + this.type;
} else {
// trying to remove so header bar can right align top?
cfg.cls += ' nav-' + this.type;
} else {
// trying to remove so header bar can right align top?
- //cfg.cls += ' navbar-nav';
+ if (this.parent() && this.parent().xtype != 'NavHeaderbar') {
+ // do not use on header bar...
+ cfg.cls += ' navbar-nav';
+ }
}
}
+
} else {
if (['tabs','pills'].indexOf(this.type) != -1) {
cfg.cls += ' nav-' + this.type
} else {
if (['tabs','pills'].indexOf(this.type) != -1) {
cfg.cls += ' nav-' + this.type