Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

layout fixes #82

Merged
merged 1 commit into from
Nov 17, 2023
Merged

layout fixes #82

merged 1 commit into from
Nov 17, 2023

Conversation

mihai-sysbio
Copy link
Collaborator

Resolving #78 and some parts of #62 and #63.

Comment on lines -61 to -66
-
scope:
path: "pages/about"
values:
type: "pages"
sidebar: about
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed by accident but not needed anyway.

@@ -16,10 +16,8 @@ theme_variables:
theme_color: 205a86
topnav:
brand_logo: assets/img/main_logo.svg
#privacy_statement_url: https://elixir-europe.org/privacy
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was decided that no privacy page is needed since no cookies are tracked.

fonts:
- https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400;0,700;1,400;1,700&display=swap
# - https://fonts.googleapis.com/css2?family=PT+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This otherwise duplicated line is commented out so not useful to keep around.

Comment on lines -33 to -40
-
scope:
path: ""
type: "pages"
values:
permalink: "/:basename"
layout: "page"
sidebar: main
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a default for the "Main" button that was decided to be removed from the navbar.

Comment on lines -67 to -72
-
scope:
path: "pages/contribute"
values:
type: "pages"
sidebar: contribute
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was decided that the default Contribute button should be removed from the navbar.

@@ -1,4 +1,4 @@
copyright: 'This site uses Cookies. We use cookies to help the website run effectively. To find out more, read our [Privacy](https://elixir-europe.org/privacy) and [Cookies](https://elixir-europe.org/cookies) statements.'
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was decided that the privacy and cookie notices should be removed from the footer. It was also decided to add in a copyright notice. My suggestion is to skip adding in the years. If that would be desired, the implementation should be automatic, i.e., not requiring the years to be edited manually.

Comment on lines +15 to +16
- url_text: Contribute
url: "pages/contribute"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was decided to move the Contribute link in the footer.

Comment on lines -20 to -21
- title: Privacy
url: /privacy
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was decided the privacy page is not needed.

@@ -1,4 +1,4 @@
title: Lifecycle
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was decided that the Lifecycle should be renamed to Training Lifecycle.

Comment on lines -4 to -5
- title: Main
url: /index
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was decided that the Main button should be removed from the navbar.

Copy link
Collaborator Author

@mihai-sysbio mihai-sysbio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have now added individual comments for all the changes made in this PR, hoping it makes the review easier.

@@ -1,13 +1,10 @@
##
## if you want to list an external url, use external_url instead of url. the theme will apply a different link base.
subitems:
- title: Main
url: /index
- title: Lifecycle
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was decided that the navbar button Lifecycle should instead be Training lifecycle.

Comment on lines -12 to -13
- title: Contribute
url: /how_to_contribute
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was decided to remove the link Contribute from the navbar.

@@ -1,6 +1,6 @@
<div class="row row-bg-light justify-content-center mb-5">
<div class="col-12">
<div class="text-center display-6 mb-5 pb-3">Training Life Cycle</div>
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was decided that the correct spelling is lifecycle in one word.

Comment on lines -6 to -11
<div class="count bg-{{ number.color}} rounded py-4">
<div class="count bg-{{ number.color}} rounded py-4 pe-5">
<i class="{{ number.icon }}"></i>
<div class="count-number display-2 text-center text-white">
<div class="count-number display-3 text-end text-white">
{{ number.number }}
</div>
<div class="count-number-title text-center text-white mt-1">
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This slightly reduces the font of the digits, and aligns them to the right, to make the layout more consistent since the numbers in the footer can be 2, 3 and 4 digits long.

@@ -26,7 +26,7 @@
$(this).prop('Counter', 0).animate({
Counter: $(this).text()
}, {
duration: 1000,
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This increases the duration of the animation with the numbers increasing from 1s to 2s.

@@ -7,7 +7,7 @@
{% unless include.hideHeading %}
<h2>Testimonials</h2>
{% endunless %}
<div id="carouselTestimonials" class="carousel carousel-testimonials bg-primary rounded slide">
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've implemented a lighter shade for the testimonials area.

@@ -6,6 +6,7 @@ $green: #03CEA4;
$orange: #FF7900;

$primary: $aubergine;
$primary-light: mix(#fff, $primary, 40%);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is defining a lighter shade of the primary color as a variable.

Comment on lines +90 to +93
.bg-primary-light {
background: $primary-light;
}

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is defining a CSS class for a background that uses the new primary-light color.

Comment on lines +212 to +216

#ett-logo {
display: none;
visibility: hidden;
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a CSS hack to hide the ETT logo in the footer.

Comment on lines +217 to +224

.nav-break {
display: none;
}

.nav-item:nth-last-child(2) {
display: none;
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a CSS hack to hide the GitHub button in the navbar that otherwise cannot be hidden away.

@mihai-sysbio
Copy link
Collaborator Author

Pinging here 🔔 hoping for a review

@ahornos
Copy link
Collaborator

ahornos commented Nov 17, 2023

Ready to merge, @mihai-sysbio on your own 👍

@mihai-sysbio
Copy link
Collaborator Author

Ready to merge, @mihai-sysbio on your own 👍

Thanks @ahornos

@mihai-sysbio mihai-sysbio merged commit 6322f97 into main Nov 17, 2023
4 checks passed
@mihai-sysbio mihai-sysbio deleted the feat/header-footer branch November 17, 2023 09:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants