WIP(announcement): correct layout and close X

website/client/src/components/header/banners/base.vue

@@ -8,7 +8,7 @@
     <slot name="content"></slot>
     <close-x
       v-if="canClose"
-      @click="close()"
+      @close="close()"
     />
   </div>
 </template>
@@ -27,10 +27,6 @@ body.modal-open .habitica-top-banner {
   padding-left: 1.5rem;
   padding-right: 1.625rem;
   z-index: 1300;
-
-  .modal-close {
-    position: inherit;
-  }
 }
 </style>
 
@@ -105,8 +101,6 @@ export default {
     close () {
       hideBanner(this.bannerId);
       this.hidden = true;
-
-      this.$root.$emit(EVENTS.BANNER_HIDDEN, this.bannerId);
     },
   },
 };

website/client/src/components/header/banners/chatBanner.vue

@@ -30,6 +30,10 @@
     a {
       color: $orange-1;
       text-decoration: underline;
+
+      &:hover {
+        color: $orange-1;
+      }
     }
 
     &.faq {
@@ -52,8 +56,9 @@ export default {
       return (this.$route.fullPath.indexOf('/faq')) !== -1;
     },
     showChatWarning () {
-      if (this.$route.fullPath.indexOf('/tavern') !== -1) return true;
       if (this.$route.fullPath.indexOf('/groups') !== -1) return true;
+      if (this.$route.fullPath.indexOf('/tavern-and-guilds') !== -1) return false;
+      if (this.$route.fullPath.indexOf('/tavern') !== -1) return true;
       return this.faqPage;
     },
   },

website/client/src/components/header/banners/damagePaused.vue

@@ -2,6 +2,7 @@
   <base-banner
     banner-id="damage-paused"
     banner-class="resting-banner"
+    :can-close="false"
     :show="showRestingBanner"
     height="40px"
   >