Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade to bootstrap 2.1.0 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1375986 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-08-22 11:16:13 +00:00
parent 13d23c7718
commit 2abc4f0836
5 changed files with 7665 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
View File

@ -133,3 +133,14 @@ footer {
margin: 0;
height: auto;
}
.navbar .brand {
color: #555555;
display: block;
float: left;
font-size: 20px;
font-weight: 200;
margin-left: -20px;
padding: 5px 5px;
text-shadow: 0 1px 0 #FFFFFF;
}

5624
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/bootstrap.2.1.0.css vendored Normal file
View File

File diff suppressed because it is too large Load Diff

4
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
View File

@ -26,7 +26,7 @@
<link rel="stylesheet" href="css/jqueryFileTree.css"/>
<link rel="stylesheet" href="css/chosen-0.9.7.css"/>
<link rel="stylesheet" href="css/jquery-ui-1.8.16.custom.css"/>
<link rel="stylesheet" href="css/bootstrap.2.0.4.css">
<link rel="stylesheet" href="css/bootstrap.2.1.0.css">
<link rel="stylesheet" href="css/archiva.css">
<link rel="shortcut icon" href="favicon.ico"/>
@ -115,7 +115,7 @@
"jquery.ui": "jquery-ui-1.8.16.custom.min",
"jquery.ui.widget": "jquery.ui.widget-1.8.18",
"jquery.cookie": "jquery.cookie.1.0.0",
"bootstrap": "bootstrap.2.0.4",
"bootstrap": "bootstrap.2.1.0",
"choosen": "chosen.jquery-0.9.7",
"jquery.validate": "jquery.validate-1.9.0",
"jquery.json": "jquery.json-2.3.min",

2027
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/bootstrap.2.1.0.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

2
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
View File

@ -61,7 +61,7 @@
<div style="max-height: 40px" class="navbar-inner">
<div class="container-fluid">
<div id="organisation-logo" class="pull-left"></div>
<div id="organisation-logo" style="max-height: 40px" class="pull-left"></div>
<ul class="nav pull-right">
<li id="create-admin-link" style="display: none">
<a href="#open-admin-create-box" onclick="adminCreateBox();" id="create-admin-link-a">