Update Sass

3 files changed, 22 insertions, 26 deletions

diff --git a/resources/pug/finals/index.pug b/resources/pug/finals/index.pug
index 7ff99b2..041e2ec 100644
--- a/resources/pug/finals/index.pug
+++ b/resources/pug/finals/index.pug
@@ -6,23 +6,23 @@ block extra_head
 block titleContainer
 
 block append js
-	script(src='/assets/js/jquery.slim.min.js')
-	script(src='/assets/js/scrollspy.min.js')
+	script(src='/assets/js/bootstrap.min.js')
 
-	script $('body').scrollspy({target: '#sticky-nav'});
+	script new bootstrap.ScrollSpy(document.body, {target: '#sticky-nav'});
 
 block content
 	#sticky-nav
-		ul.nav.nav-pills
-			li(role='presentation') #[a(href='#introduction') Introduction]
-			li(role='presentation') #[a(href='#publications') Publications]
-			li(role='presentation') #[a(href='#talks') Talks]
-			li(role='presentation') #[a(href='#projects') Software projects]
-			li(role='presentation') #[a(href='#teaching') Teaching]
-			li(role='presentation') #[a(href='#service') Service]
-			li(role='presentation') #[a(href='#grants') Grants]
-			li(role='presentation') #[a(href='#employment') Employment]
-			li(role='presentation') #[a(href='#education') Education]
+		ul.nav.flex-column.nav-pills
+			li.nav-item(role='presentation') #[a.nav-link(href='#introduction') Introduction]
+			li.nav-item(role='presentation') #[a.nav-link(href='#publications') Publications]
+			li.nav-item(role='presentation') #[a.nav-link(href='#talks') Talks]
+			li.nav-item(role='presentation') #[a.nav-link(href='#service') Service]
+			li.nav-item(role='presentation') #[a.nav-link(href='#statistics') Statistics]
+			li.nav-item(role='presentation') #[a.nav-link(href='#projects') Software projects]
+			li.nav-item(role='presentation') #[a.nav-link(href='#teaching') Teaching]
+			li.nav-item(role='presentation') #[a.nav-link(href='#grants') Grants]
+			li.nav-item(role='presentation') #[a.nav-link(href='#employment') Employment]
+			li.nav-item(role='presentation') #[a.nav-link(href='#education') Education]
 
 	.container#content
 		header#introduction
diff --git a/resources/pug/finals/publications.pug b/resources/pug/finals/publications.pug
index e88db1f..6a46390 100644
--- a/resources/pug/finals/publications.pug
+++ b/resources/pug/finals/publications.pug
@@ -109,7 +109,6 @@ block content
 				chart: {
 					spacingLeft: 0,
 					spacingRight: 0,
-					style: {fontSize: '1.5rem'},
 					zooming: {type: 'x'},
 				},
 				scrollbar: {
@@ -175,7 +174,6 @@ block content
 				type: 'scatter',
 				spacingLeft: 0,
 				spacingRight: 0,
-				style: {fontSize: '1.5rem'},
 			},
 			title: null,
 			xAxis: [{
diff --git a/resources/pug/include/layout-sidebar.pug b/resources/pug/include/layout-sidebar.pug
index 4244531..55d7817 100644
--- a/resources/pug/include/layout-sidebar.pug
+++ b/resources/pug/include/layout-sidebar.pug
@@ -1,14 +1,12 @@
 extends layout.pug
 
 block prepend js
-	script(src='/assets/js/jquery.slim.min.js')
-	script(src='/assets/js/transition.min.js')
-	script(src='/assets/js/collapse.min.js')
+	script(src='/assets/js/bootstrap.min.js')
 
 block content
 	div.row
 		nav.col-lg-3.col-md-4
-			ul.nav.nav-pills.nav-stacked
+			ul.nav.flex-column.nav-pills
 				block menu
 					mixin menu(...items)
 						-
@@ -34,23 +32,23 @@ block content
 						each item in items
 							if 'menu' in item
 								- const active = item.menu.some(item_is_active)
-								li(role='presentation')
+								li.nav-item(role='presentation')
 									- const id = 'menu-' + item_link(item);
-									a(href='#' + id, data-toggle='collapse', role='button', aria-expanded=active.toString(), aria-controls=id)= item.name
-									div.collapse(id=id, class=active ? 'in' : '')
-											ul.nav.nav-pills.nav-stacked.col-xs-11.col-md-10.pull-right
+									a.nav-link(href='#' + id, data-bs-toggle='collapse', role='button', aria-expanded=active.toString(), aria-controls=id)= item.name
+									div.collapse(id=id, class=active ? 'in show' : '')
+											ul.nav.flex-column.nav-pills.col-xs-11.col-md-10.float-end
 												+menu(...item.menu)
 											br(style='clear:both;')
 
 							else
 								- var link = item_link(item)
-								li(role='presentation', class=item_is_active(item) ? 'active' : '')
-									a(href=base_url + (link == '' ? '' : link + '.html'))= item.name
+								li.nav-item(role='presentation')
+									a.nav-link(href=base_url + (link == '' ? '' : link + '.html'), class=item_is_active(item) ? 'active' : '')= item.name
 
 		nav.col-lg-9.col-md-8
 			ol.breadcrumb.hidden-xs.hidden-sm
 				mixin breadcrumb(link, title)
-					li
+					li.breadcrumb-item
 						if typeof title != 'undefined'
 							a(href=link)= title
 						else