merge conflicts

wowsims · Dec 9, 2023 · 5ec36cc · 5ec36cc
2 parents 44173b1 + e40e51b
commit 5ec36cc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/_site/404.html b/_site/404.html
@@ -22,7 +22,7 @@
 {"@context":"https://schema.org","@type":"WebPage","description":"Welcome to WoWSims! This is a community-driven project to provide simulations for World of Warcraft® Classic™ Classes &amp; Raids together with the leading theorycrafters and class representatives.","headline":"WoWSims - WoW Classic Simulators","url":"http://localhost:4000/404.html"}</script>
 <!-- End Jekyll SEO tag -->
 
-    <link rel="stylesheet" href="/assets/css/style.css?v=965a7eb30431dcb23c3c8c4dd0a2e96c6ea191ae">
+    <link rel="stylesheet" href="/assets/css/style.css?v=44173b1c201eb21c62893b8a9864fbb2a859ddc9">
     <!-- start custom head snippets, customize with your own _includes/head-custom.html file -->
 
 <!-- Setup Google Analytics -->

diff --git a/_site/about/index.html b/_site/about/index.html
@@ -22,7 +22,7 @@
 {"@context":"https://schema.org","@type":"WebSite","description":"Welcome to WoWSims! This is a community-driven project to provide simulations for World of Warcraft® Classic™ Classes &amp; Raids together with the leading theorycrafters and class representatives.","headline":"About","name":"WoWSims - WoW Classic Simulators","url":"http://localhost:4000/about/"}</script>
 <!-- End Jekyll SEO tag -->
 
-    <link rel="stylesheet" href="/assets/css/style.css?v=965a7eb30431dcb23c3c8c4dd0a2e96c6ea191ae">
+    <link rel="stylesheet" href="/assets/css/style.css?v=44173b1c201eb21c62893b8a9864fbb2a859ddc9">
     <!-- start custom head snippets, customize with your own _includes/head-custom.html file -->
 
 <!-- Setup Google Analytics -->

diff --git a/_site/assets/scss/index.css b/_site/assets/scss/index.css
@@ -2840,12 +2840,13 @@ body.ready { opacity: 1; }
 main { z-index: 1; pointer-events: none; }
 
 @use "sass:map";
-.expansion-panels { position: absolute; width: 100%; height: 100%; display: flex; z-index: 0; }
+.expansion-panels { position: absolute; width: 100%; height: 100%; display: flex; z-index: 0; overflow: hidden; }
 .expansion-panels .expansion-panel { --expansion-color: #e0a335; position: relative; flex: 1; color: var(--expansion-color); }
 .expansion-panels .expansion-panel:not(:last-child) { border-right: 0.5px solid dimgrey; }
 .expansion-panels .expansion-panel:hover .expansion-panel-link { box-shadow: inset 0 0 4rem var(--expansion-color); }
 .expansion-panels .expansion-panel.expansion-panel-sod { --expansion-color: #e0a335; }
 .expansion-panels .expansion-panel.expansion-panel-sod:hover .expansion-panel-img { filter: brightness(35%); }
+.expansion-panels .expansion-panel.expansion-panel-sod .homepage-panel-block { text-shadow: 0 0 1rem #7FCBD8; }
 .expansion-panels .expansion-panel.expansion-panel-sod .expansion-panel-img { filter: brightness(20%); }
 .expansion-panels .expansion-panel.expansion-panel-sod .expansion-panel-block { background: #161005; }
 .expansion-panels .expansion-panel.expansion-panel-tbc { --expansion-color: #a3e268; }

diff --git a/assets/scss/_homepage.scss b/assets/scss/_homepage.scss
@@ -6,6 +6,7 @@
   height: 100%;
   display: flex;
   z-index: 0;
+  overflow: hidden;
 
   .expansion-panel {
     --expansion-color: #{$brand-color};
@@ -32,6 +33,10 @@
           filter: brightness(35%);
         }
       }
+
+      .homepage-panel-block {
+        text-shadow: 0 0 1rem $wrath-blue;
+      }
 
       .expansion-panel-img {
         filter: brightness(20%);