Merge pull request #38 from makeopensource/staff-roles

modified assets to appropriately reflect staff roles
makeopensource · May 9, 2022 · 0de99b8 · 0de99b8
2 parents 8bb03ad + cab7b96
commit 0de99b8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
-*/.env
-*/.DS_Store
+**/.DS_Store
 db.*
-*/__pycache__
-.python-version
+**/__pycache__
 /mos/*
+**/venv
+
+**/.*
+!.gitignore
diff --git a/static/assets/staff/jakesavitt.png b/static/assets/staff/jakesavitt.png
diff --git a/static/assets/staff/sammiller.jpg b/static/assets/staff/sammiller.jpg
diff --git a/templates/about/index.html b/templates/about/index.html
@@ -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>
@@ -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">