diff --git a/_config.yml b/_config.yml index f848371..2902f59 100644 --- a/_config.yml +++ b/_config.yml @@ -26,7 +26,7 @@ description: >- # this means to ignore newlines until "baseurl:" baseurl: "" # the subpath of your site, e.g. /blog url: "http://scicatproject.github.io" # the base hostname & protocol for your site, e.g. http://example.com -version: 2.0.1 +version: 2.1.0 last_updated: 2023/10/31 pill_1: diff --git a/_includes/effort.html b/_includes/effort.html index bf92f04..46edd1d 100644 --- a/_includes/effort.html +++ b/_includes/effort.html @@ -1,20 +1,18 @@
-

Efforts

+

Efforts

{% for effort in site.efforts %} -
{{ effort.name }}
-
{{ effort.description }}
- +
{{ effort.description }}
+ {% if effort.leader %} -
Leader
{{ effort.leader }}
+
Leader: {{ effort.leader }}
{% endif %}
- {% endfor %}
diff --git a/_includes/facilities.html b/_includes/facilities.html index 31fc100..a4830ab 100644 --- a/_includes/facilities.html +++ b/_includes/facilities.html @@ -1,10 +1,10 @@
-

Facilities

+

Facilities

{% for facility in site.facilities %} -
- +
+
{{ facility.name }}
diff --git a/_includes/intro.html b/_includes/intro.html index 56868c9..0632416 100644 --- a/_includes/intro.html +++ b/_includes/intro.html @@ -43,39 +43,47 @@

{{ site.pill_4.title }}

-
+
-

{{ site.feature_1.title }}

-

{{ site.feature_1.text }}

+
+

{{ site.feature_1.title }}

+

{{ site.feature_1.text }}

+

{{ site.feature_1.attribution }}

-

{{ site.feature_2.title }}

-

{{ site.feature_2.text }}

-

{{ site.feature_2.attribution }}

+
+

{{ site.feature_2.title }}

+

{{ site.feature_2.text }}

+
+

{{ site.feature_2.attribution }}

-
+
-

{{ site.feature_3.title }}

-

{{ site.feature_3.text }}

-

{{ site.feature_3.attribution }}

+
+

{{ site.feature_3.title }}

+

{{ site.feature_3.text }}

+
+

{{ site.feature_3.attribution }}

-

{{ site.feature_4.title }}

-

{{ site.feature_4.text }}

-

{{ site.feature_4.attribution }}

+
+

{{ site.feature_4.title }}

+

{{ site.feature_4.text }}

+
+

{{ site.feature_4.attribution }}

diff --git a/_includes/nav.html b/_includes/nav.html index ceb3bd6..36a551d 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -1,3 +1,13 @@ + + - diff --git a/_includes/resources.html b/_includes/resources.html index 21a8db7..af9a700 100644 --- a/_includes/resources.html +++ b/_includes/resources.html @@ -1,10 +1,10 @@
-

Resources

+

Resources

{% for resource in site.resources %} - diff --git a/_includes/team.html b/_includes/team.html index 301eb6a..71b58c8 100644 --- a/_includes/team.html +++ b/_includes/team.html @@ -1,9 +1,9 @@
-

Team

-
+

Team

+
{% for leader in site.team.leaders %} -
+
{{ leader.role }}
{{ leader.name }}
{% if leader.company %}
{{ leader.company }}
{% endif %} @@ -11,10 +11,10 @@

Team

{% endfor %}
-

Collaborators

+

Collaborators

{% for collaborator in site.team.collaborators %} -
+
{{ collaborator.name }}
{% if collaborator.company %}
{{ collaborator.company }}
{% endif %} {% if collaborator.email %} {% endif %} diff --git a/_sass/base.scss b/_sass/base.scss index 7cd58d1..b15e952 100644 --- a/_sass/base.scss +++ b/_sass/base.scss @@ -58,6 +58,7 @@ header.masthead { background-size: cover; padding-top: 2rem; padding-bottom: 2rem; + height: 62vh; .overlay { position: absolute; @@ -70,9 +71,16 @@ header.masthead { } .container { - position: relative; + width: 100%; + max-width: 100%; + margin: 0; + position: absolute; + top: 50%; + -ms-transform: translateY(-50%); + transform: translateY(-50%); + img { - width: 70%; + width: 55%; } h1 { margin-bottom: 0.5rem !important; @@ -104,6 +112,14 @@ header.masthead { } .features { + .features-row { + height: 20vh !important; + + @media (max-width: 985px) { + height: 30vh !important; + } + } + .features-item { overflow: hidden; position: relative; @@ -123,28 +139,52 @@ header.masthead { .features-content { position: relative; padding: 1rem; + height: 100%; + + .features-content-text { + width: 95%; + margin: 0; + position: absolute; + top: 50%; + -ms-transform: translateY(-50%); + transform: translateY(-50%); + + p { + font-size: 1.25rem; + } + } .attribution { - position: absolute; - right: 1rem; - bottom: -0.9rem; - font-size: 0.7rem; + position: absolute; + right: 1rem; + bottom: -0.9rem; + font-size: 0.7rem; } } } } +.facility { + margin-bottom: 30px !important; +} + .facilities { a { - text-decoration: none; - color: var(--bs-body-color); + color: var(--bs-body-color); } } .team { .leader { + height: 150px; + .leadership { font-size: 1.2rem; + padding: 25px 0 0 0; + + @media (max-width: 1000px) { + padding: 5px 0 20px 0; + } } .person { font-size: 1.5rem; @@ -158,9 +198,17 @@ header.masthead { font-size: 0.8rem; } } + .collaborator { + height: 150px; + .person { font-size: 1.3rem; + margin-top: 12%; + + @media (max-width: 992px) { + margin-top: 5%; + } } .company { font-size: 0.9rem; @@ -194,16 +242,15 @@ aside.section-breaker { border-bottom: 1px lightgray solid; margin-bottom: 1rem; - - .description { - text-align: left; - } - .link { + .text { text-align: left; + + @media (max-width: 1000px) { + text-align: center; + } + a { - text-decoration: none; - color: black; - font-style: italic; + color: var(--bs-body-color) !important; } } } @@ -225,10 +272,10 @@ aside.section-breaker { section#resources { .resource { + margin-bottom: 10px; + a { - text-decoration: none; - color: black; - font-style: italic; + color: var(--bs-body-color) !important; } } }