Skip to content

Commit 357131f

Browse files
cameronoelsencameronoelsen
committed
Refined more of the website, changed the front page to a new font scale, took out unused classes and made more generic ones to be used
1 parent bdb8a98 commit 357131f

File tree

6 files changed

+125
-115
lines changed

6 files changed

+125
-115
lines changed

‎about.html‎

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@
3030
<div class="header">
3131
<div class="container">
3232
<div class="row">
33-
<h1>About Project Jupyter</h1>
34-
<p>Project Jupyter was born out of the IPython Project in 2014 as it evolved to support interactive
35-
data science and scientific computing across all programming languages.</p>
33+
<div class="col-xs-12">
34+
<h1>About Project Jupyter</h1>
35+
<p>Project Jupyter was born out of the IPython Project in 2014 as it evolved to support interactive data science and scientific computing across all programming languages.</p>
36+
</div>
3637
</div>
3738
</div>
3839
</div>
@@ -144,7 +145,7 @@ <h2 class="col-sm-12 section-header">Community</h2>
144145
<img src="assets/steering.svg" class="section-icon img-responsive" alt="steering committee icon">
145146
<h2 class="col-sm-12 section-header">Steering Council</h2>
146147
<p class="col-sm-12 support-paragraph">Our team is primarily led by 12 steering committee members who ultimately make the final decisions.</p>
147-
<div class="col-md-12 section-content">
148+
<div class="col-md-12 section-content section-center">
148149
<div class="col-md-4 material material-1">
149150
<p class="card-header">Brian Granger<p>
150151
<p class="card-info">Cal Poly, San Luis Obispo<br><a href="https://github.com/ellisonbg" target="_blank"><em>@ellisonbg</em></a> on GitHub</p>
@@ -205,7 +206,7 @@ <h2 class="col-sm-12 section-header">Steering Council</h2>
205206
<img src="assets/sponsors2.svg" class="section-icon img-responsive" alt="sponsors">
206207
<h2 class="col-sm-12 section-header">Sponsors</h2>
207208
<p class="col-sm-12 support-paragraph">Project Jupyter receives direct funding from the following sources:</p>
208-
<div class="col-xs-12">
209+
<div class="col-xs-12 section-center">
209210
<div class="col-sm-3 col-xs-6 sponsor">
210211
<a href="http://helmsleytrust.org">
211212
<img src="assets/helmsley.svg" class="sponsor-logo" alt="helmsley trust logo"/> </a>
@@ -226,7 +227,7 @@ <h2 class="col-sm-12 section-header">Sponsors</h2>
226227
</a>
227228
</div>
228229
</div>
229-
<div class="col-xs-12">
230+
<div class="col-xs-12 section-center">
230231
<div class="col-sm-3 col-xs-6 sponsor">
231232
<a href="http://developer.rackspace.com/">
232233
<img src="assets/rackspace-color.svg" class="sponsor-logo" alt="rackspace logo"/>
@@ -260,30 +261,32 @@ <h2 class="col-sm-12 section-header">Sponsors</h2>
260261
<h2 class="col-sm-12 section-header">Institutional Partners</h2>
261262
<p class="col-sm-12 support-paragraph">Institutional Partners are companies and universities that support the project by employing Steering Council members.
262263
Current Institutional Partners include:</p>
263-
<div class="col-sm-3 col-xs-6 sponsor">
264-
<a href="http://continuum.io/">
265-
<img src="assets/continuum-color.svg" class="sponsor-logo" height="60" width="200" alt="continuum.io logo">
266-
</a>
267-
</div>
268-
<div class="col-sm-3 col-xs-6 sponsor">
269-
<a href="http://www.bloomberg.com/">
270-
<img src="assets/bloomberg-color.svg" class="sponsor-logo" alt="bloomberg logo">
271-
</a>
272-
</div>
273-
<div class="col-sm-3 col-xs-6 sponsor">
274-
<a href="http://developer.rackspace.com/">
275-
<img src="assets/rackspace-color.svg" class="sponsor-logo" alt="rackspace logo">
276-
</a>
277-
</div>
278-
<div class="col-sm-3 col-xs-6 sponsor">
279-
<a href="http://www.calpoly.edu/">
280-
<img src="assets/poly-color.svg" class="sponsor-logo" alt="cal poly logo">
281-
</a>
282-
</div>
283-
<div class="col-sm-3 col-sm-offset-4 col-xs-6 sponsor center-block">
284-
<a href="http://www.berkeley.edu/">
285-
<img src="assets/berkeley-color.svg" class="sponsor-logo" alt="UC Berkeley logo">
286-
</a>
264+
<div class="col-xs-12 section-center">
265+
<div class="col-sm-3 col-xs-6 sponsor">
266+
<a href="http://continuum.io/">
267+
<img src="assets/continuum-color.svg" class="sponsor-logo" height="60" width="200" alt="continuum.io logo">
268+
</a>
269+
</div>
270+
<div class="col-sm-3 col-xs-6 sponsor">
271+
<a href="http://www.bloomberg.com/">
272+
<img src="assets/bloomberg-color.svg" class="sponsor-logo" alt="bloomberg logo">
273+
</a>
274+
</div>
275+
<div class="col-sm-3 col-xs-6 sponsor">
276+
<a href="http://developer.rackspace.com/">
277+
<img src="assets/rackspace-color.svg" class="sponsor-logo" alt="rackspace logo">
278+
</a>
279+
</div>
280+
<div class="col-sm-3 col-xs-6 sponsor">
281+
<a href="http://www.calpoly.edu/">
282+
<img src="assets/poly-color.svg" class="sponsor-logo" alt="cal poly logo">
283+
</a>
284+
</div>
285+
<div class="col-sm-3 col-sm-offset-4 col-xs-6 sponsor center-block">
286+
<a href="http://www.berkeley.edu/">
287+
<img src="assets/berkeley-color.svg" class="sponsor-logo" alt="UC Berkeley logo">
288+
</a>
289+
</div>
287290
</div>
288291
</div>
289292
</div>
@@ -296,7 +299,7 @@ <h2 class="col-sm-12 section-header">Institutional Partners</h2>
296299
<img src="assets/governance-icon2.svg" class="section-icon img-responsive" id="governance" alt="governance icon">
297300
<h2 class="col-sm-12 section-header">Governance</h2>
298301
<p class="col-sm-12 support-paragraph">Robust, community driven development with institutional backing.</p>
299-
<div class="menu col-md-12">
302+
<div class="col-md-12 section-center">
300303
<a class="button1 clicky">NumFocus</a>
301304
<a class="button2 clicky">Copyright/License</a>
302305
<a class="button3 clicky">Decisions</a>

