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.

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

24289 - style: fix flexgrid to wrap on small sized screens and smaller #71

Merged
merged 1 commit into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/components/bcros/businessDetails/Links.vue
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ const contacts = getContactInfo('registries')
</script>

<template>
<div class="flex flex-row gap-3 items-center">
<div class="flex flex-wrap gap-x-3 gap-y-1 items-center max-w-bcros">
<!-- Dissolution Confirmation Dialog -->
<BcrosDialog
attach="#businessDetails"
Expand Down Expand Up @@ -255,7 +255,7 @@ const contacts = getContactInfo('registries')
@click="showCommentDialog(true)"
>
<template #leading>
<UIcon name="i-mdi-message-reply" size="small" />
<UIcon name="i-mdi-message-text-outline" size="small" />
</template>
<span class="font-13 ml-1 text-nowrap">{{ $t('label.comments.comment', (comments?.length || 0 )) }}</span>
</UButton>
Expand Down
18 changes: 11 additions & 7 deletions src/components/bcros/businessDetails/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,13 @@ watch(() => route.params.identifier as string, loadComponentData, { immediate: t
</script>

<template>
<div id="bcros-business-details" class="bg-white h-[150px]" data-cy="business-details">
<div class="flex pt-5 text-bcGovGray-900 app-inner-container">
<div class="grow" data-cy="business-details-name">
<div
id="bcros-business-details"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the temp url, there are some extra space at the top of the tombstone. I guess it is caused by this 'pt-7'.

class="flex gap-5 bg-white w-full pt-7 px-3 justify-center"
data-cy="business-details"
>
<div class="flex flex-wrap pt-5 text-bcGovGray-900 grow max-w-bcros">
<div data-cy="business-details-name" class="grow md:w-3/4 w-full p-3">
<BcrosBusinessDetailsHeader />
<div class="pt-2">
<BcrosBusinessDetailsStatus />
Expand All @@ -105,10 +109,10 @@ watch(() => route.params.identifier as string, loadComponentData, { immediate: t
<BcrosBusinessDetailsLinks :is-staff="true" :current-business="currentBusiness" />
</div>
</div>
<div class="justify-self-end" data-cy="business-details-info">
<div class="md:w-1/4 w-full p-3" data-cy="business-details-info">
<dl class="text-sm">
<template v-for="info in businessInfo" :key="info.name">
<div v-if="info.show" class="flex gap-0 mb-1 items-center">
<div v-if="info.show" class="flex flex-wrap gap-0 mb-1 items-center">
<dt class="font-bold mr-2">
{{ info.term }}:
</dt>
Expand All @@ -117,13 +121,13 @@ watch(() => route.params.identifier as string, loadComponentData, { immediate: t
</dd>
<dd
v-else
class="flex items-center cursor-pointer"
class="items-center cursor-pointer"
:data-cy="'value-' + info.name"
@mouseover="info.showChangeButton = true"
@mouseleave="info.showChangeButton = false"
@click="goToBusinessProfilePage"
>
<span>{{ info.value }}</span>
<span class="break-normal">{{ info.value }}</span>
<UButton
v-show="info.showChangeButton"
class="ml-1 text-sm"
Expand Down
2 changes: 1 addition & 1 deletion src/components/bcros/filing/CommonTemplate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
variant="ghost"
@click.stop="isShowBody = !isShowBody"
>
<UIcon name="i-mdi-message-reply" size="small" />
<UIcon name="i-mdi-message-text-outline" size="small" />
<span>
{{ isShowBody ? $t('label.filing.detail') : $t('label.filing.detail') }}
({{ filing.commentsCount }})</span>
Expand Down
2 changes: 1 addition & 1 deletion src/components/bcros/filing/common/DetailsList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const showCommentDialog = (show: boolean) => {
<div class="flex flex-row gap-2">
<div class="mt-auto pb-4">
<strong>
<UIcon name="i-mdi-message-reply" class="my-auto" />
<UIcon name="i-mdi-message-text-outline" size="small" />
<span class="pl-1">
{{ $t('label.filing.detail') }} ({{ filing.comments?.length || 0 }})</span>
</strong>
Expand Down
5 changes: 1 addition & 4 deletions src/components/bcros/header/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
class="bg-bcGovColor-darkBlue border-b-2 border-yellow-400"
data-cy="bcros-header"
>
<div
id="bcros-main-header__container"
class="flex flex-wrap content-center h-[68px] app-inner-container"
>
<div id="bcros-main-header__container">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason for removing these classes? It seems the header lost some vertical padding.

<nav id="bcros-main-header__container__actions" class="flex flex-wrap content-center h-[50px] w-full">
<a id="bcros-main-header__container__actions__home-redirect" class="flex" @click="goToBcrosHome()">
<picture>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ defineProps({
<UDivider class="my-6" />
<template v-if="comment">
<p class="mb-2">
<UIcon name="i-mdi-message-reply" />
<UIcon name="i-mdi-message-text-outline" />
<span class="ml-1">Detail</span>
</p>
<p class="body-2 detail-body pre-line pt-4 mb-0">
Expand Down
4 changes: 2 additions & 2 deletions src/pages/errors.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const dialogToShow = computed(() => {
return x ? ErrorModalsE.UNAUTHORIZED_ACCESS_TO_ENTITY : ''
})

const defaultDialgoOptions = {
const defaultDialogOptions = {
title: '',
text: '', // content slot is used
hideClose: true,
Expand All @@ -54,7 +54,7 @@ const registriesContact = getContactInfo('registries')
<BcrosDialogCardedModal
name="UnauthorizedAccessToEntityErrorModal"
:display="showUnauthorizedAccess"
:options="defaultDialgoOptions"
:options="defaultDialogOptions"
@close="goHome()"
>
<template #header>
Expand Down
6 changes: 6 additions & 0 deletions tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ export default {
content: [],
theme: {
extend: {
maxWidth: {
bcros: '1336px'
},
width: {
bcros: '1336px'
},
colors: {
bcGovColor: {
darkBlue: '#003366'
Expand Down