Skip to content

Commit 62426d9

Browse files
cameronoelsencameronoelsen
committed
Merge pull request jupyter#77 from jupyter/nasa-logo-fix
Material Card Fix & Styling
2 parents 79ed02d + 75a78a6 commit 62426d9

File tree

3 files changed

+64
-52
lines changed

3 files changed

+64
-52
lines changed

‎about.html

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -154,48 +154,48 @@ <h2>Community</h2>
154154
<h2>Steering Council</h2>
155155
<p class="supportparagraph">Our team is primarily led by 10 steering committee members who ultimately make the final decisions.</p>
156156
<div class="col-md-12">
157-
<div class="col-md-4 material material-1">
158-
<p class="council-name">Brian Granger<p>
159-
<p class="council-info">Cal Poly, San Luis Obispo<br><a href="https://github.com/ellisonbg" target="_blank"><em>@ellisonbg</em></a> on GitHub</p>
160-
</div>
161-
<div class="col-md-4 material material-1">
162-
<p class="council-name">Damian Avila<p>
163-
<p class="council-info">Continuum Analytics<br><a href="https://github.com/damianavila" target="_blank"><em>@damianavila</em></a> on GitHub</p>
164-
</div></a>
165-
<div class="col-md-4 material material-1">
166-
<p class="council-name">Fernando Perez<p>
167-
<p class="council-info">UC Berkeley<br><a href="https://github.com/fperez" target="_blank"><em>@fperez</em></a> on GitHub</p>
168-
</div>
169-
<div class="col-md-4 material material-1">
170-
<p class="council-name">Jason Grout<p>
171-
<p class="council-info">Bloomberg<br><a href="https://github.com/jasongrout" target="_blank"><em>@jasongrout</em></a> on GitHub</p>
172-
</div>
173-
<div class="col-md-4 material material-1">
174-
<p class="council-name">Jessica Hamrick<p>
175-
<p class="council-info">UC Berkeley<br><a href="https://github.com/jhamrick" target="_blank"><em>@jhamrick</em></a> on GitHub</p>
176-
</div>
177-
<div class="col-md-4 material material-1">
178-
<p class="council-name">Jonathan Frederic<p>
179-
<p class="council-info">Cal Poly, San Luis Obispo<br><a href="https://github.com/jdfreder" target="_blank"><em>@jdfreder</em></a> on GitHub</p>
180-
</div>
181-
<div class="col-md-4 material material-1">
182-
<p class="council-name">Kyle Kelley<p>
183-
<p class="council-info">Rackspace<br><a href="https://github.com/rgbkrk" target="_blank"><em>@rgbkrk</em></a> on GitHub</p>
184-
</div>
185-
<div class="col-md-4 material material-1">
186-
<p class="council-name">Matthias Bussonnier<p>
187-
<p class="council-info">UC Berkeley<br><a href="https://github.com/carreau" target="_blank"><em>@carreau</em></a> on GitHub</p>
188-
</div>
189-
<div class="col-md-4 material material-1">
190-
<p class="council-name">Min Ragan-Kelley<p>
191-
<p class="council-info">Simula Research Lab<br><a href="https://github.com/minrk" target="_blank"><em>@minrk</em></a> on GitHub</p>
192-
</div>
193-
<div class="col-md-4 material material-1">
194-
<p class="council-name">Thomas Kluyver<p>
195-
<p class="council-info">UC Berkeley<br><a href="https://github.com/takluyver" target="_blank"><em>@takluyver</em></a> on GitHub</p>
157+
<div class="col-md-4 material material-1">
158+
<p class="card-header">Brian Granger<p>
159+
<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>
160+
</div>
161+
<div class="col-md-4 material material-1">
162+
<p class="card-header">Damian Avila<p>
163+
<p class="card-info">Continuum Analytics<br><a href="https://github.com/damianavila" target="_blank"><em>@damianavila</em></a> on GitHub</p>
164+
</div>
165+
<div class="col-md-4 material material-1">
166+
<p class="card-header">Fernando Perez<p>
167+
<p class="card-info">UC Berkeley<br><a href="https://github.com/fperez" target="_blank"><em>@fperez</em></a> on GitHub</p>
168+
</div>
169+
<div class="col-md-4 material material-1">
170+
<p class="card-header">Jason Grout<p>
171+
<p class="card-info">Bloomberg<br><a href="https://github.com/jasongrout" target="_blank"><em>@jasongrout</em></a> on GitHub</p>
172+
</div>
173+
<div class="col-md-4 material material-1">
174+
<p class="card-header">Jessica Hamrick<p>
175+
<p class="card-info">UC Berkeley<br><a href="https://github.com/jhamrick" target="_blank"><em>@jhamrick</em></a> on GitHub</p>
176+
</div>
177+
<div class="col-md-4 material material-1">
178+
<p class="card-header">Jonathan Frederic<p>
179+
<p class="card-info">Cal Poly, San Luis Obispo<br><a href="https://github.com/jdfreder" target="_blank"><em>@jdfreder</em></a> on GitHub</p>
180+
</div>
181+
<div class="col-md-4 material material-1">
182+
<p class="card-header">Kyle Kelley<p>
183+
<p class="card-info">Rackspace<br><a href="https://github.com/rgbkrk" target="_blank"><em>@rgbkrk</em></a> on GitHub</p>
184+
</div>
185+
<div class="col-md-4 material material-1">
186+
<p class="card-header">Matthias Bussonnier<p>
187+
<p class="card-info">UC Berkeley<br><a href="https://github.com/carreau" target="_blank"><em>@carreau</em></a> on GitHub</p>
188+
</div>
189+
<div class="col-md-4 material material-1">
190+
<p class="card-header">Min Ragan-Kelley<p>
191+
<p class="card-info">Simula Research Lab<br><a href="https://github.com/minrk" target="_blank"><em>@minrk</em></a> on GitHub</p>
192+
</div>
193+
<div class="col-md-4 material material-1">
194+
<p class="card-header">Thomas Kluyver<p>
195+
<p class="card-info">UC Berkeley<br><a href="https://github.com/takluyver" target="_blank"><em>@takluyver</em></a> on GitHub</p>
196+
</div>
196197
</div>
197198
</div>
198-
</div>
199199
</div>
200200
</section>
201201
<section>