‎community.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@
77
<section>
88
<div class="header">
99
<div class="container">
10-
<h1>Community Resources</h1>
11-
<p>There are a number of resources available for people interested in using and contributing to Project Jupyter.</p>
10+
<div class="row">
11+
<div class="col-xs-12">
12+
<h1>Community Resources</h1>
13+
<p>There are a number of resources available for people interested in using and contributing to Project Jupyter.</p>
14+
</div>
15+
</div>
1216
</div>
1317
</div>
1418
</section>

‎css/logo-nav.css‎

Lines changed: 50 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,6 @@
66
body {
77
padding-top: 70px;
88
/* Required padding for .navbar-fixed-top. Change if height of navigation changes. */
9-
font-size: 10.71pt;
10-
font-weight: 300;
11-
}
12-
h1 {
13-
font-size: 35px;
14-
font-weight: 400;
15-
}
16-
h2 {
17-
font-size: 29.4px;
18-
font-weight: 400;
19-
}
20-
h3 {
21-
font-size: 21px;
229
font-weight: 400;
2310
}
2411
@-webkit-keyframes fadeIn { from { opacity:0;} to { opacity:1;} }
@@ -157,11 +144,9 @@ animation-delay: 1.1s;
157144
.jumbotron img {
158145
margin: 0 auto;
159146
}
160-
.jumbotron-text p{
161-
font-size: 21px;
162-
line-height: 31px;
147+
.jumbotron-text {
163148
text-align: center;
164-
padding-bottom: 30px;
149+
padding-bottom: 32px;
165150
}
166151
@media (max-width: 767px){
167152
.jumbotron {
@@ -170,10 +155,7 @@ animation-delay: 1.1s;
170155
}
171156

172157
.notebook-preview p {
173-
line-height: 31pt;
174-
padding-top: 41px;
175-
padding-bottom: 41px;
176-
font-size: 21px;
158+
padding: 40px 0px;
177159
}
178160
@media(max-width:1200px) {
179161

@@ -183,9 +165,7 @@ animation-delay: 1.1s;
183165
}
184166
}
185167

186-
.notebook-features h2{
187-
font-size: 21px;
188-
line-height: 1.5;
168+
.notebook-feature{
189169
color:#766A6A;
190170
}
191171

@@ -201,9 +181,7 @@ animation-delay: 1.1s;
201181

202182

203183
.notebook-features p{
204-
padding-top: 26px;
205-
font-size: 15px;
206-
line-height: 1.5;
184+
padding-top: 16px;
207185
}
208186

209187
@media(max-width:1200px) {
@@ -235,13 +213,15 @@ animation-delay: 1.1s;
235213
border-right-style: none;
236214
border-left-style: none;
237215
border-width: thin;
238-
216+
text-align: center;
239217
}
240218
.install-prompt .content {
241219
padding-top: 4%;
242220
padding-bottom: 4%;
243221
}
244-
222+
.install-prompt .buttons {
223+
display: inline-block;
224+
}
245225
.buttons {
246226
font-size: 19.24px;
247227
text-align: center;
@@ -325,23 +305,14 @@ animation-delay: 1.1s;
325305
margin-top: 40px;
326306
}
327307
.hubdescription p {
328-
padding-top: 26px;
329-
font-size: 21px;
330-
line-height: 1.5;
331-
}
332-
.hubfeature h2 {
333308
font-size: 21px;
334309
line-height: 1.5;
335-
text-align: center;
336-
color: #766A6A;
337310
}
338-
.hubfeature p {
339-
font-size: 15px;
340-
line-height: 1.5;
311+
.hubfeature {
341312
text-align: center;
342313
color: #766A6A;
343-
padding-top: 2px;
344314
}
315+
345316
.hubfeature img {
346317
margin: 0 auto;
347318
}
@@ -529,7 +500,7 @@ animation-delay: 1.1s;
529500
font-size: 15px;
530501
line-height: 1.5;
531502
text-align: center;
532-
margin-bottom: 12px;
503+
margin-bottom: 16px;
533504
}
534505
@media (max-width: 992px) {
535506
.header h1 {
@@ -612,10 +583,6 @@ animation-delay: 1.1s;
612583
background-color: white;
613584
}
614585

615-
.menu {
616-
margin-top: 20px;
617-
618-
}
619586
.governance .clicky{
620587
display: inline-block;
621588
text-decoration: none;
@@ -776,7 +743,7 @@ animation-delay: 1.1s;
776743
/*Community Page */
777744

778745
.community-section {
779-
padding: 17px;
746+
padding: 16px;
780747
border-bottom: 1px solid #E8E8E8;
781748
height: 160px;
782749
}
@@ -860,7 +827,7 @@ animation-delay: 1.1s;
860827

861828
/* new stuff */
862829
.section-white {
863-
padding: 75px 0px;
830+
padding: 56px 0px;
864831
background-color: white;
865832
}
866833

@@ -870,7 +837,7 @@ animation-delay: 1.1s;
870837
}
871838

872839
.section-grey {
873-
padding: 75px 0px;
840+
padding: 56px 0px;
874841
background-color: #fafafa;
875842
border-top: 1px solid #E0E0E0;
876843
border-bottom: 1px solid #E0E0E0;
@@ -889,16 +856,51 @@ animation-delay: 1.1s;
889856
display: block;
890857
margin: 0 auto;
891858
}
859+
.section-center {
860+
/*To center the companies on the home page & get rid of padding on left associated with ul*/
861+
text-align: center;
862+
}
892863
.sponsor {
893864
margin: 16px 0px;
894865
}
895866
.sponsor-logo {
896867
width: 75%;
897868
height: auto;
898869
}
870+
.steering-cards {
871+
text-align: center;
872+
}
899873

900874
@media (min-width: 1200px) {
901875
.section-white, .section-grey {
902876
padding: 5% 0%;
903877
}
904878
}
879+
@media (min-width: 1200px) {
880+
p {
881+
font-size: 16px;
882+
line-height: 1.375;
883+
font-weight: 400;
884+
}
885+
h4 {
886+
font-size: 18px;
887+
line-height: 1.22;
888+
font-weight: 400;
889+
}
890+
h3 {
891+
font-size: 28px;
892+
line-height: 1.25;
893+
font-weight: 400;
894+
}
895+
h2 {
896+
font-size: 36px;
897+
line-height: 1.25;
898+
font-weight: 400;
899+
}
900+
h1 {
901+
font-size: 48px;
902+
line-height: 1.05em;
903+
font-weight: 400;
904+
}
905+
}
906+
@media ()

‎donate.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
<div class="header">
99
<div class="container">
1010
<div class="row">
11-
<h1>Donate to Project Jupyter</h1>
12-
<!--<p>If you have found Jupyter to be useful, please consider making a donation to the project commensurate with your resources.</p>-->
13-
<p>With your help, Project Jupyter can continue to build great open source software.</p>
11+
<div class="col-xs-12">
12+
<h1>Donate to Project Jupyter</h1>
13+
<p>With your help, Project Jupyter can continue to build great open source software.</p>
14+
</div>
1415
</div>
1516
</div>
1617
</div>
@@ -21,7 +22,7 @@ <h1>Donate to Project Jupyter</h1>
2122
<div class="architecturedescription col-md-12">
2223
<img src="assets/donations-icon2.svg" class="section-icon" alt="donations icon">
2324
<h2 class="section-header">Donations</h2>
24-
<p id="donate-paragraph">Jupyter will always be 100% open source software, free for all to use and
25+
<p id="support-paragraph">Jupyter will always be 100% open source software, free for all to use and
2526
released under the liberal terms of the modified BSD license. If you have found Jupyter to be useful in your work, research or company, please consider making a donation to the project commensurate with your resources. Any amount helps!
2627
All donations will be used strictly to fund the development of Project Jupyter's open source software, documentation
2728
and community.

0 commit comments

Comments
 (0)