Merge branch 'release' into develop

website/client/src/components/creatorIntro.vue

@@ -121,7 +121,7 @@
             v-if="editing"
             class="menu-container col-2"
             :class="{active: activeTopPage === 'backgrounds'}"
-            @click="changeTopPage('backgrounds', '2019')"
+            @click="changeTopPage('backgrounds', '2020')"
           >
             <div class="menu-item">
               <div
@@ -1160,7 +1160,7 @@ export default {
         },
       ],
 
-      bgSubMenuItems: ['2019', '2018', '2017', '2016', '2015', '2014'].map(y => ({
+      bgSubMenuItems: ['2020', '2019', '2018', '2017', '2016', '2015', '2014'].map(y => ({
         id: y,
         label: y,
       })),
@@ -1183,6 +1183,7 @@ export default {
         2017: [],
         2018: [],
         2019: [],
+        2020: [],
       };
 
       // Hack to force update for now until we restructure the data

website/client/src/components/payments/sendGemsModal.vue

@@ -76,7 +76,7 @@
         </h3>
         <div class="panel-body">
           <div class="row">
-            <div class="col-md-4">
+            <div class="col-md-12">
               <div class="form-group">
                 <!-- eslint-disable vue/no-use-v-if-with-v-for -->
                 <div
@@ -98,11 +98,6 @@
                 </div>
               </div>
             </div>
-            <div class="col-md-8">
-              <h4 v-once> {{ $t('winterPromoGiftHeader') }} </h4>
-              <p v-once> {{ $t('winterPromoGiftDetails1') }} </p>
-              <p v-once> {{ $t('winterPromoGiftDetails2') }} </p>
-            </div>
           </div>
         </div>
       </div>

website/client/src/components/settings/subscription.vue

@@ -251,11 +251,6 @@
           {{ $t('giftSubscriptionText4') }}
         </h4>
       </div>
-      <div class="col-6">
-        <h2 v-once> {{ $t('winterPromoGiftHeader') }} </h2>
-        <p v-once> {{ $t('winterPromoGiftDetails1') }} </p>
-        <p v-once> {{ $t('winterPromoGiftDetails2') }} </p>
-      </div>
     </div>
   </div>
 </template>

website/client/src/components/snackbars/notifications.vue

@@ -20,10 +20,6 @@
     z-index: 1400; // 1400 is above modal backgrounds
 
     &-top-pos {
-      &-double {
-        top: 145px;
-      }
-
       &-normal {
         top: 65px;
       }
@@ -38,7 +34,6 @@
 <script>
 import { mapState } from '@/libs/store';
 import notification from './notification';
-import { CONSTANTS, getLocalSetting } from '@/libs/userlocalManager';
 
 export default {
   components: {
@@ -52,9 +47,7 @@ export default {
     notificationsTopPos () {
       const base = 'notifications-top-pos-';
       let modifier = '';
-      if (this.userSleeping && this.giftingShown) {
-        modifier = 'double';
-      } else if (this.userSleeping || this.giftingShown) {
+      if (this.userSleeping) {
         modifier = 'sleeping';
       } else {
         modifier = 'normal';
@@ -62,10 +55,5 @@ export default {
       return `${base}${modifier}`;
     },
   },
-  data () {
-    return {
-      giftingShown: getLocalSetting(CONSTANTS.keyConstants.GIFTING_BANNER_DISPLAY) !== 'dismissed',
-    };
-  },
 };
 </script>