Skip to content

Commit cdb1c0f

Browse files
bqminhbqminh
committed
update new bootstrap CSS 5.3
1 parent eea6866 commit cdb1c0f

14 files changed

Lines changed: 87 additions & 76 deletions

‎_includes/js.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
2-
<script src="{{ "/assets/js/bootstrap.min.js" | prepend: site.baseurl }}"></script>
2+
<script src="{{ "/assets/js/bootstrap.bundle.min.js" | prepend: site.baseurl }}"></script>
33
<script src="{{ "/assets/js/retina-1.1.0.js" | prepend: site.baseurl }}"></script>
44
<script src="{{ "/assets/js/jquery.hoverdir.js" | prepend: site.baseurl }}"></script>
55
<!--<script src="{{ "/assets/js/jquery.hoverex.min.js" | prepend: site.baseurl }}"></script>

‎_includes/members.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ <h3 class="mb centered">IQ-TREE DEVELOPMENT TEAM</h3>
77
{% endif %}
88
<div class="col-sm-4">
99
<a href="{{ member.social.first.url }}">
10-
<img class="img-circle" src="{{'/assets/img/members/' | prepend: site.baseurl }}{{member.img}}">
10+
<img style="border-radius: 50%;" class="img-circle" src="{{'/assets/img/members/' | prepend: site.baseurl }}{{member.img}}">
1111
</a>
1212
<h4><a href="{{ member.social.first.url }}">{{ member.name }}</a></h4>
1313
<em>{{ member.position }}</em>

‎_includes/nav.html‎

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,38 @@
11
<!-- Fixed navbar -->
2-
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
3-
<div class="container">
4-
<div class="navbar-header">
5-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
6-
<span class="sr-only">Toggle navigation</span>
7-
<span class="icon-bar"></span>
8-
<span class="icon-bar"></span>
9-
<span class="icon-bar"></span>
10-
</button>
11-
<a class="navbar-brand" href="{{ "/" | prepend: site.baseurl }}">{{ site.title }}</a>
12-
</div>
13-
<div class="navbar-collapse collapse navbar-right">
14-
<ul class="nav navbar-nav">
15-
<li {% if page.title == "XXX" %}class="active"{% endif %}><a data-toggle="collapse" data-target=".navbar-collapse" href="{{"/#download" | prepend: site.baseurl }}">Download</a></li>
16-
<li {% if page.title == "News" %}class="active"{% endif %}><a href="{{"/news/" | prepend: site.baseurl }}">News</a></li>
17-
<li class="dropdown">
18-
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Web server
19-
<span class="caret"></span></a>
2+
<nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark">
3+
<div class="container-fluid">
4+
<a class="navbar-brand" href="{{ "/" | prepend: site.baseurl }}">{{ site.title }}</a>
5+
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
6+
<span class="navbar-toggler-icon"></span>
7+
</button>
8+
<div class="collapse navbar-collapse" id="navbarSupportedContent">
9+
<ul class="navbar-nav me-auto mb-0 mb-lg-0">
10+
<li {% if page.title == "XXX" %}class="nav-item active"{% else %}class="nav-item"{% endif %}>
11+
<a class="nav-link" aria-current="page" href="{{"/#download" | prepend: site.baseurl }}">Download</a>
12+
</li>
13+
<li {% if page.title == "News" %}class="nav-item active"{% else %}class="nav-item"{% endif %}>
14+
<a class="nav-link" href="{{"/news/" | prepend: site.baseurl }}">News</a>
15+
</li>
16+
<li class="nav-item dropdown">
17+
<a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
18+
Web server
19+
</a>
2020
<ul class="dropdown-menu">
21-
<li><a href="http://iqtree.cibiv.univie.ac.at" target="_blank">CIBIV, Austria</a></li>
22-
<li><a href="https://www.hiv.lanl.gov/content/sequence/IQTREE/iqtree.html" target="_blank">Los Alamos Lab, USA</a></li>
23-
<li><a href="https://www.phylo.org" target="_blank">CIPRES Gateway, USA</a></li>
21+
<li><a class="dropdown-item" href="http://iqtree.cibiv.univie.ac.at" target="_blank">CIBIV, Austria</a></li>
22+
<li><a class="dropdown-item" href="https://www.hiv.lanl.gov/content/sequence/IQTREE/iqtree.html" target="_blank">Los Alamos Lab, USA</a></li>
23+
<li><a class="dropdown-item" href="https://www.phylo.org" target="_blank">CIPRES Gateway, USA</a></li>
2424
</ul>
2525
</li>
26-
<li {% if page.title == "Documentation" or page.categories.first == "doc" %}class="active"{% endif %}><a href="{{"/doc/" | prepend: site.baseurl }}">Docs</a></li>
27-
<li {% if page.title == "Workshops"%}class="active"{% endif %}><a href="{{"/workshop/" | prepend: site.baseurl }}">Workshop</a></li>
28-
<li {% if page.title == "About IQ-TREE" %}class="active"{% endif %}><a href="{{"/about/" | prepend: site.baseurl }}">About</a></li>
26+
<li {% if page.title == "Documentation" or page.categories.first == "doc" %}class="nav-item active"{% else %}class="nav-item"{% endif %}>
27+
<a class="nav-link" href="{{"/doc/" | prepend: site.baseurl }}">Docs</a>
28+
</li>
29+
<li {% if page.title == "Workshops"%}class="nav-item active"{% else %}class="nav-item"{% endif %}>
30+
<a class="nav-link" href="{{"/workshop/" | prepend: site.baseurl }}">Workshop</a>
31+
</li>
32+
<li {% if page.title == "About IQ-TREE" %}class="nav-item active"{% else %}class="nav-item"{% endif %}>
33+
<a class="nav-link" href="{{"/about/" | prepend: site.baseurl }}">About</a>
34+
</li>
2935
</ul>
3036
</div><!--/.nav-collapse -->
3137
</div>
32-
</div>
38+
</nav>

