Skip to content

Commit

Permalink
layout fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mihai-sysbio committed Nov 2, 2023
1 parent c9f5cfc commit 1e7de89
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 76 deletions.
23 changes: 1 addition & 22 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
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

exclude:
- README.md
Expand All @@ -30,14 +28,6 @@ exclude:
- LICENSE

defaults:
-
scope:
path: ""
type: "pages"
values:
permalink: "/:basename"
layout: "page"
sidebar: main
-
scope:
path: "pages/lifecycle"
Expand All @@ -58,18 +48,7 @@ defaults:
type: "resource_page"
layout: "resource_page"
sidebar: resources
-
scope:
path: "pages/about"
values:
type: "pages"
sidebar: about
-
scope:
path: "pages/contribute"
values:
type: "pages"
sidebar: contribute


plugins:
- jemoji
Expand Down
4 changes: 3 additions & 1 deletion _data/footer.yml
Original file line number Diff line number Diff line change
@@ -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.'
copyright: '© ELIXIR Training Platform'
columns:
- type: image
image_width: 120px
Expand All @@ -12,3 +12,5 @@ columns:
url: /contributors
- url_text: Acknowledgments
url: /contact
- url_text: Contribute
url: "pages/contribute"
2 changes: 0 additions & 2 deletions _data/sidebars/about.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,3 @@ subitems:
url: /outreach
- title: Accessibility
url: /accessibility
- title: Privacy
url: /privacy
2 changes: 1 addition & 1 deletion _data/sidebars/lifecycle.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
title: Lifecycle
title: Training Lifecycle
title_url: /lifecycle
subitems:
- title: Plan
Expand Down
7 changes: 2 additions & 5 deletions _data/topnav.yml
Original file line number Diff line number Diff line change
@@ -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
- title: Training Lifecycle
url: /lifecycle
- title: Resources
url: /resources
- title: About
url: /about
- title: Contribute
url: /how_to_contribute

Empty file removed _includes/dev-info.html
Empty file.
2 changes: 1 addition & 1 deletion _includes/index/lifecycle.html
Original file line number Diff line number Diff line change
@@ -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>
<div class="text-center display-6 mb-5 pb-3">Training Lifecycle</div>
</div>
<div class="col-12 text-center">
<svg class="lifecycle" version="1.1" viewBox="0 0 112.42 69.98" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
Expand Down
8 changes: 4 additions & 4 deletions _includes/index/splash-in-numbers.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
{% assign numbers = site.data.index.numbers %}
{% for number in numbers %}
<div class="col-12 col-md-6 col-xl-3 mb-4">
<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">
<div class="count-number-title text-end text-white mt-1">
{{ number.title }}
</div>
</div>
Expand All @@ -26,7 +26,7 @@
$(this).prop('Counter', 0).animate({
Counter: $(this).text()
}, {
duration: 1000,
duration: 2000,
step: function (now) {
$(this).text(Math.ceil(now));
}
Expand Down
1 change: 0 additions & 1 deletion _includes/index/welcome.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<div class="col-12">
<div class="px-3 py-5 text-center">
<p class="lead">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce scelerisque augue tempus magna suscipit fringilla. Quisque neque nunc, fringilla a elit sed, tempor facilisis velit. Nulla facilisi. Sed ut sapien venenatis, tincidunt orci vitae, tristique magna. Curabitur tincidunt commodo odio vel faucibus.
</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion _includes/testimonials.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% unless include.hideHeading %}
<h2>Testimonials</h2>
{% endunless %}
<div id="carouselTestimonials" class="carousel carousel-testimonials bg-primary rounded slide">
<div id="carouselTestimonials" class="carousel carousel-testimonials bg-primary-light rounded slide">
<div class="carousel-indicators">
{% assign maxIndex = testimonials.size | minus: 1 %}
{% for index in (0..maxIndex) %}
Expand Down
1 change: 1 addition & 0 deletions _sass/_bootstrap_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ $green: #03CEA4;
$orange: #FF7900;

$primary: $aubergine;
$primary-light: mix(#fff, $primary, 40%);
$secondary: #4D4848;
$light: mix(#fff, $primary, 90%);
$dark: #212529;
Expand Down
17 changes: 17 additions & 0 deletions _sass/_custom_classes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ footer {
background: $red;
}

.bg-primary-light {
background: $primary-light;
}

.row-banner {
padding-top: 4rem;
padding-bottom: 4rem;
Expand Down Expand Up @@ -205,3 +209,16 @@ footer {
border-color: transparent;
}
}

#ett-logo {
display: none;
visibility: hidden;
}

.nav-break {
display: none;
}

.nav-item:nth-last-child(2) {
display: none;
}
38 changes: 0 additions & 38 deletions pages/about/privacy.md

This file was deleted.

0 comments on commit 1e7de89

Please sign in to comment.