Skip to content

Commit 9956b8c

Browse files
palewirepalewire
authored
Merge pull request #586 from jupyter/tidy-container
Refactored container for simplicity
2 parents 193fd41 + ff5cbcc commit 9956b8c

15 files changed

+62
-171
lines changed

‎_includes/cards.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
<div class="row">
2+
<div class="row content content--wide">
33
<h4 class="col-sm-12">{{include.cohort_name}}</h4>
44
{% assign sorted = include.cohort | sort: "name" %}
55
{% for member in sorted %}

‎_layouts/page.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
image_alt=page.title_image_alt
1010
%}
1111

12-
<article class="post-content">
12+
<article>
1313
<div class="section-white top-section-border">
14-
<div class="page_content container">
14+
<div class="container content content--copy">
1515
{{ content }}
1616
</div>
1717
</div>

‎_sass/_about.scss

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
/* Styling for the Sponsor logos on About page*/
2-
.about-section .row {
3-
padding-left: 30px;
4-
padding-right: 30px;
5-
}
6-
71
#donate-link {
82
margin: 20px auto 0px auto;
93
width: 240px;
@@ -15,7 +9,7 @@
159
}
1610

1711
/* .Card-header, .card-info, .card-link, and .material are used for cards within the steering council section of the page. */
18-
div.page_content img.council-member-photo {
12+
img.council-member-photo {
1913
width: 160px;
2014
height: 160px;
2115
border-top-left-radius: 2px;

‎_sass/_markdown.scss

-55
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,3 @@
1-
/* Page content */
2-
div.page_content img {
3-
height:200px;
4-
width: 60%;
5-
margin: 0px 20%;
6-
}
7-
8-
div.page_content, div.post_content {
9-
padding: 0;
10-
margin: 0px auto;
11-
max-width: 980px;
12-
}
13-
14-
div.page_content.container > p,
15-
div.page_content.container > h1,
16-
div.page_content.container > h2,
17-
div.page_content.container > h3,
18-
div.page_content.container > h4,
19-
div.page_content.container > div.highlighter-rouge
20-
{
21-
padding-left:30px;
22-
padding-right: 30px;
23-
}
24-
25-
div.page_content.container > iframe {
26-
margin-left: 30px;
27-
}
28-
29-
div.page_content.container > ul {
30-
padding-left: 50px;
31-
}
32-
33-
34-
.clear {
35-
clear: both;
36-
}
37-
38-
/*Styling for the community section */
39-
/* Style for inter-repo links */
40-
.link1 {
41-
stroke: white;
42-
stroke-width: 1;
43-
}
44-
45-
/* Style for repo-contributor links */
46-
.link2 {
47-
stroke: #e6e6e6;
48-
stroke-width: 2;
49-
}
50-
51-
.node text {
52-
pointer-events: none;
53-
font: 0px sans-serif;
54-
}
55-
561
img.section-icon {
572
max-width:60px;
583
max-height:60px;

‎_sass/_nav.scss

+1-26
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
body {
2-
font-weight: 400;
3-
/* Required padding for .navbar-fixed-top. Change if height of navigation changes. */
4-
padding-top: 70px;
5-
}
6-
71
.jupytercon-nav > li > .black-tab {
82
color: black;
93
}
@@ -290,7 +284,7 @@ body {
290284
border-radius: 2px;
291285
color: white;
292286
letter-spacing: 1px;
293-
padding: 13px 60px;
287+
padding: 13px;
294288
text-decoration: none;
295289
-webkit-transition: .2s;
296290
}
@@ -327,13 +321,6 @@ body {
327321
}
328322
}
329323

330-
/* all elements in .containers that have a anchor
331-
* need to be scrolled by at least 3 em to not be behind the hidden header.
332-
*/
333-
.container *{
334-
scroll-margin-top: 3em;
335-
}
336-
337324
/* Medium devices (desktops, 992px and up) */
338325
@media (min-width: 992px) {
339326
p {
@@ -463,11 +450,6 @@ body {
463450

464451
/* Small devices (tablets, 768px and up) */
465452
@media (min-width: 768px) {
466-
.container {
467-
margin-left:10px;
468-
margin-right:10px;
469-
width: calc(100% - 20px);
470-
}
471453
.tab {
472454
text-align: center;
473455
}
@@ -494,13 +476,6 @@ body {
494476
font-weight: 500;
495477
line-height: 1.153em;
496478
}
497-
.companies li {
498-
width: 30%;
499-
padding: 4%;
500-
}
501-
body {
502-
padding-top: 50px;
503-
}
504479
}
505480

506481
/* Extra small devices (these are mostly fixes to make sure elements act correctly to look good) */

‎_sass/bootstrap/_container.scss

-28
This file was deleted.

‎_sass/bootstrap/_index.scss

-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,5 @@
2222
@import "text"; // <p> tags
2323
@import "lists"; // <ol> and <ul> tags
2424
@import "code"; // <code> and <pre> tags
25-
@import "container"; // The .container class
2625
@import "scaffolding"; // Row and column gridding
2726
@import "jumbotron"; // The large hero element atop the page

‎_sass/bootstrap/_scaffolding.scss

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
.row {
2-
margin-right: -15px;
3-
margin-left: -15px;
4-
}
51
.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
62
position: relative;
73
min-height: 1px;

‎_sass/components/_containers.scss

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.container {
2+
padding-right: 1em;
3+
padding-left: 1em;
4+
}
5+
.content {
6+
margin-right: auto;
7+
margin-left: auto;
8+
&.content--copy {
9+
max-width: 630px;
10+
}
11+
&.content--wide {
12+
max-width: 930px;
13+
}
14+
}

‎_sass/components/_navbar.scss

-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22

33
.navbar {
44
display: block;
5-
position: fixed;
6-
top: 0;
7-
left: 0;
8-
right: 0;
9-
z-index: 1030;
105
border-bottom: 1px solid darken($light-gray, 10%);
116
background-color: $white;
127
padding: 15px 25px;

‎_sass/components/_page-header.scss

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
text-align: center;
66
background-color: $light-gray;
77
h1 {
8+
margin: 0;
89
font-size: 2.5em;
910
line-height: 1.3;
1011
@media (max-width: 767px) {

‎about.md renamed to ‎about.html

+39-33
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: page
2+
layout: default
33
title: "About Us"
44
tagline: Project Jupyter’s origins and governance
55
permalink: /about
@@ -376,23 +376,28 @@
376376
alt: 2i2c logo
377377
---
378378

379-
Project Jupyter is a non-profit, open-source project, born out of the [IPython Project](https://ipython.org) in 2014 as
380-
it evolved to support interactive data science and scientific computing across all programming languages. Jupyter will
381-
always be 100% open-source software, free for all to use and released under the liberal terms of the
382-
[modified BSD license](https://opensource.org/licenses/BSD-3-Clause).
379+
{% include page-header.html
380+
title=page.title
381+
tagline=page.tagline
382+
%}
383383

384-
Jupyter is developed in the open on GitHub, through the consensus of the Jupyter community. For more information on our
385-
governance approach, please see our [Governance Document](https://github.com/jupyter/governance/blob/master/governance.md).
384+
<article class="container">
385+
<div class="section-white top-section-border">
386+
<div class="content content--copy">
386387

387-
All online and in-person interactions and communications directly related to the project are covered by the
388-
[Jupyter Code of Conduct](https://github.com/jupyter/governance/blob/master/conduct/code_of_conduct.md).
389-
This Code of Conduct sets expectations to enable a diverse community of
390-
users and contributors to participate in the project with respect and safety.
388+
<p>Project Jupyter is a non-profit, open-source project, born out of the <a href="https://ipython.org">IPython Project</a> in 2014 as it evolved to support interactive data science and scientific computing across all programming languages. 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>.</p>
389+
390+
<p>Jupyter is developed in the open on GitHub, through the consensus of the Jupyter community. For more information on our governance approach, please see our <a href="https://github.com/jupyter/governance/blob/master/governance.md">Governance Document</a>.</p>
391+
392+
<p>All online and in-person interactions and communications directly related to the project are covered by the <a href="https://github.com/jupyter/governance/blob/master/conduct/code_of_conduct.md">Jupyter Code of Conduct</a>. This Code of Conduct sets expectations to enable a diverse community of users and contributors to participate in the project with respect and safety.</p>
393+
394+
</div>
395+
</div>
391396

392397
<div class="about-section section-white top-section-border">
393-
<div class="row">
394-
<h3 class="col-sm-12 section-header">Distinguished Contributors</h3>
395-
<p class="col-sm-12">
398+
<div class="row content content--copy">
399+
<h3 class="section-header">Distinguished Contributors</h3>
400+
<p>
396401
Project Jupyter <a href="https://jupyter.org/governance/distinguished_contributors.html">Distinguished
397402
Contributors</a> are recognized for their substantial contributions
398403
to Jupyter itself in both quality and quantity over at least two
@@ -409,16 +414,16 @@ <h3 class="col-sm-12 section-header">Distinguished Contributors</h3>
409414
</div>
410415

411416
<div id="steering-council" class="about-section section-white top-section-border">
412-
<div class="row">
417+
<div class="row content content--copy">
413418
<img src="{{site.url}}/assets/steering.svg" class="section-icon img-responsive" alt="steering committee icon">
414-
<h3 class="col-sm-12 section-header">Steering Council</h3>
415-
<p class="col-sm-12">
419+
<h3 class="section-header">Steering Council</h3>
420+
<p>
416421
The role of the Jupyter Steering Council is to ensure, through working with and serving the broader Jupyter community,
417422
the long-term well-being of the project, both technically and as a community. The Jupyter Steering Council currently consists
418423
of the following members (in alphabetical order).
419424
</p>
420425
</div>
421-
<div class="row">
426+
<div class="row content content--wide">
422427
{% assign sorted = page.steering | sort: "last" %}
423428
{% for member in sorted %}
424429
<div class="col-sm-3 col-xs-6 material section-content section-center">
@@ -431,10 +436,10 @@ <h3 class="col-sm-12 section-header">Steering Council</h3>
431436

432437
<hr>
433438
{% assign num = page.numfocus_subcomittee | size %}
434-
<div class="row">
435-
<h3 class="col-sm-12 section-header">NumFOCUS Subcommittee Member{% if num > 1 %}s{% endif %}</h3>
439+
<div class="row content content--copy">
440+
<h3 class="section-header">NumFOCUS Subcommittee Member{% if num > 1 %}s{% endif %}</h3>
436441
</div>
437-
<div class="row">
442+
<div class="row content content--wide">
438443
{% assign sorted = page.numfocus_subcomittee | sort: "last" %}
439444
{% for member in sorted %}
440445
<div class="col-sm-3 col-xs-6 material">
@@ -448,10 +453,10 @@ <h3 class="col-sm-12 section-header">NumFOCUS Subcommittee Member{% if num > 1 %
448453

449454
<hr>
450455
{% assign num = page.trademark_subcomittee | size %}
451-
<div class="row">
452-
<h3 class="col-sm-12 section-header">Trademark Subcommittee Member{% if num > 1 %}s{% endif %}</h3>
456+
<div class="row content content--copy">
457+
<h3 class="section-header">Trademark Subcommittee Member{% if num > 1 %}s{% endif %}</h3>
453458
</div>
454-
<div class="row">
459+
<div class="row content content--wide">
455460
{% assign sorted = page.trademark_subcomittee | sort: "last" %}
456461
{% for member in sorted %}
457462
<div class="col-sm-3 col-xs-6 material">
@@ -465,10 +470,10 @@ <h3 class="col-sm-12 section-header">Trademark Subcommittee Member{% if num > 1
465470

466471
<hr>
467472
{% assign num = page.retired_steering | size %}
468-
<div class="row">
469-
<h3 class="col-sm-12 section-header">Retired Steering Council Member{% if num > 1 %}s{% endif %}</h3>
473+
<div class="row content content--copy">
474+
<h3 class="section-header">Retired Steering Council Member{% if num > 1 %}s{% endif %}</h3>
470475
</div>
471-
<div class="row">
476+
<div class="row content content--wide">
472477
{% assign sorted = page.retired_steering | sort: "last" %}
473478
{% for member in sorted %}
474479
<div class="col-sm-3 col-xs-6 material">
@@ -481,10 +486,10 @@ <h3 class="col-sm-12 section-header">Retired Steering Council Member{% if num >
481486
</div>
482487
</div>
483488

484-
<div id="sponsors" class="about-section section-grey top-section-border">
489+
<div id="sponsors" class="about-section section-grey top-section-border content content--wide">
485490
<div class="row">
486491
<img src="{{site.baseurl}}/assets/sponsors2.svg" class="section-icon img-responsive" loading="lazy" alt="sponsors">
487-
<h3 class="col-sm-12 section-header">Sponsors</h3>
492+
<h3 class="section-header">Sponsors</h3>
488493
<p class="support-paragraph">Project Jupyter receives direct funding from the following sources</p>
489494
</div>
490495
<ul class="logogrid">
@@ -502,7 +507,7 @@ <h3 class="col-sm-12 section-header">Sponsors</h3>
502507
</ul>
503508
</div>
504509

505-
<div id="partners" class="about-section section-white top-section-border">
510+
<div id="partners" class="about-section section-white top-section-border content content--wide">
506511
<div class="row section-header">
507512
<img src="{{site.baseurl}}/assets/institutional_partners2.svg"
508513
class="section-icon img-responsive"
@@ -528,8 +533,8 @@ <h3 class="col-sm-12 section-header">Institutional Partners</h3>
528533
</ul>
529534
</div>
530535

531-
<div id="donate" class="about-section section-grey">
532-
<div class="row">
536+
<div id="donate" class="about-section section-grey content content--wide">
537+
<div class="row content content--copy">
533538
<img src="{{site.url}}/assets/donations-icon2.svg" class="section-icon img-responsive" loading="lazy" alt="Donate">
534539
<h3 class="col-sm-12 section-header">Donate</h3>
535540
<p>
@@ -561,11 +566,12 @@ <h3 class="col-sm-12 section-header">Donate</h3>
561566
</div>
562567
</div>
563568

564-
<div class="row">
569+
<div class="row content">
565570
<div id="col-md-12 donate-formatting">
566571
<a href="https://numfocus.salsalabs.org/donate-to-jupyter/index.html" class="orange-button" id="donate-link">
567572
Support Project Jupyter
568573
</a>
569574
</div>
570575
</div>
571576
</div>
577+
</article>

‎assets/css/main.scss

+1
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@
1616
@import "components/jupyterhub";
1717
@import "components/page-header";
1818
@import "components/iframes";
19+
@import "components/containers";

0 commit comments

Comments
 (0)