diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-02-02 20:39:50 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-02-02 20:39:50 +0000 |
| commit | 330d4576cf1cf5ab3203a5220756c1991e5e933b (patch) | |
| tree | 0d62800d363f819a765d9118f342bfbc4978fb87 /archiva-modules/archiva-web/archiva-webapp-js | |
| parent | 6bfa0d7fd77c016d249b01bf526f0ad20301417d (diff) | |
| download | archiva-330d4576cf1cf5ab3203a5220756c1991e5e933b.tar.gz archiva-330d4576cf1cf5ab3203a5220756c1991e5e933b.zip | |
[MRM-1598] use bootstrap css 2.x .
fix topbar class names
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1239813 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-webapp-js')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html | 4 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html | 35 |
2 files changed, 21 insertions, 18 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html index 2effbe5a9..21ac40ad2 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html @@ -2,7 +2,7 @@ <html> <head> <link rel="stylesheet" href="css/jquery-ui-1.8.16.custom.css"/> - <link rel="stylesheet" href="css/bootstrap.min.2.0.0.css"> + <link rel="stylesheet" href="css/bootstrap.css"> <link rel="stylesheet" href="css/archiva.css"> @@ -14,7 +14,7 @@ </head> -<body style="padding-top: 20px;"> +<body> <!-- style="padding-top: 20px;" --> <div id="topbar-menu-container"></div> diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html index fbd8a0d37..7530b7722 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html @@ -17,40 +17,43 @@ ~ under the License. --> <div id="topbar-menu"> -<div class="navbar navbar-fixed-top" style="z-index: 5;"> +<div class="navbar navbar-fixed-top"> - <div class="navbar-inner"> + <div style="max-height: 40px" class="navbar-inner"> <div class="container-fluid"> - <a class="brand" href="index.html">Archiva</a> + <a class="brand pull-left" href="index.html">Archiva</a> <div class="nav-collapse"> - <ul class="nav secondary-nav"> - <li id="create-admin-link" style="display: none"> + <ul class="nav pull-right"> + <li id="create-admin-link" class="pull-right" style="display: none"> <a href="#" onclick="adminCreateBox();" id="create-admin-link-a"> - <span class="label important">${$.i18n.prop('create.admin.page.link')}</span> + <span class="label label-important">${$.i18n.prop('create.admin.page.link')}</span> </a> </li> - <li id="login-link" style="display: none"> + <li id="login-link" class="pull-right" style="display: none"> <a href="#" onclick="loginBox();" id="login-link-a"> - <span class="label success">${$.i18n.prop('login')}</span> + <span class="label label-success">${$.i18n.prop('login')}</span> </a> </li> - <li id="change-password-link" style=""> + <li id="change-password-link" class="pull-right" style=""> <a href="#" onclick="editUserDetailsBox();">${$.i18n.prop('edit.details')}</a> </li> - <li id="logout-link" style="display: none"> + <li id="logout-link" class="pull-right" style="display: none"> <a href="#" onclick="logout();" id="logout-link-a"> - <span class="label important">${$.i18n.prop('logout')}</span> + <span class="label label-important">${$.i18n.prop('logout')}</span> </a> </li> - <li id="register-link" style="display: none"> + <li id="register-link" class="pull-right" style="display: none"> <a href="#" onclick="registerBox();" id="register-link-a"> - <span class="label notice">${$.i18n.prop('register')}</span> + <span class="label label-info">${$.i18n.prop('register')}</span> </a> </li> + <li class="pull-right"> + <form class="pull-right" action=""> + <input type="text" placeholder="Search" /> + </form> + </li> </ul> - <form class="pull-right" action=""> - <input type="text" placeholder="Search" /> - </form> + </div> </div> </div> |