Fix navigation bar overlap. Fix js include.

JerryScript-DCO-1.0-Signed-off-by: Andrey Shitov a.shitov@samsung.com
This commit is contained in:
Andrey Shitov
2015-06-14 23:11:12 +03:00
parent 86e129d998
commit 8c5ecfd1d2
3 changed files with 10 additions and 5 deletions
+3 -3
View File
@@ -9,7 +9,7 @@
</button> </button>
<a class="navbar-brand" href="{{ site.baseurl }}/"><b>JerryScript</b></a> <a class="navbar-brand" href="{{ site.baseurl }}/"><b>JerryScript</b></a>
</div> </div>
<div id="navbar" class="collapse navbar-collapse" style="position: relative;"> <div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
{% if page.url == "/" %} {% if page.url == "/" %}
<li class="active"><a href="{{ site.baseurl }}/">Home</a></li> <li class="active"><a href="{{ site.baseurl }}/">Home</a></li>
@@ -19,7 +19,7 @@
<li><a href="http://github.com/Samsung/jerryscript">View on Github</a></li> <li><a href="http://github.com/Samsung/jerryscript">View on Github</a></li>
<li><a href="http://www.iotjs.net">Powering <b>IoT.js</b></a></li> <li><a href="http://www.iotjs.net">Powering <b>IoT.js</b></a></li>
</ul> </ul>
<ul class="nav navbar-nav" style="position: absolute; right: 0px;"> <ul class="nav navbar-nav navbar-right">
{% for p in site.pages %} {% for p in site.pages %}
{% if p.title %} {% if p.title %}
{% if page.url == p.url %} {% if page.url == p.url %}
@@ -27,7 +27,7 @@
{% else %} {% else %}
<li><a href="{{ p.url | prepend: site.baseurl }}" >{{ p.title }}</a></li> <li><a href="{{ p.url | prepend: site.baseurl }}" >{{ p.title }}</a></li>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- Bootstrap core JavaScript --> <!-- Bootstrap core JavaScript -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="bootstrap.min.js"></script> <script src="{{ site.baseurl }}/bootstrap.min.js"></script>
</body> </body>
</html> </html>
+6 -1
View File
File diff suppressed because one or more lines are too long