Skip to content

Commit

Permalink
More cleanups of UI
Browse files Browse the repository at this point in the history
  • Loading branch information
JonathanGiles committed Dec 9, 2023
1 parent a52edc9 commit e9f04e7
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 57 deletions.
2 changes: 0 additions & 2 deletions src/main/resources/www/pages/contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ <h2>Contact</h2>
<p>
<i class="fa-brands fa-twitter"></i>&nbsp;<a href="https://www.twitter.com/JonathanGiles" target="_self">Twitter</a>
<br />
<i class="fa-brands fa-mastodon"></i>&nbsp;<a rel="me" href="https://hachyderm.io/@JonathanGiles" target="_self">Mastodon</a>
<br />
<i class="fa-brands fa-github"></i>&nbsp;<a href="https://github.com/JonathanGiles" target="_self">GitHub</a>
<br />
<i class="fa-brands fa-linkedin"></i>&nbsp;<a href="https://linkedin.com/in/JonathanGiles" target="_self">LinkedIn</a>
Expand Down
18 changes: 0 additions & 18 deletions src/main/resources/www/static/css/jonathangiles.net.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,6 @@ Version: 1.0
Text Domain: jonathangiles-net
*/

/* Make main content area wider on wide windows */
/*@media only screen and (min-width: 1530px) {
.site-content {
max-width: 1500px !important;
}
.content-area {
width: 79% !important;
margin-left: 0px !important;
margin-right: 5px !important;
}
.widget-area {
width: 20% !important;
margin-left: 10px !important;
margin-right: 0px !important;
}
}*/
/* End of making content area wider */

/* Only show widget area on front-page, not subpages */
body.page .content-area {
width: 100% !important;
Expand Down
2 changes: 0 additions & 2 deletions src/main/resources/www/static/js/jquery-migrate.min.js

This file was deleted.

1 change: 0 additions & 1 deletion src/main/resources/www/static/js/jquery.js

This file was deleted.

49 changes: 22 additions & 27 deletions src/main/resources/www/templates/footer.html
Original file line number Diff line number Diff line change
@@ -1,30 +1,25 @@
<footer id="colophon" class="site-footer">
<div class="site-footer-inner">
<div class="footer-widget-area columns-1">
<div class="footer-widget">
<aside class="widget">
<a href="https://www.twitter.com/JonathanGiles" target="_self"><i class="fa-brands fa-twitter fa-2xl"></i></a>
&nbsp;
<a rel="me" href="https://hachyderm.io/@JonathanGiles" target="_self"><i class="fa-brands fa-mastodon fa-2xl"></i></a>
&nbsp;
<a href="https://github.com/JonathanGiles" target="_self"><i class="fa-brands fa-github fa-2xl"></i></a>
&nbsp;
<a href="https://linkedin.com/in/JonathanGiles" target="_self"><i class="fa-brands fa-linkedin fa-2xl"></i></a>
&nbsp;
<a href="mailto:[email protected]" target="_self"><i class="fa-solid fa-envelope fa-2xl"></i></a>
</aside>
</div>
</div>
<footer class="footer py-4">
<div class="row position-relative">
<center>
<a href="https://www.twitter.com/JonathanGiles" target="_self">
<i class="fa-brands fa-twitter fa-2xl"></i>
</a>
&nbsp;
<a href="https://github.com/JonathanGiles" target="_self">
<i class="fa-brands fa-github fa-2xl"></i>
</a>
&nbsp;
<a href="https://linkedin.com/in/JonathanGiles" target="_self">
<i class="fa-brands fa-linkedin fa-2xl"></i>
</a>
&nbsp;
<a href="mailto:[email protected]" target="_self">
<i class="fa-solid fa-envelope fa-2xl"></i>
</a>
</center>
</div>
</footer>
<div class="site-info-wrapper">
<div class="site-info">
<div class="site-info-inner">
<div class="site-info-text">
</div>
</div>
</div>
</div>


<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.2/js/bootstrap.bundle.min.js" integrity="sha512-X/YkDZyjTf4wyc2Vy16YGCPHwAY8rZJY+POgokZjQB2mhIRFJCckEGc6YyX9eNsPfn0PzThEuNs+uaomE5CO6A==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>

Expand All @@ -39,10 +34,10 @@
});

function updateFooterPosition() {
var bottomOfFooter = $('.site-footer').offset().top + $('.site-footer').outerHeight(true);
var bottomOfFooter = $('.footer').offset().top + $('.footer').outerHeight(true);
var heightShortage = $(document).height() - bottomOfFooter;
if (heightShortage < 0) heightShortage = 0;
$('.site-footer').css('margin-top', heightShortage);
$('.footer').css('margin-top', heightShortage);
}
</script>
</body>
Expand Down
25 changes: 18 additions & 7 deletions src/main/resources/www/templates/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@


<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.2/css/bootstrap.min.css" integrity="sha512-b2QcS5SsA8tZodcDtGRELiGv5SaKSk1vDHDaQRda0htPYWZ6046lr3kJ5bAAQdpV2mmA/4v0wQF9MyU6/pDIAg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
<!-- <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous"> -->

<style id='jonathangiles-net-inline-css' type='text/css'>
/* .site-title a,.site-title a:visited{
color:#blank;
Expand Down Expand Up @@ -141,18 +141,15 @@
box-shadow:inset 0 0 0 9999em;
color:rgba(1, 131, 170, 0.00);
}
.navbar,

/* .main-navigation-container, */
/* .main-navigation.open, */
/* .main-navigation ul ul, */
/* .main-navigation .sub-menu, */
.site-footer{
/*.site-footer{
background-color:#0b3954;
}
.navbar a,
.navbar a:visited {
color: white;
}
.site-footer .widget {
background-color:#ffffff;
}
Expand Down Expand Up @@ -195,6 +192,7 @@
.footer-widget a, .footer-widget a:hover {
color: white;
}
*/
pre.code_block {
padding: 0em;
margin-top: 15px;
Expand All @@ -221,6 +219,19 @@
background-position: top;
background-size: contain;
}

/* new navbar and footer */
.navbar,
.footer {
background-color: #0b3954;
}
.navbar a,
.navbar a:visited,
.footer a,
.footer a:visited {
color: white;
text-decoration: none;
}
</style>

<link rel='stylesheet' id='social-logos-css' href='/css/social-logos.min.css' type='text/css' media='all' />
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/www/templates/hero.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<li class="nav-item"><a class="nav-link" href="/posts.html">Posts</a></li>
<li class="nav-item"><a class="nav-link" href="/media.html">Media</a></li>
<li class="nav-item"><a class="nav-link" href="/presentations.html">Presentations</a></li>
<li class="nav-item"><a class="nav-link" href="https://java.jonathangiles.net">Java Best Practices</a></li>
<li class="nav-item"><a class="nav-link" href="/bio.html">Bio</a></li>
<li class="nav-item"><a class="nav-link" href="/contact.html">Contact</a></li>
</ul>
Expand Down

0 comments on commit e9f04e7

Please sign in to comment.