Skip to content

Fix footer overlap on People page #11

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

Open
tkaragianes wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix footer overlap on People page #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8883dd0
Remove old lab phone number
tkaragianes Mar 2, 2023
9e88e61
Adjust spacing to correct footer overlap in alumi list
tkaragianes Mar 2, 2023
3b8186f
Update footer with current lab affiliations
tkaragianes Mar 8, 2023
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
15 changes: 10 additions & 5 deletions media/html/_external.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,16 @@
<div style="position:fixed; display:block; right:-5%; bottom:100px; opacity:0.85; z-index:2000; width:60px; height:60px;"><i class="nav_top"></i></div>
</a>

<div id="DasICON" class="fix">
<a href="http://biochem.stanford.edu/" target="_blank" rel="noopener noreferrer external"><div class="nav_footer_biochem"></div></a>
<a href="http://med.stanford.edu/" target="_blank" rel="noopener noreferrer external"><div class="nav_footer_stfmed"></div></a>
<a href="https://physics.stanford.edu/" target="_blank" rel="noopener noreferrer external"><div class="nav_footer_physics"></div></a>
<a href="http://bioxgames.stanford.edu/index.html" target="_blank" rel="noopener noreferrer external"><div class="nav_footer_biox"></div></a>
<div id="DasICON" class="fix" style="display: flex; flex-direction: row; justify-content: space-around; align-items: center;">
<a href="https://biochemistry.stanford.edu/" target="_blank" rel="noopener noreferrer external">
<img src="/site_media/images/public/nav_logo_biochem.jpg" alt="Stanford Biochemistry Department logo">
</a>
<a href="https://med.stanford.edu/" target="_blank" rel="noopener noreferrer external">
<img src="/site_media/images/public/nav_logo_SoM.png" alt="Stanford School of Medicine logo">
</a>
<a href="https://www.hhmi.org/scientists/rhiju-das" target="_blank" rel="noopener noreferrer external">
<img src="/site_media/images/public/nav_logo_hhmi.jpg" alt="Howard Huges Medical Institute logo">
</a>
</div>
</div>

Expand Down
2 changes: 0 additions & 2 deletions media/html/public_contact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
<p>
<span class="contactH2">Office</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="peopleH2">(650) 723-5976</span>
<br/>
<span class="contactH2">Lab</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="peopleH2">(650) 723-7310</span>
<br/>
<span class="contactH2">Admin</span>&nbsp;&nbsp;&nbsp;<span class="peopleH2">(650) 498-5118</span>
</p>
<p><span class="contactH2">E-mail</span>&nbsp;&nbsp;&nbsp;&nbsp;rhiju <i>[at]</i> stanford.edu</p>
Expand Down
Binary file added media/images/public/nav_logo_SoM.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/images/public/nav_logo_biochem.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/images/public/nav_logo_hhmi.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion media/js/public/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ app.fnChangeView = function() {
} else if (app.page == 'people') {
var current_member = $("tr.current_member").length - 1,
past_member = $("p.past_member").length,
height_adjust = current_member * 200 + past_member * 54;
height_adjust = current_member * 200 + past_member * 56;
$(".DASpeople").css("height", height_adjust + 900);

} else if (app.page == 'news') {
Expand Down