Skip to content

Tidy up About page HTML and CSS #653

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.

Sign up for GitHub

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 2 commits into from
Jan 14, 2022
Merged

Tidy up About page HTML and CSS #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
499f613
Tidy up About page HTML and CSS
palewire Jan 14, 2022
6657b24
Update _about-box.scss
palewire Jan 14, 2022
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
3 changes: 3 additions & 0 deletions _includes/hr.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<div class="hr content content--copy">
<hr>
</div>
42 changes: 0 additions & 42 deletions _sass/_leftovers.scss
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions _sass/bootstrap/_basics.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@ textarea {
font-size: inherit;
line-height: inherit;
}
hr {
margin-top: 20px;
margin-bottom: 20px;
border: 0;
border-top: 1px solid #eee;
}
.clearfix:before,
.clearfix:after,
.container:before,
Expand Down
38 changes: 38 additions & 0 deletions _sass/components/_about-box.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
@import "settings/colors";

.about-box {
padding: 2em;
margin: 2em auto;
display: table;
width: 100%;
h3 {
margin: 0 0 0.5em 0;
padding: 0;
}
.orange-button {
font-size: 1.2em;
background-color: $button-orange;
border-radius: 2px;
padding: 0.75em 1.25em;
margin: 0 auto;
width: 240px;
text-align: center;
display: table;
a {
color: $white;
text-shadow: 0px 0px 4px $black;
text-decoration: none;
&:hover {
background-color: $button-hover;
color: $white;
text-decoration: none;
}
&:active,
&:focus {
background-color: $button-active;
color: $white;
text-decoration: none;
}
}
}
}
8 changes: 8 additions & 0 deletions _sass/components/_hr.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@import "settings/colors";

hr {
margin-top: 40px;
margin-bottom: 40px;
border: 0;
border-top: 1px solid $light-gray;
}
20 changes: 20 additions & 0 deletions _sass/_gallery.scss → _sass/components/_widgets.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,26 @@
line-height: 32px;
}

.support-paragraph {
font-size: 15px;
line-height: 1.5;
text-align: center;
max-width: 630px;
margin: 0 auto 16px auto;
}

.section-header {
margin: 12px auto 8px;
text-align: center;
}

.section-icon {
display: block;
margin: 2em auto 0 auto;
max-width: 60px;
max-height: 60px;
}

.tabs-left {
display: flex;
}
Expand Down
160 changes: 78 additions & 82 deletions about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,10 @@
affiliation: SageMath
gh_handle: williamstein

sponsor_box:
headline: Sponsors
description: 'Project Jupyter receives direct funding from the following sources:'

# All sponsor and partner SVGs should be 300x60 pixels
# And entries ordered according to A-Z,1-9
sponsors:
Expand Down Expand Up @@ -308,6 +312,9 @@
src: alfred.svg
alt: sloan logo

partner_box:
headline: Institutional Partners
description: 'Institutional Partners are organizations that support the project by employing Jupyter Steering Council members. Current partners include:'

partners:
- url: https://apple.com/
Expand Down Expand Up @@ -352,6 +359,13 @@
- url: https://2i2c.org/
src: 2i2c.svg
alt: 2i2c logo

donate_box:
headline: Donate
description:
- Jupyter will always be 100% open source software, free for all to use and released under the liberal terms of the <a href="https://opensource.org/licenses/BSD-3-Clause">modified BSD license</a>. If you have found Project Jupyter to be useful in your work, research or company, please consider making a donation to the project commensurate with your resources.
- All donations will be used strictly to fund the development of Project Jupyter's open source software, documentation and community. Our donations are managed by the <a href="https://numfocus.org">NumFOCUS Foundation</a>, which is the legal and fiscal umbrella for the project.
- NumFOCUS is a 501(c)3 non-profit foundation; if you are subject to US Tax law, your contributions will be tax-deductible.
---

{% include page-header.html
Expand All @@ -360,19 +374,19 @@
%}

<article class="container">
<div class="section-white">
<div class="content content--copy">
{% for graf in page.intro %}
<p>{{ graf }}</p>
{% endfor %}
</div>

<!-- INTRO -->
<div class="content content--copy">
{% for graf in page.intro %}
<p>{{ graf }}</p>
{% endfor %}
</div>

<hr>
{% include hr.html %}

<div class="section-white top-section-border">
<!-- DISTINGUISHED CONTRIBUTORS -->
<div class="content content--copy">
<h3 class="section-header">Distinguished Contributors</h3>
<h3 class="text-center">Distinguished Contributors</h3>
<p>{{ page.contributors_copy }}</p>
</div>

Expand Down Expand Up @@ -406,12 +420,12 @@ <h4>Special Election Cohort</h4>
{% endfor %}
</div>
</div>
</div>

{% include hr.html %}

<div id="steering-council" class="about-section section-white">
<div class="row content content--copy">
<h3 class="section-header">Steering Council</h3>
<!-- STEERING COUNCIL -->
<div class="content content--copy">
<h3 class="text-center">Steering Council</h3>
<p>{{ page.steering_copy }}</p>
</div>
<div class="content content--wide">
Expand All @@ -429,12 +443,12 @@ <h3 class="section-header">Steering Council</h3>
{% endfor %}
</div>
</div>
</div>

<hr>
{% include hr.html %}