‎community.html

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,24 @@ <h2>Communication Channels</h2>
2020
<p class="supportparagraph">Please feel free to ask us questions about Project Jupyter!</p>
2121
<div class="col-md-12">
2222
<div class="col-md-4 material material-1">
23-
<p class="community-resource"><a href="http://stackoverflow.com/questions/tagged/jupyter">Jupyter on Stack Overflow</a><p>
23+
<p class="card-header">Jupyter on Stack Overflow<p>
24+
<p class="card-link"><a href="http://stackoverflow.com/questions/tagged/jupyter"><strong>view</strong></a></p>
2425
</div>
2526
<div class="col-md-4 material material-1">
26-
<p class="community-resource"><a href="https://groups.google.com/forum/#!forum/jupyter">Jupyter Mailing List</a><p>
27+
<p class="card-header">Jupyter Mailing List<p>
28+
<p class="card-link"><a style="padding-top: 27px;" href="https://groups.google.com/forum/#!forum/jupyter"><strong>view</strong></a></p>
2729
</div></a>
2830
<div class="col-md-4 material material-1">
29-
<p class="community-resource"><a href="https://groups.google.com/forum/#!forum/jupyter-education">Jupyter in Education Mailing List</a><p>
31+
<p class="card-header">Jupyter in Education Mailing List<p>
32+
<p class="card-link"><a href="https://groups.google.com/forum/#!forum/jupyter-education"><strong>view</strong></a></p>
3033
</div>
3134
<div class="col-md-4 material material-1">
32-
<p class="community-resource"><a href="http://projects.scipy.org/mailman/listinfo/ipython-dev">IPython Mailing List</a><p>
35+
<p class="card-header">IPython Mailing List<p>
36+
<p class="card-link"><a style="padding-top: 27px;" href="http://projects.scipy.org/mailman/listinfo/ipython-dev"><strong>view</strong></a></p>
3337
</div>
3438
<div class="col-md-4 material material-1">
35-
<p class="community-resource"><a href="https://gitter.im/jupyter/jupyter">Developer Chat Room</a></p>
39+
<p class="card-header">Developer Chat Room</p>
40+
<p class="card-link"><a href="https://gitter.im/jupyter/jupyter"><strong>view</strong></a></p>
3641
</div>
3742
</div>
3843
</div>

‎css/logo-nav.css

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -597,17 +597,29 @@ a {
597597
margin: 0 auto;
598598
display: block;
599599
}
600-
.council-name {
600+
.card-header {
601+
text-align: left;
601602
float:left;
602603
font-size: 19px;
603604
margin-top: 10px;
604605
}
605-
.council-info {
606+
.card-info {
606607
float:left;
607608
font-size: 15px;
608609
text-align: left;
609610
margin-top: 0px;
610611
}
612+
.card-link a {
613+
float: left;
614+
font-size: 15px;
615+
text-align: left;
616+
text-transform: uppercase;
617+
color: #F27624;
618+
line-height: 1;
619+
}
620+
.card-link a:hover {
621+
text-decoration: none;
622+
}
611623
.material {
612624
background: #fff;
613625
border-radius: 2px;
@@ -806,11 +818,6 @@ a {
806818
margin: 0 auto;
807819
display: block;
808820
}
809-
.community-resource {
810-
text-align: center;
811-
font-size: 19px;
812-
margin-top: 10px;
813-
}
814821
@media (max-width: 1200px) {
815822
.navbar-header {
816823
float: none;

0 commit comments

Comments
 (0)