Skip to content

modified assets to appropriately reflect staff roles #38

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
May 9, 2022
Merged

modified assets to appropriately reflect staff roles #38

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
75c9d33
modified assets to appropriately reflect staff roles
emilkovacev May 8, 2022
cab7b96
additional roster update
emilkovacev May 8, 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
10 changes: 6 additions & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
*/.env
*/.DS_Store
**/.DS_Store
db.*
*/__pycache__
.python-version
**/__pycache__
/mos/*
**/venv

**/.*
!.gitignore
Binary file removed static/assets/staff/jakesavitt.png
View file
Open in desktop
Binary file not shown.
Binary file removed static/assets/staff/sammiller.jpg
View file
Open in desktop
Binary file not shown.
36 changes: 7 additions & 29 deletions templates/about/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,18 @@ <h2>Our Team</h2>
</div>
</div>


<div class="mb-2">
<img
<img
class="bg-dark rounded-circle me-3"
style="width: 75px; height: 75px; float: left;"
src="{% static 'assets/staff/sammiller.jpg' %}" />
src="{% static 'assets/staff/adamrussell.jpg' %}"
/>
<div>
<b>Sam Miller</b>
<b>Adam Russell</b>
<p>
<span class="text-primary">Information Lead</span><br>
Biological Sciences BA
<span class="text-primary">Events Coordinator</span><br>
Computer Science BS
</p>
</div>
</div>
Expand All @@ -96,37 +98,13 @@ <h2>Our Team</h2>
</div>
</div>

<div class="mb-2">
<img
class="bg-dark rounded-circle me-3"
style="width: 75px; height: 75px; float: left;"
src="{% static 'assets/staff/adamrussell.jpg' %}"
/>
<div>
<b>Adam Russell</b>
<p>
<span class="text-primary">Events Coordinator</span><br>
Computer Science BS
</p>
</div>
</div>

<div class="mb-2">
<img
class="bg-dark rounded-circle me-3"
style="width: 75px; height: 75px; float: left;"
src="{% static 'assets/staff/jakesavitt.png' %}"
/>

<div>
<b>Jake Savitt</b>
<p>
<span class="text-primary">Treasurer</span><br>
Computer Engineering BS
</p>
</div>
</div>

</div>

{% comment %} <div class="row mb-3">
Expand Down