diff --git a/.gitignore b/.gitignore index 0299c7e..236179c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ hugo.linux # Temporary lock file while building /.hugo_build.lock +# node_modules +/themes/tse/node_modules \ No newline at end of file diff --git a/assets/favicon.ico b/assets/favicon.ico index 0d02739..8b8531b 100644 Binary files a/assets/favicon.ico and b/assets/favicon.ico differ diff --git a/assets/images/apple-icon-180x180.png b/assets/images/apple-icon-180x180.png index c8096ce..3dafd62 100644 Binary files a/assets/images/apple-icon-180x180.png and b/assets/images/apple-icon-180x180.png differ diff --git a/assets/images/favicon-32x32.png b/assets/images/favicon-32x32.png index e37c9d8..d9c254a 100644 Binary files a/assets/images/favicon-32x32.png and b/assets/images/favicon-32x32.png differ diff --git a/assets/images/favicon/android-icon-144x144.png b/assets/images/favicon/android-icon-144x144.png index 9fc4ed5..eaa9d40 100644 Binary files a/assets/images/favicon/android-icon-144x144.png and b/assets/images/favicon/android-icon-144x144.png differ diff --git a/assets/images/favicon/android-icon-192x192.png b/assets/images/favicon/android-icon-192x192.png index 28e888c..c22183c 100644 Binary files a/assets/images/favicon/android-icon-192x192.png and b/assets/images/favicon/android-icon-192x192.png differ diff --git a/assets/images/favicon/android-icon-36x36.png b/assets/images/favicon/android-icon-36x36.png index d16b5aa..be28a90 100644 Binary files a/assets/images/favicon/android-icon-36x36.png and b/assets/images/favicon/android-icon-36x36.png differ diff --git a/assets/images/favicon/android-icon-48x48.png b/assets/images/favicon/android-icon-48x48.png index a0cf74d..c408b68 100644 Binary files a/assets/images/favicon/android-icon-48x48.png and b/assets/images/favicon/android-icon-48x48.png differ diff --git a/assets/images/favicon/android-icon-72x72.png b/assets/images/favicon/android-icon-72x72.png index 79de351..5df85dc 100644 Binary files a/assets/images/favicon/android-icon-72x72.png and b/assets/images/favicon/android-icon-72x72.png differ diff --git a/assets/images/favicon/android-icon-96x96.png b/assets/images/favicon/android-icon-96x96.png index c1e4727..37369e6 100644 Binary files a/assets/images/favicon/android-icon-96x96.png and b/assets/images/favicon/android-icon-96x96.png differ diff --git a/assets/images/favicon/apple-icon-114x114.png b/assets/images/favicon/apple-icon-114x114.png index bcf6433..9860f74 100644 Binary files a/assets/images/favicon/apple-icon-114x114.png and b/assets/images/favicon/apple-icon-114x114.png differ diff --git a/assets/images/favicon/apple-icon-120x120.png b/assets/images/favicon/apple-icon-120x120.png index 4fe21ef..32db288 100644 Binary files a/assets/images/favicon/apple-icon-120x120.png and b/assets/images/favicon/apple-icon-120x120.png differ diff --git a/assets/images/favicon/apple-icon-144x144.png b/assets/images/favicon/apple-icon-144x144.png index 9fc4ed5..eaa9d40 100644 Binary files a/assets/images/favicon/apple-icon-144x144.png and b/assets/images/favicon/apple-icon-144x144.png differ diff --git a/assets/images/favicon/apple-icon-152x152.png b/assets/images/favicon/apple-icon-152x152.png index fb86bf5..9513339 100644 Binary files a/assets/images/favicon/apple-icon-152x152.png and b/assets/images/favicon/apple-icon-152x152.png differ diff --git a/assets/images/favicon/apple-icon-180x180.png b/assets/images/favicon/apple-icon-180x180.png index c8096ce..3dafd62 100644 Binary files a/assets/images/favicon/apple-icon-180x180.png and b/assets/images/favicon/apple-icon-180x180.png differ diff --git a/assets/images/favicon/apple-icon-57x57.png b/assets/images/favicon/apple-icon-57x57.png index 39e6f74..9333975 100644 Binary files a/assets/images/favicon/apple-icon-57x57.png and b/assets/images/favicon/apple-icon-57x57.png differ diff --git a/assets/images/favicon/apple-icon-60x60.png b/assets/images/favicon/apple-icon-60x60.png index da66ba5..1a79e1a 100644 Binary files a/assets/images/favicon/apple-icon-60x60.png and b/assets/images/favicon/apple-icon-60x60.png differ diff --git a/assets/images/favicon/apple-icon-72x72.png b/assets/images/favicon/apple-icon-72x72.png index 79de351..f4d536e 100644 Binary files a/assets/images/favicon/apple-icon-72x72.png and b/assets/images/favicon/apple-icon-72x72.png differ diff --git a/assets/images/favicon/apple-icon-76x76.png b/assets/images/favicon/apple-icon-76x76.png index d369684..23c3c5b 100644 Binary files a/assets/images/favicon/apple-icon-76x76.png and b/assets/images/favicon/apple-icon-76x76.png differ diff --git a/assets/images/favicon/apple-icon-precomposed.png b/assets/images/favicon/apple-icon-precomposed.png index de9dbd8..b54dbd8 100644 Binary files a/assets/images/favicon/apple-icon-precomposed.png and b/assets/images/favicon/apple-icon-precomposed.png differ diff --git a/assets/images/favicon/apple-icon.png b/assets/images/favicon/apple-icon.png index de9dbd8..b54dbd8 100644 Binary files a/assets/images/favicon/apple-icon.png and b/assets/images/favicon/apple-icon.png differ diff --git a/assets/images/favicon/favicon-16x16.png b/assets/images/favicon/favicon-16x16.png index be777d9..b9bfe81 100644 Binary files a/assets/images/favicon/favicon-16x16.png and b/assets/images/favicon/favicon-16x16.png differ diff --git a/assets/images/favicon/favicon-32x32.png b/assets/images/favicon/favicon-32x32.png index e37c9d8..d9c254a 100644 Binary files a/assets/images/favicon/favicon-32x32.png and b/assets/images/favicon/favicon-32x32.png differ diff --git a/assets/images/favicon/favicon-96x96.png b/assets/images/favicon/favicon-96x96.png index c1e4727..72e2bb7 100644 Binary files a/assets/images/favicon/favicon-96x96.png and b/assets/images/favicon/favicon-96x96.png differ diff --git a/assets/images/favicon/favicon.ico b/assets/images/favicon/favicon.ico index 0d02739..8b8531b 100644 Binary files a/assets/images/favicon/favicon.ico and b/assets/images/favicon/favicon.ico differ diff --git a/assets/images/favicon/icon-1024x1024.png b/assets/images/favicon/icon-1024x1024.png deleted file mode 100644 index dd40c90..0000000 Binary files a/assets/images/favicon/icon-1024x1024.png and /dev/null differ diff --git a/assets/images/favicon/ms-icon-144x144.png b/assets/images/favicon/ms-icon-144x144.png index 9fc4ed5..eaa9d40 100644 Binary files a/assets/images/favicon/ms-icon-144x144.png and b/assets/images/favicon/ms-icon-144x144.png differ diff --git a/assets/images/favicon/ms-icon-150x150.png b/assets/images/favicon/ms-icon-150x150.png index 46f4e7b..94424a2 100644 Binary files a/assets/images/favicon/ms-icon-150x150.png and b/assets/images/favicon/ms-icon-150x150.png differ diff --git a/assets/images/favicon/ms-icon-310x310.png b/assets/images/favicon/ms-icon-310x310.png index 9c5892f..6dd2db7 100644 Binary files a/assets/images/favicon/ms-icon-310x310.png and b/assets/images/favicon/ms-icon-310x310.png differ diff --git a/assets/images/favicon/ms-icon-70x70.png b/assets/images/favicon/ms-icon-70x70.png index db6fbe4..68937c7 100644 Binary files a/assets/images/favicon/ms-icon-70x70.png and b/assets/images/favicon/ms-icon-70x70.png differ diff --git a/assets/images/logo-old.png b/assets/images/logo-old.png new file mode 100644 index 0000000..1a4d146 Binary files /dev/null and b/assets/images/logo-old.png differ diff --git a/assets/images/logo.png b/assets/images/logo.png index 1a4d146..138eb4b 100644 Binary files a/assets/images/logo.png and b/assets/images/logo.png differ diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..ea7358e --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "epsf-miniwebsite", + "lockfileVersion": 3, + "requires": true, + "packages": {} +} diff --git a/themes/tse/assets/css/content.scss b/themes/tse/assets/css/content.scss index 5da3279..83547b6 100644 --- a/themes/tse/assets/css/content.scss +++ b/themes/tse/assets/css/content.scss @@ -252,7 +252,7 @@ table { th, td { - padding: 2rem; + padding: 1rem; line-height: 20px; text-align: left; vertical-align: top; diff --git a/themes/tse/assets/css/custom.scss b/themes/tse/assets/css/custom.scss index fd6238b..a184e4d 100644 --- a/themes/tse/assets/css/custom.scss +++ b/themes/tse/assets/css/custom.scss @@ -21,11 +21,11 @@ table.cv td, table th { .table { border: 1px solid; - font-size: 80%; + font-size: 1.2rem; border-color: var(--section-light-bg-color); //background-color: var(--section-light-bg-color); background-color: var(--highlight-inverse-contrast); - color: var(--section-light-text-color); + color: var(--section-dark-text-color); } .table td, table th { diff --git a/themes/tse/assets/css/generic.css b/themes/tse/assets/css/generic.css index 9b13e04..dd753b0 100644 --- a/themes/tse/assets/css/generic.css +++ b/themes/tse/assets/css/generic.css @@ -4,40 +4,44 @@ Hides stuff */ .hidden { - text-indent: -9999px; - visibility: hidden; - display: none; + text-indent: -9999px; + visibility: hidden; + display: none; } /** Creates a responsive wrapper that makes our content scale nicely */ .inner { - position: relative; - width: 80%; - max-width: 800px; - margin: 0 auto; + position: relative; + /* width: 80%; */ + /* max-width: 800px; */ + /* margin: 0 auto; */ } /** Centres vertically yo. (IE8+) */ .vertical { - display: table-cell; - vertical-align: middle; + /* display: table-cell; + vertical-align: middle; */ + display: flex; + flex-direction: column; + justify-content: space-between; + height: 100%; } /** Floating tools */ .left { - float: left; + float: left; } .right { - float: right; + float: right; } .clear { - clear: both; -} \ No newline at end of file + clear: both; +} diff --git a/themes/tse/assets/css/responsiveness.scss b/themes/tse/assets/css/responsiveness.scss index 6d0d1c8..d4bb7a2 100644 --- a/themes/tse/assets/css/responsiveness.scss +++ b/themes/tse/assets/css/responsiveness.scss @@ -1,9 +1,8 @@ - /* ========================================================================== 8. Media Queries - Smaller than 1130px ========================================================================== */ -@media only screen and (max-width: 1130px) { +@media only screen and (max-width: 900px) { /* makes it a top sticky menu */ .fixed-nav { opacity: 1; @@ -38,7 +37,7 @@ -moz-box-sizing: border-box; box-sizing: border-box; min-height: 240px; - padding: 15% 0; + // padding: 15% 0; height: 100%; margin-bottom: 0rem; } @@ -60,7 +59,7 @@ /* skip the top menu when scrolling */ .post-holder .post { - scroll-margin-top: 48px; + scroll-margin-top: 48px; } .post-template .post { @@ -87,6 +86,23 @@ h4 { font-size: 2.8rem; } + + #site-head #site-menu, #site-head.withCenteredImage #site-menu { + font-size: 1.5rem; + flex: 1; + order: 2; + flex-basis: 100%; + justify-content: start; + } + #top-banner { + flex-wrap: wrap; + } + #site-head #site-languages, + #site-head.withCenteredImage #site-languages { + order: 1; + } + #blog-logo { + } } /* ========================================================================== @@ -99,14 +115,14 @@ } #blog-logo { - max-height: 80px; + max-height: 6rem; + margin-left: 1.5rem; + max-width: 40%; } .inner, .pagination { width: auto; - margin-left: 16px; - margin-right: 16px; } .post { @@ -117,9 +133,10 @@ line-height: 1.6em; } - #site-head { - padding: 10% 0; - height: 65%; + #site-head, + #site-head.withCenteredImage { + // padding: 1.5rem; + height: 90%; } #header-arrow { @@ -128,14 +145,18 @@ a.btn { margin-top: 10px; + font-size: 1.1rem; } .blog-title { font-size: 3rem; } - .blog-description { - font-size: 2.2rem; + #site-head .blog-description, + #site-head.withCenteredImage .blog-description { + font-size: 2.5rem; + margin-bottom: 2rem; + padding: 0 1rem; } h1, @@ -164,4 +185,27 @@ .site-footer { font-size: 1.1rem; } -} \ No newline at end of file + #site-head #top-banner, + #site-head.withCenteredImage #top-banner { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + width: 100vw; + padding: 1rem 0; + } + + #site-languages { + align-self: center; + padding-right: 1rem; + } + #site-head #site-menu, + #site-head.withCenteredImage #site-menu { + display: none; + } + + #site-head #site-languages .btn-lang, + #site-head.withCenteredImage #site-languages .btn-lang { + margin: 1rem 0.3rem; + font-size: 1rem; + } +} diff --git a/themes/tse/assets/css/theme.scss b/themes/tse/assets/css/theme.scss index d835969..fa074c2 100644 --- a/themes/tse/assets/css/theme.scss +++ b/themes/tse/assets/css/theme.scss @@ -7,10 +7,10 @@ body { #blog-logo { //display: flex; - max-height: 160px; + max-height: 6rem; width: auto; - margin: 0 auto; line-height: 0; + object-fit: contain; } #flag-logo { @@ -24,10 +24,10 @@ body { } #site-head, #site-head.withCenteredImage { - position: relative; + // position: relative; display: table; width: 100%; - height: 100%; + height: 100vh; margin-bottom: 0rem; text-align: center; color: var(--highlight); @@ -71,7 +71,7 @@ body { font-weight: 400; font-family: "Roboto Slab", serif; letter-spacing: 0; - text-shadow: var(--cover-title-text-shadow); + // text-shadow: var(--cover-title-text-shadow); //-webkit-text-fill-color: white; /* Will override color (regardless of order) */ //-webkit-text-stroke: 2px var(--cover-title-text-shadow); -webkit-text-stroke: 5px var(--section-dark-bg-color); @@ -79,29 +79,36 @@ body { } #top-banner { - position: absolute; - top: 0px; - left: 0px; - max-width: 100%; - width: 100%; - height: fit-content; + // position: absolute; + // top: 0px; + // left: 0px; + // max-width: 100%; + // width: 100%; + // height: fit-content; + display: flex; + justify-content: space-between; + padding: 0 2rem; background-color: var(--cover-title-and-description-guard-bg-color); - } #site-languages { //text-align: right; width: fit-content; - height: 100%; + // height: 100%; position: relative; float: right; + order: 2; } #site-menu { position: relative; float: left; - width: fit-content; - height: 100%; + order: 1; + display: flex; + justify-content: space-around; + align-items: center; + // width: fit-content; + // height: 100%; } #site-languages .btn-lang { @@ -127,10 +134,11 @@ body { #site-head-content { - position: absolute; - bottom: 200px; - max-width: 100%; - align-content: center; + // position: absolute; + // bottom: 200px; + // max-width: 100%; + align-content: end; + height: 100%; } // Landing screen menu @@ -145,16 +153,17 @@ body { border-radius: 4px; -webkit-border-radius: 4px; display: inline-block; - font-size: 16px; + // font-size: 16px; letter-spacing: 1px; margin: 1rem; - overflow: visible; - padding: 10px 20px 10px 20px; + overflow: visible; + padding: 0.5rem 1rem; position: relative; cursor: pointer; text-transform: uppercase; font-weight:normal; - border: solid 1px var(--highlight-contrast); + height: fit-content; + // border: solid 1px var(--highlight-contrast); &:hover { color: var(--highlight-inverse-contrast); diff --git a/themes/tse/assets/css/variables.scss b/themes/tse/assets/css/variables.scss index 7d54fa8..0dfb3c0 100644 --- a/themes/tse/assets/css/variables.scss +++ b/themes/tse/assets/css/variables.scss @@ -1,33 +1,40 @@ + $light-color: #ffffff; + $dark-color: #2a0045ff ; + $primary-color: #183c8f; + $secondary-color: rgb(143, 33, 191); + $tertiary-color: #4eca2cff; +// #{} +// #{$tertiary-color} :root { /* === Cover / Landing area === */ - --cover-text-color: rgb(0, 52, 141); + --cover-text-color: #{$secondary-color}; /* Used for Landing screen menu buttons, but potentially usable for highlighting other things */ - --highlight: #ffc800; - --highlight-contrast: var(--cover-text-color); + --highlight: #{$primary-color}; + --highlight-contrast: #{$light-color}; /*inverse colors used for :hover */ - --highlight-inverse: var(--cover-text-color); - --highlight-inverse-contrast: rgb(249, 238, 187); + --highlight-inverse: #{$secondary-color}; + --highlight-inverse-contrast: rgb(255, 255, 255); /* visual guard around title and description, when the feature is enabled */ - --cover-title-and-description-guard-bg-color: rgba(85, 27, 2, 0.67); - --cover-title-text-shadow: rgb(119, 45, 0) 1px 1px 5px; + --cover-title-and-description-guard-bg-color: #{$light-color}; + // --cover-title-text-shadow: rgb(119, 45, 0) 1px 1px 5px; /* === sticky top/left navigation menus === */ - --sticky-menu-text-color: #d65301ea; + --sticky-menu-text-color: #{$light-color}; /* === Alternating content (post) sections === */ /* Light section - text color */ - --section-light-text-color:rgb(119, 45, 0); + --section-light-text-color:#{$light-color}; /* Light section - background color */ - --section-light-bg-color: #ebbc4f; + --section-light-bg-color: #{$primary-color}; /* Dark section - text color */ - --section-dark-text-color: var(--section-light-bg-color); + --section-dark-text-color: #{$primary-color}; /* Dark section - background color */ - --section-dark-bg-color: #652200; + --section-dark-bg-color: #{$light-color}; /* Light&Dark section >quote. Suppressive color, compared to 'Light section - text color'*/ --section-uni-quote: grey; diff --git a/themes/tse/assets/js/index.js b/themes/tse/assets/js/index.js index b2bbc04..8f386d5 100644 --- a/themes/tse/assets/js/index.js +++ b/themes/tse/assets/js/index.js @@ -18,7 +18,7 @@ var $sitehead = $("#site-head"); scrollTop: el.offset().top, }, dur, - function() { + function () { window.location.hash = el.attr("id"); } ); @@ -40,7 +40,7 @@ var $sitehead = $("#site-head"); // cover arrow button $("#header-arrow").click(function (e) { - e.preventDefault() + e.preventDefault(); srcTo($first); }); } @@ -55,15 +55,20 @@ var $sitehead = $("#site-head"); if (w >= Math.floor(g) && w <= Math.ceil(h)) { $(".fixed-nav").fadeOut("fast"); + } else if (w < Math.floor(g)) { + $(".fixed-nav").fadeOut("fast"); } else { $(".fixed-nav").css("display", "flex").fadeIn("fast"); } $post.each(function () { - if (($(window).height() + w) > ($(document).height() - $(".site-footer").height())) { + if ( + $(window).height() + w > + $(document).height() - $(".site-footer").height() + ) { var l = $postholder.length; - $(".fn-item").removeClass("active") - $(".fn-item[item_index='" + (l) + "']").addClass("active") + $(".fn-item").removeClass("active"); + $(".fn-item[item_index='" + l + "']").addClass("active"); } else { var f = $(this).offset().top; var b = $(this).offset().top + $(this).height(); @@ -83,15 +88,19 @@ var $sitehead = $("#site-head"); i.removeClass("active"); a.fadeIn("slow"); } - } + } }); }); } - var ulLiIcon = getComputedStyle(document.documentElement).getPropertyValue('--ul-li-icon'); + var ulLiIcon = getComputedStyle(document.documentElement).getPropertyValue( + "--ul-li-icon" + ); if (ulLiIcon.length > 0) { - $('ul').addClass("fa-ul"); - $("ul li").prepend(''); + $("ul").addClass("fa-ul"); + $("ul li").prepend( + '' + ); } $("blockquote p").prepend(''); $("blockquote p").append(''); diff --git a/themes/tse/layouts/_default/index.html b/themes/tse/layouts/_default/index.html index 6b1ccdb..c1215fb 100644 --- a/themes/tse/layouts/_default/index.html +++ b/themes/tse/layouts/_default/index.html @@ -64,6 +64,8 @@
{{ $num_lang := len $translations }} {{ if and (gt $num_lang 1) $.Site.Params.language_menu }} + {{ with resources.Get .Params.header_logo }}{{ end }} +
{{ range $translations }} {{ $lang_title := .Lang | strings.ToUpper }} @@ -104,7 +106,6 @@
{{ if .Site.Params.title_guard }}
{{ end }} - {{ with resources.Get .Params.header_logo }}{{ end }} {{ with .Params.header_subheadline }}

