diff --git a/www/themes/jason-williamsca/assets/css/resume.css b/www/themes/jason-williamsca/assets/css/resume.css index 0f5bce3..027e4bb 100644 --- a/www/themes/jason-williamsca/assets/css/resume.css +++ b/www/themes/jason-williamsca/assets/css/resume.css @@ -9,10 +9,15 @@ h2 { font-size: 1.5rem; } -h1 + h2 { +h1 + h2, h2:first-child { margin-top: 0; } +h3 { + font-size: 1rem; + color: var(--dark-alt-accent-color); +} + section h1:first-child { margin-top: 0; } @@ -46,6 +51,10 @@ section.resume-section .resume-item .resume-date { min-width: 18rem; } +.text-primary { + color: var(--dark-alt-accent-color)!important; +} + /* lg Breakpoint */ @media (min-width: 992px) { section.resume-section { diff --git a/www/themes/jason-williamsca/assets/css/sidemenu.css b/www/themes/jason-williamsca/assets/css/sidemenu.css index 9fe727b..262709e 100644 --- a/www/themes/jason-williamsca/assets/css/sidemenu.css +++ b/www/themes/jason-williamsca/assets/css/sidemenu.css @@ -54,11 +54,9 @@ #side-nav .navbar-collapse .navbar-nav .nav-item .nav-link { display: block; } - /*section.resume-section { - max-width: 75rem; - }*/ - - /* Possibly a different breakpoint on this one */ +} + +@media (min-width: 992px) and (min-height: 620px) { main { margin-top: -8rem; } diff --git a/www/themes/jason-williamsca/assets/css/theme.css b/www/themes/jason-williamsca/assets/css/theme.css index 6dced90..f5a521a 100644 --- a/www/themes/jason-williamsca/assets/css/theme.css +++ b/www/themes/jason-williamsca/assets/css/theme.css @@ -3,6 +3,8 @@ --main-bg-color: #E7D9D1; /*#F0E4D1; #E8D5B5; #e7d9d1;*/ --main-accent-color: #302b44; --light-accent-color: #686283; + --xlight-accent-color: #88839C; + --xxlight-accent-color: #FFFFFF; --alt-accent-color: #B05C71; --dark-alt-accent-color: #913A50; --title-font: 'Cinzel', serif; @@ -96,7 +98,7 @@ a:hover { } /* Custom styles */ -html { overflow-y: scroll; } +html { overflow-x: hidden; overflow-y: scroll; } html::-webkit-scrollbar-track { background-color: rgba(48, 43, 68, 0.2); @@ -125,6 +127,15 @@ html::-webkit-scrollbar-thumb { color: var(--alt-accent-color); } +#side-nav .nav-link, footer a { + text-decoration: none; + color: var(--xlight-accent-color); +} + +#side-nav .nav-link:hover, #side-nav .nav-link.active, footer a:hover, footer a.active { + color: var(--xxlight-accent-color); +} + .social-icons { font-size: 0; } diff --git a/www/themes/jason-williamsca/assets/images/theme-preview.png b/www/themes/jason-williamsca/assets/images/theme-preview.png index 4972048..f7a7e76 100644 Binary files a/www/themes/jason-williamsca/assets/images/theme-preview.png and b/www/themes/jason-williamsca/assets/images/theme-preview.png differ diff --git a/www/themes/jason-williamsca/assets/javascript/resume.js b/www/themes/jason-williamsca/assets/javascript/resume.js index a242d10..0eb1330 100644 --- a/www/themes/jason-williamsca/assets/javascript/resume.js +++ b/www/themes/jason-williamsca/assets/javascript/resume.js @@ -2,10 +2,12 @@ "use strict"; // Start of use strict // Apply masonry layout to cards - $('.masonry').masonry({ - itemSelector: '.masonry-wrapper' - }); - + $('.masonry').each(function() { + var opts = { itemSelector: '.masonry-wrapper' } + if ($(this).children().length < 6) opts.horizontalOrder = true + $(this).masonry(opts) + }) + // Smooth scrolling using jQuery easing $('a.js-scroll-trigger[href*="#"]:not([href="#"])').click(function() { if (location.pathname.replace(/^\//, '') == this.pathname.replace(/^\//, '') && location.hostname == this.hostname) { diff --git a/www/themes/jason-williamsca/layouts/default.htm b/www/themes/jason-williamsca/layouts/default.htm index 7d618b6..cc69960 100644 --- a/www/themes/jason-williamsca/layouts/default.htm +++ b/www/themes/jason-williamsca/layouts/default.htm @@ -19,7 +19,7 @@ description = "Default Layout" {{ this.page.title }} - Ja.son-Williams.ca - +