Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Portlet UI Cleanup Meeds-io/MIPs#81 #443

Merged
merged 2 commits into from
Nov 14, 2023
Merged

Merge Portlet UI Cleanup Meeds-io/MIPs#81 #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12bff26
feat: Apply border-radius to apps (Wallet) - MEED-2680 - Meeds-io/MI…
SaraBoutej Oct 23, 2023
e0cda8d
feat: No access to items that are overflow - MEED-2728-Meeds-io/MIP#8…
SaraBoutej Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions wallet-webapps/src/main/webapp/vue-app/wallet-admin/components/admin/WalletAdminApp.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<v-app class="mb-4 application-toolbar">
<v-tabs
v-model="selectedTab"
slider-size="4">
slider-size="4"
class="card-border-radius overflow-hidden">
<v-tab
key="wallets"
href="#wallets">
Expand All @@ -37,7 +38,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
{{ $t('exoplatform.wallet.title.initialFundsTab') }}
</v-tab>
</v-tabs>
<v-tabs-items v-model="selectedTab" class="tabs-content">
<v-tabs-items v-model="selectedTab" class="tabs-content card-border-radius">
<v-tab-item
id="wallets"
value="wallets"
Expand Down
3 changes: 2 additions & 1 deletion ...s/src/main/webapp/vue-app/wallet-admin/components/admin/wallets/WalletAdminWalletsTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
:headers="walletTableHeaders"
:items="displayedWallets"
:items-per-page="limit"
:loading="loadingWallets">
:loading="loadingWallets"
class="transparent">
<template slot="item" slot-scope="props">
<transition name="fade">
<tr v-show="wallets">
Expand Down
5 changes: 3 additions & 2 deletions wallet-webapps/src/main/webapp/vue-app/wallet-app/components/WalletApp.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<v-app class="mb-4 application-toolbar">
<v-tabs
v-model="tab"
slider-size="4">
slider-size="4"
class="card-border-radius overflow-hidden">
<v-tab>{{ tabName }}</v-tab>
</v-tabs>
<v-tabs-items v-model="tab" class="tabs-content">
<v-tabs-items v-model="tab" class="tabs-content card-border-radius overflow-hidden">
<v-tab-item eager>
<v-flex>
<v-layout
Expand Down
4 changes: 2 additions & 2 deletions ...bapps/src/main/webapp/vue-app/wallet-common/wallet-settings/components/WalletSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<v-app>
<v-app class="card-border-radius overflow-hidden">
<wallet-settings-details
v-if="displayDetails"
:wallet-settings="walletSettings"
Expand All @@ -11,7 +11,7 @@
<v-card
v-else-if="displayed"
:class="walletSettingsClass"
class="border-radius"
class="card-border-radius"
flat>
<v-list>
<v-list-item>
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/webapp/vue-app/wallet-common/wallet-settings/components/WalletSettingsDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<v-card
v-if="displayed"
class="walletSetting"
class="walletSetting card-border-radius"
flat>
<template v-if="!hideContent">
<v-card-title class="px-0 pt-2">
Expand Down
3 changes: 2 additions & 1 deletion wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

<v-tabs
v-model="selectedTab"
class="card-border-radius overflow-hidden"
slider-size="4">
<v-tab key="SendRewards" href="#SendRewards">
{{ $t('exoplatform.wallet.title.sendRewardsTab') }}
Expand All @@ -84,7 +85,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</v-tab>
</v-tabs>

<v-tabs-items v-model="selectedTab" class="tabs-content">
<v-tabs-items v-model="selectedTab" class="tabs-content card-border-radius overflow-hidden">
<v-tab-item
id="SendRewards"
value="SendRewards"
Expand Down