Merge branch 'main' into thisworks

mollycarroll · Mar 19, 2021 · f481795 · f481795
2 parents 3c45467 + 98f7d64
commit f481795
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/components/Event.jsx b/src/components/Event.jsx
@@ -98,6 +98,7 @@ class Event extends Component {
 								<i className="far fa-trash-alt position-absolute"></i>
 							</Confirm>
 						</div>
+
 					</section>
 				</div>
 				<div className="container-fluid full-screen">
@@ -113,7 +114,6 @@ class Event extends Component {
 
 			</div>
 
-
 		)
 	}
 }

diff --git a/src/index.css b/src/index.css
@@ -382,4 +382,7 @@ nav {
     -webkit-transform: translateY(-10px);
     transform: translateY(-10px);
   }
+
 }
+
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,6 +98,7 @@ class Event extends Component { @@
     								<i className="far fa-trash-alt position-absolute"></i>
     							</Confirm>
     						</div>
     					</section>
     				</div>
     				<div className="container-fluid full-screen">
@@ Expand All / @@ -113,7 +114,6 @@ class Event extends Component { @@
     			</div>
     		)
     	}
     }
@@ Expand Down @@