<div class="row content content--copy">
<h3 class="section-header">NumFOCUS Subcommittee Members</h3>
<!-- NUMFOCUS MEMBERS -->
<div class="content content--copy">
<h3 class="text-center">NumFOCUS Subcommittee Members</h3>
</div>
<div class="content content--wide">
<div class="biocard-wrapper">
Expand All @@ -452,10 +466,11 @@ <h3 class="section-header">NumFOCUS Subcommittee Members</h3>
</div>
</div>

<hr>
{% include hr.html %}

<div class="row content content--copy">
<h3 class="section-header">Trademark Subcommittee Members</h3>
<!-- TRADEMARK MEMBERS -->
<div class="content content--copy">
<h3 class="text-center">Trademark Subcommittee Members</h3>
</div>

<div class="content content--wide">
Expand All @@ -474,10 +489,11 @@ <h3 class="section-header">Trademark Subcommittee Members</h3>
</div>
</div>

<hr>
{% include hr.html %}

<div class="row content content--copy">
<h3 class="section-header">Retired Steering Council Members</h3>
<!-- RETIRED STEERING COUNCIL -->
<div class="content content--copy">
<h3 class="text-center">Retired Steering Council Members</h3>
</div>

<div class="content content--wide">
Expand All @@ -496,12 +512,12 @@ <h3 class="section-header">Retired Steering Council Members</h3>
</div>
</div>

<div id="sponsors" class="about-section section-grey content content--wide">
<div class="row">
<img src="{{site.baseurl}}/assets/sponsors2.svg" class="section-icon img-responsive" loading="lazy" alt="sponsors">
<h3 class="section-header">Sponsors</h3>
<p class="support-paragraph">Project Jupyter receives direct funding from the following sources</p>
</div>
<!-- SPONSORS BOX -->
<div class="about-box section-grey content content--wide">
<h3 class="text-center">{{ page.sponsor_box.headline }}</h3>
<p class="content content--copy text-center">
{{ page.sponsor_box.description }}
</p>
<ul class="logogrid">
{% for obj in page.sponsors %}
<li>
Expand All @@ -515,19 +531,14 @@ <h3 class="section-header">Sponsors</h3>
</li>
{% endfor %}
</ul>
</div>

<div id="partners" class="about-section section-white content content--wide">
<div class="row section-header">
<img src="{{site.baseurl}}/assets/institutional_partners2.svg"
class="section-icon img-responsive"
alt="institutional partners" />
<h3 class="col-sm-12 section-header">Institutional Partners</h3>
<p class="support-paragraph">
Institutional Partners are organizations that support the project by employing Jupyter Steering Council members.
Current Institutional Partners include:
</p>
</div>
</div>

<!-- PARTNERS BOX -->
<div class="about-box section-white content content--wide">
<h3 class="text-center">{{ page.partner_box.headline }}</h3>
<p class="content content--copy text-center">
{{ page.partner_box.description }}
</p>
<ul class="logogrid">
{% for obj in page.partners %}
<li>
Expand All @@ -541,47 +552,32 @@ <h3 class="col-sm-12 section-header">Institutional Partners</h3>
</li>
{% endfor %}
</ul>
</div>

<div id="donate" class="about-section section-grey content content--wide">
<div class="row content content--copy">
<img src="{{site.url}}/assets/donations-icon2.svg" class="section-icon img-responsive" loading="lazy" alt="Donate">
<h3 class="col-sm-12 section-header">Donate</h3>
<p>
Jupyter will always be 100% open source software, free for all
to use and released under the liberal terms of the <a
href="https://opensource.org/licenses/BSD-3-Clause">modified BSD
license</a>. If you have found Project Jupyter to be useful in
your work, research or company, please consider making a
donation to the project commensurate with your resources.
</p>
<p>
All donations will be used strictly to fund the development of
Project Jupyter's open source software, documentation and
community. Our donations are managed by the <a
href="https://numfocus.org">NumFOCUS Foundation</a>, which is
the legal and fiscal umbrella for the project.
</p>
<p>
NumFOCUS is a 501(c)3 non-profit foundation; if you are subject to US Tax law,
your contributions will be tax-deductible.
</p>
</div>
</div>

<div class="row">
<div class="col-md-12">
<a href="https://numfocus.org">
<img id="numfocus-logo" src="{{site.url}}/assets/numfocus_logo.png" class="img-responsive center-block" loading="lazy" alt="numfocus logo">
</a>
</div>
</div>
<!-- DONATE BOX -->
<div class="about-box section-grey content content--wide">
<h3 class="text-center">{{ page.donate_box.headline }}</h3>
{% for graf in page.donate_box.description %}
<p class="content content--copy">
{{ graf }}
</p>
{% endfor %}
<p>
<a href="https://numfocus.org">
<img src="/assets/logos/numfocus.png"
class="img-responsive center-block"
width=300
height=100
loading="lazy"
alt="numfocus logo">
</a>
</p>

<div class="row content">
<div class="col-md-12 donate-formatting">
<a href="https://numfocus.salsalabs.org/donate-to-jupyter/index.html" class="orange-button" id="donate-link">
Support Project Jupyter
</a>
</div>
<div class="orange-button">
<a href="https://numfocus.salsalabs.org/donate-to-jupyter/index.html" target="noopener noreferrer">
Support Project Jupyter
</a>
</div>
</div>
</div>

</article>
Loading