Merge branch 'master' into develop

peterkos · web-flow · commit 2ac7d2783814 · 2021-02-17T10:46:44.000-05:00
diff --git a/index.html b/index.html
@@ -191,7 +191,6 @@ <h1>Schedule</h1>
                     <p>Feb 21st</p>
                 </div>
             </div>
-
             <div id="schedule-content-wrapper">
                 <div id="pre-event-content" class="schedule-content">
                     <div class="day-row pre-16">
diff --git a/sass/main.scss b/sass/main.scss
@@ -823,6 +823,15 @@ nav {
                     color: $orange;
                 }
             }
+
+            &:hover {
+                animation: tab-hover-in 0.2s;
+                animation-fill-mode: forwards;
+            }
+
+            p {
+                color: $dark-blue;
+            }
         }
 
         #feb-21-content {

Original file line number	Diff line number	Diff line change
`@@ -823,6 +823,15 @@ nav {`
`823`	`823`	`color: $orange;`
`824`	`824`	`}`
`825`	`825`	`}`
	`826`	`+`
	`827`	`+ &:hover {`
	`828`	`+ animation: tab-hover-in 0.2s;`
	`829`	`+ animation-fill-mode: forwards;`
	`830`	`+ }`
	`831`	`+`
	`832`	`+ p {`
	`833`	`+ color: $dark-blue;`
	`834`	`+ }`
`826`	`835`	`}`
`827`	`836`
`828`	`837`	`#feb-21-content {`