From 532613cf08408df567c022e23a12aa04cf513bcb Mon Sep 17 00:00:00 2001
From: Sara Boutej <40363501+SaraBoutej@users.noreply.github.com>
Date: Mon, 16 Oct 2023 16:20:47 +0100
Subject: [PATCH] feat: Apply border-radius to apps (Apps) - MEED-2681 -
 Meeds-io/MIPs#81 (#282)

This change adds the new brandable border radius to the app admin application

(cherry picked from commit 41abeef8e2a871945e5bab9ac07dc8c14211bf0b)
(cherry picked from commit 9f4e37953184a6a3c41c222596027c65e14f043b)
---
 .../src/main/webapp/skin/less/app-center.less              | 7 -------
 .../webapp/vue-apps/adminSetup/components/AdminSetup.vue   | 5 +++--
 .../webapp/vue-apps/userSetup/components/UserSetup.vue     | 4 ++--
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app-center-webapps/src/main/webapp/skin/less/app-center.less b/app-center-webapps/src/main/webapp/skin/less/app-center.less
index 71f08d42b..877697b96 100644
--- a/app-center-webapps/src/main/webapp/skin/less/app-center.less
+++ b/app-center-webapps/src/main/webapp/skin/less/app-center.less
@@ -18,11 +18,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 /* This file contains CSS for admin setup portlet */
 .applicationsAdmin {
-  background: @baseBackgroundDefault !important;
-  border-radius: 6px;
-  box-shadow: 0 2px 9px 0 rgba(0, 0, 0, 0.02);
-  display: block;
-
   .uiTabNormal.uiTabInPage {
     .appAdminTabs {
       .v-item-group {
@@ -426,7 +421,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     width: 100%;
   }
   .authorizedApplicationsContainer {
-    border-radius: 4px;
     background: @baseBackgroundDefault;
     margin-right: 14px ~'; /** orientation=lt */ ';
     margin-left: 14px ~'; /** orientation=rt */ ';
@@ -592,7 +586,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   }
 }
 .userFavoriteApplicationsContainer {
-  border-radius: 4px;
   background: @baseBackgroundDefault;
   
   .userFavoriteApplications {
diff --git a/app-center-webapps/src/main/webapp/vue-apps/adminSetup/components/AdminSetup.vue b/app-center-webapps/src/main/webapp/vue-apps/adminSetup/components/AdminSetup.vue
index 909b05c1b..7e5f161fd 100644
--- a/app-center-webapps/src/main/webapp/vue-apps/adminSetup/components/AdminSetup.vue
+++ b/app-center-webapps/src/main/webapp/vue-apps/adminSetup/components/AdminSetup.vue
@@ -23,7 +23,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <v-flex>
           <v-tabs
             v-model="selectedTab"
-            slider-size="4">
+            slider-size="4"
+            class="card-border-radius">
             <v-tab
               key="applications"
               href="#applications"
@@ -35,7 +36,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </v-tab>
           </v-tabs>
 
-          <v-tabs-items v-model="selectedTab" class="mt-2">
+          <v-tabs-items v-model="selectedTab" class="mt-2 card-border-radius">
             <v-tab-item
               id="applications"
               value="applications"
diff --git a/app-center-webapps/src/main/webapp/vue-apps/userSetup/components/UserSetup.vue b/app-center-webapps/src/main/webapp/vue-apps/userSetup/components/UserSetup.vue
index 50f42475c..9883d473f 100644
--- a/app-center-webapps/src/main/webapp/vue-apps/userSetup/components/UserSetup.vue
+++ b/app-center-webapps/src/main/webapp/vue-apps/userSetup/components/UserSetup.vue
@@ -17,10 +17,10 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 <template>
   <div class="userApplications">
     <v-row dense>
-      <v-col class="authorizedApplicationsContainer">
+      <v-col class="authorizedApplicationsContainer card-border-radius">
         <user-authorizedApplications :can-add-favorite="canAddFavorite" :default-app-image="defaultAppImage" />
       </v-col>
-      <v-col class="userFavoriteApplicationsContainer" sm="3">
+      <v-col class="userFavoriteApplicationsContainer card-border-radius" sm="3">
         <user-favoriteApplications :default-app-image="defaultAppImage" @canAddFavorite="setCanAddFavorite" />
       </v-col>      
     </v-row>