Skip to content

Commit

Permalink
Merge pull request #529 from ualbertalib/cds/add-bootstrap-5-layouts
Browse files Browse the repository at this point in the history
Add Bootstrap 5 layouts
  • Loading branch information
ConnorSheremeta authored Jan 17, 2024
2 parents 7a9508e + 109561b commit a14abeb
Show file tree
Hide file tree
Showing 7 changed files with 777 additions and 12 deletions.
35 changes: 35 additions & 0 deletions app/views/layouts/2020_bootstrap_v5.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!doctype html>
<html lang="en">
<head>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<%= favicon_link_tag 'https://www.ualberta.ca/favicon.svg' %>
<%= javascript_pack_tag '2020main-bootstrap-v5' %>
<%= stylesheet_pack_tag '2020main-bootstrap-v5' %>
<script src="https://kit.fontawesome.com/5dc7d61ac4.js" crossorigin="anonymous"></script>
<!-- Google tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-5QT07E47HT"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'G-5QT07E47HT');
</script>
<%= stylesheet_link_tag comfy_cms_render_css_path(@cms_site.id, @cms_layout.identifier) %>
<title>
<% if content_for(:title) %>
<%= yield(:title) %> - UofA Library
<% elsif @cms_page %>
<%= @cms_page.label %> - UofA Library
<% else %>
University of Alberta Library
<% end %>
</title>
</head>
<body class="d-flex flex-column">

<%= yield %>

</body>
</html>
31 changes: 31 additions & 0 deletions app/webpacker/packs/2020main-bootstrap-v5.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Importing and adding jQuery which is required for our legacy js (pre-bootstrap 5 layouts), remove one fully migrated.
import jquery from 'jquery'
window.jQuery = jquery
window.$ = jquery

import '@popperjs/core'
import 'bootstrap'
import '../src/stylesheets/2020main-bootstrap-v5.css';

$(function() {
$('[data-toggle-second="tooltip"]').tooltip();
$('[data-toggle-second="tooltip"]').on('click', function() {
$(this).tooltip('hide')
})

var mode = localStorage.getItem('mode');
if (mode == 'dark') {
$('body').addClass('dark-mode');
$('#dark-mode-toggle').click(function() {
$('body').toggleClass('dark-mode');
localStorage.setItem('mode', 'lite');
mode = localStorage.getItem('mode');
});
} else {
$('#dark-mode-toggle').click(function() {
$('body').toggleClass('dark-mode');
localStorage.setItem('mode', 'dark');
mode = localStorage.getItem('mode');
});
}
});
6 changes: 3 additions & 3 deletions app/webpacker/packs/2020main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

import 'jquery'
import 'popper.js'
import 'bootstrap'
import 'bootstrap-v462'
import '../src/stylesheets/2020main.css';


Expand Down Expand Up @@ -29,6 +29,6 @@ $(function() {
});
}


});

Loading

0 comments on commit a14abeb

Please sign in to comment.