‎_includes/pagenav.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<nav aria-label="...">
2-
<ul class="pager">
2+
<ul class="pagination">
33
{% if page.pageid != 1 %}
44
{% if page.pageid == 2 %}
55
{% assign previd = '' %}
66
{% else %}
77
{% assign previd = page.pageid | minus: 1 %}
88
{% endif %}
9-
<li><a href="../news{{previd}}"><span aria-hidden="true">&larr;</span> Newer posts</a></li>
9+
<li class="page-item"><a class="page-link" href="../news{{previd}}"><span aria-hidden="true">&larr;</span> Newer posts</a></li>
1010
{% endif %}
1111
{% if page.pageid != site.num_pages %}
1212
{% assign nextid = page.pageid | plus: 1 %}
13-
<li><a href="../news{{nextid}}">Older posts <span aria-hidden="true">&rarr;</span></a></li>
13+
<li class="page-item"><a class="page-link" href="../news{{nextid}}">Older posts <span aria-hidden="true">&rarr;</span></a></li>
1414
{% endif %}
1515
</ul>
1616
</nav>

‎_includes/sidebar.html‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="well well-sm">
1+
<div class="card card-body bg-light">
22
<h4 class="rss-subscribe"><i class="fa fa-rss"></i> Subscribe to IQ-TREE blog <a href="{{ "/feed.xml" | prepend: site.baseurl }}">via RSS</a></h4>
33
<div class="hline"></div>
44
<h4 class="centered">Recent Posts</h4>
@@ -16,14 +16,4 @@ <h4 class="centered">Recent Posts</h4>
1616
</div>
1717
</div>
1818
</div>
19-
20-
<!-- <div class="well">
21-
<h4>Popular Tags</h4>
22-
<p>
23-
{% for tag in site.tags %}
24-
{% if tag.first != "tutorial" and tag.first != "manual" %}
25-
<a class="btn btn-theme" href="{{ '/category/?tagName=' | prepend: site.baseurl }}{{ tag | first }}" role="button">{{ tag | first | capitalize }} <span class="badge">{{ tag | last | size }}</span></a>
26-
{% endif %}
27-
{% endfor %}
28-
</p>
29-
</div>-->
19+
<br>

‎_includes/sidebardoc.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
<div class="spacing"></div>-->
66

77

8-
<div class="well well-sm">
8+
<div class="card card-body bg-light">
99
<a href="iqtree-doc.pdf"><i class="fa fa-file-pdf-o fa-lg" aria-hidden="true"></i> Download Tutorials and Manual in one PDF</a>
1010
</div>
11-
<div class="well well-sm" id="sidebar">
11+
<br>
12+
<div class="card card-body bg-light" id="sidebar">
1213
<h4>Documentation</h4>
1314
{% assign sorted_posts = (site.pages | where: "layout", "userdoc" | sort: 'docid') %}
1415
{% for post in sorted_posts %}
@@ -39,3 +40,4 @@ <h4>Documentation</h4>
3940
{% endif %}
4041
{% endfor %}
4142
</div>
43+
<br>

‎_includes/sidebarnews.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% for alltag in site.tags %}
22
{% assign tag = alltag | first %}
33
{% if tag != 'tutorial' and tag != 'manual' %}
4-
<div class="well well-sm">
4+
<div class="card card-body bg-light">
55
<h4>Recent {{tag}}s</h4>
66
<div class="row">
77
<div class="popular-posts">
@@ -21,5 +21,6 @@ <h4>Recent {{tag}}s</h4>
2121
</div>
2222
</div>
2323
</div>
24+
<br>
2425
{% endif %}
2526
{% endfor %}

‎_includes/sidebarrelease.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{% else %}
33
{% assign num_releases = 5 %}
44
{% endif %}
5-
<div class="well well-sm">
5+
<div class="card card-body bg-light">
66
<h4>{% if num_releases == 5 %}Recent{% endif %} IQ-TREE releases</h4>
77
<div class="row">
88
<div class="popular-posts">
@@ -17,3 +17,4 @@ <h4>{% if num_releases == 5 %}Recent{% endif %} IQ-TREE releases</h4>
1717
<p><strong><a href="{{site.baseurl}}/release">&#8594; All release history</a></strong></p>
1818
{% endif %}
1919
</div>
20+
<br>

‎_layouts/default.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
{% include head.html %}
99

10-
<body>
10+
<body style="padding-top: 8px;">
1111
{% include nav.html %}
1212

1313
{{ content }}

‎assets/css/bootstrap.min.css‎

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)