Merge Styling Portlets Framework - Meeds-io/MIPs#144 (#335)

Meeds-io · Jul 5, 2024 · 92acc97 · 92acc97
2 parents a25b931 + 2a30316
commit 92acc97
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/perk-store-webapps/src/main/webapp/WEB-INF/portlet.xml b/perk-store-webapps/src/main/webapp/WEB-INF/portlet.xml
@@ -77,6 +77,10 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       <name>preload.resource.bundles</name>
       <value>locale.addon.PerkStore</value>
     </init-param>
+    <init-param>
+      <name>layout-css-class</name>
+      <value>no-layout-style</value>
+    </init-param>
     <expiration-cache>-1</expiration-cache>
     <cache-scope>PUBLIC</cache-scope>
     <supports>

diff --git a/perk-store-webapps/src/main/webapp/vue-app/components/PerkStoreApp.vue b/perk-store-webapps/src/main/webapp/vue-app/components/PerkStoreApp.vue
@@ -20,7 +20,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     class="transparent singlePageApplication"
     flat>
     <wallet-notification-alert />
-    <main v-if="loading">
+    <main v-if="loading" class="application-body">
       <v-toolbar color="transparent" flat>
         <v-spacer />
         <v-progress-circular
@@ -30,18 +30,18 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <v-spacer />
       </v-toolbar>
     </main>
-    <main v-else>
+    <main v-else class="application-body">
       <template>
         <div class="application-toolbar">
           <v-tabs
             v-model="tab"
             slider-size="4"
-            class="card-border-radius overflow-hidden">
+            class="application-body">
             <v-tab @click="refreshProductList">{{ $t('exoplatform.perkstore.label.Catalogue') }}</v-tab>
             <v-tab @click="displayMyOrdersList">{{ $t('exoplatform.perkstore.label.MyOrders') }}</v-tab>
           </v-tabs>
           <v-tabs-items v-model="tab" class="tabs-content card-border-radius">
-            <v-tab-item class="product-list pa-4 card-border-radius overflow-hidden" eager>
+            <v-tab-item class="product-list pa-4 application-body" eager>
               <perk-store-toolbar 
                 :can-add-product="userSettings.canAddProduct"
                 :symbol="symbol"
@@ -53,14 +53,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 @create-product="newProduct"
                 @filter-changed="filterProduct = $event"
                 @keyword-changed="search = $event" />
-              <perk-store-no-result
-                v-if="perkStoreEnabled && !walletLoading && walletWarning"
-                :info="$t('exoplatform.perkstore.info.welcomeToPerkstore')"
-                :click-condition="true"
-                icon="fas fa-wallet"
-                info-message="gamification.overview.rewardsPerkstoreSummary" 
-                class="mt-5"
-                @no-result-event="redirectToWallet()" />
               <v-toolbar
                 v-if="error"
                 color="transparent"

diff --git a/...store-webapps/src/main/webapp/vue-app/perk-store-admin/components/PerkStoreAdminSetup.vue b/...store-webapps/src/main/webapp/vue-app/perk-store-admin/components/PerkStoreAdminSetup.vue
@@ -22,10 +22,10 @@
 <template>
   <v-app flat>
     <div class="px-6">
-      <v-list-item class="px-0" two-line>
+      <v-list-item class="px-0" two-line dense>
         <v-list-item-content>
-          <v-list-item-title>
-            <h4 class="my-0">{{ $t('perkstore.administration.title') }}</h4>
+          <v-list-item-title class="text-title">
+            {{ $t('perkstore.administration.title') }}
           </v-list-item-title>
           <v-list-item-subtitle>
             {{ $t('perkstore.administration.subtitle') }}