Skip to content

fix: Fix layout responsiveness #187

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

Merged
merged 1 commit into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,30 @@
root = true

[*]
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
insert_final_newline = true
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.py]
[*.{py,rst,ini}]
indent_style = space
indent_size = 4

[*.bat]
indent_style = tab
end_of_line = crlf
[*.{html,css,scss,json,yml,yaml,xml,toml}]
indent_style = space
indent_size = 2

["LICENSE"]
insert_final_newline = true
[*.md]
trim_trailing_whitespace = false
indent_style = space
indent_size = 2

[default.conf]
indent_style = space
indent_size = 2

["Makefile"]
indent_style = tab

[*.{diff,patch}]
trim_trailing_whitespace = false
2 changes: 1 addition & 1 deletion bkp/programs/mentoring/mentors.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ authors: ["OSL Team"]
apoya, alienta a sus aprendices y conservando apertura a preguntas y a escuchar.
Se trata de ayudarse mutuamente a expandirse y crecer para que todas las
personas aprendan. Para más informaciones, ingrese a la
<a href="/guidelines/mentoring/">Guía de Mentorías</a>.
<a href="/about/guidelines/mentoring/">Guía de Mentorías</a>.

¡Encuentre aquí tu mentora o mentor! </small>

Expand Down
12 changes: 6 additions & 6 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ nav:
- Mentors Guide: "opportunities/os-internship/guides/mentors/index.md"
- "TEMPLATE: Projects Ideas": "opportunities/os-internship/templates/projects-ideas.md"
- "TEMPLATE: Intern Project Proposal": "opportunities/os-internship/templates/intern-proposal.md"
- GSoC:
- Google Summer of Code:
- index: "opportunities/gsoc/index.md"
- Project Ideas: "opportunities/gsoc/project-ideas/index.md"
- Contributor Guide: "opportunities/gsoc/guides/contributor/index.md"
Expand All @@ -51,11 +51,6 @@ nav:
- Partners: "partnership/partners/index.md"
- Events:
- index: events/index.md
- Guidelines:
- index: guidelines/index.md
- Articles: guidelines/articles/index.md
- DEI: guidelines/dei/index.md
- Mentoring: guidelines/mentoring/index.md
- About:
- index: "about/index.md"
- About OSL: "about/index.md"
Expand All @@ -65,6 +60,11 @@ nav:
- CoC: about/coc/index.md
- Roadmap: about/roadmap/index.md
- Governance: about/governance/index.md
- Guidelines:
- index: about/guidelines/index.md
- Articles: about/guidelines/articles/index.md
- DEI: about/guidelines/dei/index.md
- Mentoring: about/guidelines/mentoring/index.md
- Donate: "donate/index.md"

markdown_extensions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
title: "Editorial Guidelines for Article Creation"
date: 2019-04-08
authors: ["Mariangela Petrizzo"]
template: single-sidebar.html
---

# Articles
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ date: 2019-04-08
authors: ["Mariangela Petrizzo"]
featured: true
tags: ["DEI"]
template: single-sidebar.html
---

# Statement on Diversity, Equity and Inclusion
Expand Down
7 changes: 4 additions & 3 deletions pages/guidelines/index.md → pages/about/guidelines/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
title: Guidelines
authors: ["OSL Team"]
template: single-sidebar.html
---

# Guidelines
Expand All @@ -14,7 +15,7 @@ In this section, there are the guideline about how to write the blog posts for
Open Science Labs. OSL Blogs can be accessed [here](/blog/).

<ul>
<li><a href="/guidelines/articles/">Article Guideline</a></li>
<li><a href="/about/guidelines/articles/">Article Guideline</a></li>
</ul>

## Diversity, Equity and Inclusion (DEI)
Expand All @@ -28,7 +29,7 @@ DEI is a very important aspect of our community and we really care about that.
In this section we can find our initial DEI declaration.

<ul>
<li><a href="/guidelines/dei/">Statement on Diversity, Equity and Inclusion</a></li>
<li><a href="/about/guidelines/dei/">Statement on Diversity, Equity and Inclusion</a></li>
</ul>

## Mentoring
Expand All @@ -42,5 +43,5 @@ to reach someone outside.
Another way that the mentoring can happen is inside the internship program.

<ul>
<li><a href="/guidelines/mentoring">Mentoring Guideline</a></li>
<li><a href="/about/guidelines/mentoring">Mentoring Guideline</a></li>
</ul>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ date: 2019-04-08
authors: ["Ingrid Bianka Garcia"]
tags: ["mentoring"]
category: ["mentoring"]
template: single-sidebar.html
---

# Mentoring Guideline
Expand Down
8 changes: 3 additions & 5 deletions theme/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -143,18 +143,16 @@
footer.citation *{margin-top:20px;font-size:10px!important;font-style:italic!important}
</style>
<div class=container>
<section class="wrap content">
<section class="content-inner">
{% if page.parent.children %}
<!--
<div class="d-none d-sm-none d-md-block" style="margin-top:80px"></div>
<div class="d-block d-sm-block d-md-none" style="margin-top:50px"></div>
-->
{% endif %}
{% block content %}
<section>
{% if page.parent.children %}
<div class="row pt-2">
{% else %}
<div class="row pt-0">
{% endif %}
<div class="col-md-12 mx-auto">
{% block content_inner %}
{{ page.content }}
Expand Down
2 changes: 1 addition & 1 deletion theme/blog-list-base.html
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ <h3 class="blog-post-title">
{%- endmacro %}
{% endif %}

<section class="mt-5">
<section>
<h1>Blog</h1>

<div class = "md-typeset">
Expand Down
4 changes: 2 additions & 2 deletions theme/blog-post.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

{% block content_inner %}

<div class="mt-5">
<div>
<h3><a href="{{ url }}" title="{{ title }}" target="_self">{{ page.meta["title"] }}</a></h3>
<div class=>
<div>
<span>
<svg class="icon">
<title>author</title>
Expand Down
8 changes: 8 additions & 0 deletions theme/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -449,13 +449,21 @@ picture{
display:flex;
flex:1
}
/*
.nav_header{
background-color:#374955;
padding:0 1.5rem;
position:fixed;
width:100%;
z-index:99;
left:0
}
*/
.nav_header {
position: sticky;
top: 0;
z-index: 1030; /* Ensure it's above content */
background-color:#374955;
}
.nav_item{
padding:0.5rem 1rem;
Expand Down
6 changes: 3 additions & 3 deletions theme/js/index.json

Large diffs are not rendered by default.

Loading