Merge branch '1.1.x'
This commit is contained in:
commit
5b671847d3
|
@ -4,11 +4,11 @@
|
|||
<title>Static</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<link rel="stylesheet" type="text/css"
|
||||
href="/webjars/bootstrap/3.0.3/css/bootstrap.min.css" />
|
||||
href="webjars/bootstrap/3.0.3/css/bootstrap.min.css" />
|
||||
</head>
|
||||
<body>
|
||||
<script type="text/javascript"
|
||||
src="/webjars/jquery/2.0.3/jquery.min.js"></script>
|
||||
src="webjars/jquery/2.0.3/jquery.min.js"></script>
|
||||
<div id="navbar" class="navbar navbar-default" role="navigation">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse"
|
||||
|
@ -22,7 +22,7 @@
|
|||
</div>
|
||||
<div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav">
|
||||
<li><a href="/"> Home </a></li>
|
||||
<li><a href="./"> Home </a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -34,6 +34,6 @@
|
|||
</p>
|
||||
</div>
|
||||
<script type="text/javascript"
|
||||
src="/webjars/bootstrap/3.0.3/js/bootstrap.min.js"></script>
|
||||
src="webjars/bootstrap/3.0.3/js/bootstrap.min.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
Loading…
Reference in New Issue