🔧 conflicts

.github/PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE.md

@@ -37,9 +37,4 @@
 
 ## Screenshot 📸
 
-- [ ] My fix has changed **something** on UI; a screenshot is best to understand changes for others.
-
-## Copilot Summary
-copilot:summary
-
-copilot:poem
+- [ ] My fix has changed **something** on UI; a screenshot is best to understand changes for others.

.github/PULL_REQUEST_TEMPLATE/QUICK_AND_DESIGN_PULL_REQUEST_TEMPLATE.md

@@ -24,8 +24,3 @@
 ## Screenshot 📸
 
 - [ ] My fix has changed UI
-
-## Copilot Summary
-copilot:summary
-
-copilot:poem

.github/PULL_REQUEST_TEMPLATE/QUICK_AND_QA_PULL_REQUEST_TEMPLATE.md

@@ -23,9 +23,4 @@
 
 ## Screenshot 📸
 
-- [ ] My fix has changed UI
-
-## Copilot Summary
-copilot:summary
-
-copilot:poem
+- [ ] My fix has changed UI

.github/PULL_REQUEST_TEMPLATE/QUICK_PULL_REQUEST_TEMPLATE.md

@@ -17,7 +17,3 @@
 
 - [ ] My DOT address: [Payout](https://canary.kodadot.xyz/dot/transfer/?target=<My_Polkadot_Address_check_https://github.com/kodadot/nft-gallery/blob/main/REWARDS.md#creating-your-dot-address>)
 
-## Copilot Summary
-copilot:summary
-
-copilot:poem

.github/push_release_beta.sh

@@ -2,4 +2,4 @@
 # experimental 
 # https://github.com/kodadot/nft-gallery/issues/5770 
 
-gh pr list -s merged --json url -B main --jq ".[] | .url" | sed 's/^/- /' $1 | awk 'BEGIN{print "copilot:summary \n"}{ print}' $1 | gh pr create -t "beta update" -d -H main -B beta -l beta --body-file -
+gh pr list -s merged --json url -B main --jq ".[] | .url" | sed 's/^/- /' $1 | awk 'BEGIN{print "Beta Update \n"}{ print}' $1 | gh pr create -t "beta update" -d -H main -B beta -l beta --body-file -

.github/push_release_old-prod.sh

@@ -2,4 +2,4 @@
 # experimental 
 # https://github.com/kodadot/nft-gallery/issues/5770 
 
-gh pr list -s merged --json url -B main --jq ".[] | .url" | sed 's/^/- /' $1 | awk 'BEGIN{print "copilot:summary \n"}{ print}' $1 | gh pr create -t "release update" -d -H beta -B production -l release --body-file -
+gh pr list -s merged --json url -B main --jq ".[] | .url" | sed 's/^/- /' $1 | gh pr create -t "release update" -d -H beta -B production -l release --body-file -

.github/push_release_production.sh

@@ -2,4 +2,4 @@
 # experimental 
 # https://github.com/kodadot/nft-gallery/issues/5770 
 
-gh pr list -s merged --json url -B main --jq ".[] | .url" | sed 's/^/- /' $1 | awk 'BEGIN{print "copilot:summary \n"}{ print}' $1 | gh pr create -t "release update" -d -H beta -B production -l release --body-file -
+gh pr list -s merged --json url -B main --jq ".[] | .url" | sed 's/^/- /' $1 | awk 'BEGIN{print "Release Update \n"}{ print}' $1 | gh pr create -t "release update" -d -H beta -B production -l release --body-file -

ACTIVITY.md

@@ -87,7 +87,7 @@ Repotrends - new issues and pull requests
 --
 - [repotrends.com/kodadot/nft-gallery](https://www.repotrends.com/kodadot/nft-gallery)
 
-![image](https://github.com/kodadot/nft-gallery/assets/5887929/49ce2716-c207-4b8a-a58c-1317fb62ec5b)
+![image](https://github.com/kodadot/nft-gallery/assets/5887929/0a5efda6-3093-4a07-9aaa-eadc9439f4af)
 
 
 Recent Contributors ✨

assets/styles/abstracts/_animations.scss

@@ -105,7 +105,8 @@
   animation: dots 1.5s infinite;
 }
 
-@mixin shineEffect($shineColor, $shineHover) {
+@mixin shineEffect($shineColor, $shineHover, $overChild: true) {
+  position: relative;
   overflow: hidden;
 
   &::before,
@@ -117,7 +118,7 @@
     background-color: $shineColor;
     transform: skewX(-30deg);
     transition: background-color 0.3s;
-    z-index: 0;
+    z-index: 1;
   }
 
   &::before {
@@ -138,6 +139,12 @@
       background-color: $shineHover
     }
   }
+
+  @if not $overChild {
+    > :first-child {
+      z-index: 2;
+    }
+  }
 }
 
 @keyframes shine1 {

assets/styles/abstracts/_theme.scss

@@ -22,7 +22,7 @@ $themes: (
     'k-redaccent2': #ffe6e6,
     'k-grey': #999999,
     'k-grey-fix': #999999,
-    'k-grey-light': #ECECEC,
+    'k-grey-light': #f5f5f5,
     'k-pink': #ffb6ef,
     'k-yellow': #feffb6,
     'warning-yellow': #fffbcc,
@@ -72,7 +72,7 @@ $themes: (
     'k-redaccent2': #390b0b,
     'k-grey': #cccccc,
     'k-grey-fix': #999999,
-    'k-grey-light': #ECECEC,
+    'k-grey-light': #1f1f1f,
     'k-pink': #7a2a68,
     'k-yellow': #363234,
     'warning-yellow': #3f3500,

assets/styles/components/_content-markdown.scss

@@ -4,4 +4,7 @@
   code {
     font-family: monospace;
   }
+  a {
+    color: var(--k-blue) !important;
+  }
 }

assets/styles/global.scss

@@ -342,6 +342,12 @@ a.has-text-grey {
   }
 }
 
+.border-bottom-k-shade {
+  @include ktheme() {
+    border-bottom: 1px solid theme('k-shade');
+  }
+}
+
 .has-text-k-shade {
   @include ktheme() {
     color: theme('k-shade');
@@ -440,6 +446,9 @@ a.has-text-grey {
     background-color: theme('k-redaccent');
   }
 }
+.k-grey-light {
+  background-color: var(--k-grey-light) !important;
+}
 .theme-background-color {
   @include ktheme() {
     background-color: theme('background-color');
@@ -490,12 +499,6 @@ a.has-text-grey {
   }
 }
 
-// flex helper - makes flex items equal width
-
-.is-flex-1 {
-  flex: 1;
-}
-
 .has-z-index-1 {
   z-index: 1;
 }
@@ -544,6 +547,11 @@ a.has-text-grey {
   border-radius: 50%;
 }
 
+.is-rounded-small {
+  border-radius: 4rem;
+}
+
+
 .w-half {
   width: 50%;
 }
@@ -561,6 +569,10 @@ a.has-text-grey {
   font-size: 1.6rem;
 }
 
+.is-size-8 {
+  font-size: 0.5rem;
+}
+
 .is-max-width-fit-content {
   max-width: fit-content;
 }
@@ -572,3 +584,15 @@ a.has-text-grey {
 .has-text-inherit {
   color: inherit !important;
 }
+
+.cursor-default {
+  cursor: default;
+}
+
+.min-width-0 {
+  min-width: 0;
+}
+
+.pointer-events-none {
+  pointer-events: none !important;
+}

assets/styles/layouts/_main-navigation.scss

@@ -185,6 +185,8 @@
           height: 40px;
         }
       }
+
+      max-width: 100% !important;
     }
   }
 

components/ColorModeButton.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-    class="is-flex is-align-items-center m-0"
+    class="flex items-center m-0"
     :class="isMobileDevice ? 'navbar-item' : ''"
     @click="toggleColorMode">
     <ColorScheme placeholder="...">

components/CookieBanner.vue

@@ -1,7 +1,7 @@
 <template>
   <transition name="slide">
     <div v-if="!hasDisplayedCookieBanner" class="cookie-banner">
-      <div class="notices is-bottom is-flex w-100 is-align-items-center">
+      <div class="notices is-bottom flex items-center w-100">
         <div
           role="alertdialog"
           class="snackbar is-success is-bottom-left py-2 px-4 mb-3">

components/MessageNotify.vue

@@ -8,13 +8,12 @@
     :auto-close="autoClose"
     @close="$emit('close')">
     <img src="/congrats-message-header.svg" class="congrats-message" />
-    <div class="is-flex is-flex-direction-column">
+    <div class="flex flex-col">
       <div class="title is-3 mb-4">
         {{ title }}
       </div>
       <hr class="my-2" />
-      <div
-        class="is-flex is-align-items-center is-justify-content-space-between">
+      <div class="flex items-center justify-between">
         <span class="subtitle is-6 mb-0">
           {{ subtitle }}
         </span>
@@ -59,7 +58,7 @@ const realworldFullPath = computed(() => {
   &--toast {
     z-index: 100;
     position: fixed;
-    border-radius: 0;
+    border-radius: 0 !important;
     top: 100px;
     right: 0;
     margin-left: auto;
@@ -73,7 +72,8 @@ const realworldFullPath = computed(() => {
   }
 
   .message-body {
-    border: none;
+    border-left-width: 0;
+    border-radius: 0;
   }
 
   .congrats-message {

components/Navbar.vue

@@ -6,9 +6,7 @@
     :class="{
       'is-active': isMobileNavbarOpen,
     }">
-    <div
-      class="container is-align-items-center"
-      :class="{ 'is-fluid': !isMobile }">
+    <div class="container items-center" :class="{ 'is-fluid': !isMobile }">
       <!-- BRAND -->
       <div class="navbar-brand">
         <nuxt-link to="/" class="navbar-item logo nuxt-link-active">
@@ -17,7 +15,7 @@
             alt="First NFT market explorer on Kusama and Polkadot" />
         </nuxt-link>
         <div
-          class="is-hidden-desktop is-flex is-flex-grow-1 is-align-items-center is-justify-content-flex-end"
+          class="is-hidden-desktop flex flex-grow items-center justify-end"
           @click="closeBurgerMenu">
           <NeoButton
             v-if="isMobileNavbarOpen || showSearchOnNavbar || isTinyMobile"
@@ -26,16 +24,15 @@
             @click="showMobileSearchBar" />
 
           <div v-show="openMobileSearchBar">
-            <div
-              class="fixed-stack is-flex is-align-items-center is-justify-content-space-between p-2">
+            <div class="fixed-stack flex items-center justify-between p-2">
               <Search
                 v-if="isMobile"
                 ref="mobilSearchRef"
                 hide-filter
-                class="is-flex-grow-1" />
+                class="flex-grow" />
               <NeoButton
                 variant="text"
-                class="p-3 is-shadowless no-border is-capitalized is-clickable"
+                class="p-3 is-shadowless no-border capitalize is-clickable"
                 @click="hideMobileSearchBar">
                 {{ $t('cancel') }}
               </NeoButton>
@@ -69,12 +66,12 @@
         <div class="navbar-start">
           <div
             v-if="showSearchOnNavbar"
-            class="navbar-item is-expanded is-flex is-justify-content-center">
+            class="navbar-item is-expanded flex justify-center">
             <Search
               v-if="!isMobile"
-              class="search-navbar is-flex-grow-1 pb-0 is-hidden-touch"
+              class="search-navbar flex-grow pb-0 is-hidden-touch"
               hide-filter
-              search-column-class="is-flex-grow-1" />
+              search-column-class="flex-grow" />
           </div>
         </div>
         <!-- END NAV START -->