Skip to content

Commit

Permalink
Merge pull request #337 from weni-ai/fix/advanced-settings-modal
Browse files Browse the repository at this point in the history
[FLOWS-106] Fix: advanced settings modal
  • Loading branch information
paulobernardoaf authored Oct 30, 2023
2 parents 5a67a12 + e918cad commit bf755ec
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<unnnic-button
class="account-tab__content__info__templates__buttons__button"
@click="navigateToTemplates"
type="secondary"
type="alternative"
size="small"
scheme="feedback-green"
>
Expand Down
3 changes: 2 additions & 1 deletion src/components/whatsAppCatalogs/List.vue
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,6 @@
flex-direction: column;
flex: 1;
overflow: hidden;
margin-top: $unnnic-spacing-lg;
&__header {
display: flex;
Expand Down Expand Up @@ -333,6 +332,8 @@
flex-direction: column;
flex: 1;
gap: $unnnic-spacing-md;
overflow: auto;
padding-right: $unnnic-spacing-xs;
}
&__pagination {
Expand Down
4 changes: 3 additions & 1 deletion src/views/whatsAppCatalogs/Base.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
.whatsapp-catalogs-base {
display: flex;
flex-direction: column;
height: 100%;
gap: $unnnic-spacing-lg;
height: 100vh;
overflow: hidden;
}
</style>
13 changes: 10 additions & 3 deletions src/views/whatsAppCatalogs/List.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<template>
<div class="whatsapp-catalogs">
<div v-if="$route.name === 'WhatsApp Catalogs List'">
<List />
</div>
<List v-if="$route.name === 'WhatsApp Catalogs List'" />

<router-view v-else />
</div>
</template>
Expand All @@ -17,3 +16,11 @@
},
};
</script>

<styles scoped lang="scss">
.whatsapp-catalogs {
display: flex;
overflow: hidden;
height: 100%;
}
</styles>
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ exports[`whatsapp/components/tabs/AccountTab.vue should be rendered properly 1`]
<div class="account-tab__content__info__templates__buttons__title">
Templates
</div>
<unnnicbutton-stub type="secondary" size="small" scheme="feedback-green" class="account-tab__content__info__templates__buttons__button">
<unnnic-button-next type="secondary" size="small" scheme="feedback-green" class="account-tab__content__info__templates__buttons__button">
See my templates
</unnnicbutton-stub>
</unnnic-button-next>
</div>
<div class="account-tab__content__info__templates__buttons">
<div class="account-tab__content__info__templates__buttons__title">
Expand Down

0 comments on commit bf755ec

Please sign in to comment.