diff options
| author | Mark Otto <[email protected]> | 2012-07-29 16:24:05 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-07-29 16:24:05 -0700 |
| commit | 761429d88a0716b27c2c78d27dd1da467a8318e3 (patch) | |
| tree | af2b73579e5ce091544feca638ddae6c81c2081e /less/bootstrap.less | |
| parent | 134d11b5283de087a6f069e59fbceed3de52092e (diff) | |
| parent | a30045daef809edf5ed592ad842c04377898e444 (diff) | |
| download | bootstrap-761429d88a0716b27c2c78d27dd1da467a8318e3.tar.xz bootstrap-761429d88a0716b27c2c78d27dd1da467a8318e3.zip | |
Merge branch '2.1.0-wip-navbar' into 2.1.0-wip
Diffstat (limited to 'less/bootstrap.less')
| -rw-r--r-- | less/bootstrap.less | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/less/bootstrap.less b/less/bootstrap.less index c43875a80..94e5a6c2f 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -40,7 +40,8 @@ // Components: Nav @import "navs.less"; -@import "navbar.less"; +//@import "navbar.less"; +@import "navbar-redux.less"; @import "breadcrumbs.less"; @import "pagination.less"; @import "pager.less"; |