{{ . | safeHTML }}

{{ end }} {{ with .Params.header_subsubheadline }}

{{ . | safeHTML }}

{{ end }} diff --git a/themes/tse/package-lock.json b/themes/tse/package-lock.json new file mode 100644 index 0000000..ce67ef5 --- /dev/null +++ b/themes/tse/package-lock.json @@ -0,0 +1,56 @@ +{ + "name": "tse", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "tse", + "version": "1.0.0", + "license": "MIT", + "devDependencies": { + "prettier": "^2.8.7", + "prettier-plugin-go-template": "0.0.13" + } + }, + "node_modules/prettier": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/prettier-plugin-go-template": { + "version": "0.0.13", + "resolved": "https://registry.npmjs.org/prettier-plugin-go-template/-/prettier-plugin-go-template-0.0.13.tgz", + "integrity": "sha512-gG/xT5kd+kCzoMaTchXvdfBdsunyRCV6G8cgdPGPd2V5JGGKXUG7SjzBKU7jaGh2RTeblcAdBb/E+S/duOAMsA==", + "dev": true, + "dependencies": { + "ulid": "^2.3.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "prettier": "^2.0.0" + } + }, + "node_modules/ulid": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/ulid/-/ulid-2.3.0.tgz", + "integrity": "sha512-keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw==", + "dev": true, + "bin": { + "ulid": "bin/cli.js" + } + } + } +}