Skip to content

Commit

Permalink
[CHUX-524] Align the full screen content container (#1968)
Browse files Browse the repository at this point in the history
* [CHUX-524] add styles needed

* [CHUX-524] remove p max width in story to make container width more noticeable

* [CHUX-524] fix previous stories

* [CHUX-524] update visual snapshots

* 2.8.7

* [CHUX-524] move main container width var to the component
  • Loading branch information
raulwwq0 committed Jun 3, 2024
1 parent adf90f0 commit 39d4f3a
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 9 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ebury/chameleon-components",
"version": "2.8.6",
"version": "2.8.7",
"main": "src/main.ts",
"sideEffects": false,
"author": "Ebury Team (http://labs.ebury.rocks/)",
Expand Down
8 changes: 4 additions & 4 deletions src/components/ec-container/ec-container.story.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const Template: StoryFn<typeof EcContainer> = args => ({
<div class="tw-bg-key-2 tw-text-gray-8 tw-min-h-screen">Navigation panel</div>
</template>
<template #content>
<div class="tw-bg-key-6 tw-text-gray-2 tw-min-h-screen">Main content panel</div>
<div class="tw-bg-key-6 tw-text-gray-2 tw-min-h-screen tw-w-screen">Main content panel</div>
</template>
</ec-container>
`,
Expand Down Expand Up @@ -161,8 +161,8 @@ export const withNavigation: ContainerWithNavigationStory = ({
</template>
<template #content>
<ec-main-container>
<p class="tw-mb-16">Lorem ipsum dolor sit amet, consectetur <a href="//google.co.uk">adipiscing</a> elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Suspendisse interdum consectetur libero id faucibus nisl tincidunt. Proin nibh nisl condimentum id venenatis a. Pellentesque habitant morbi tristique senectus et netus et. Sapien eget mi proin sed. Dui faucibus in ornare quam. Ut ornare lectus sit amet est. Sed enim ut sem viverra aliquet eget sit. Dui sapien eget mi proin. Nunc aliquet bibendum enim facilisis gravida.</p>
<p>Sem integer vitae justo eget magna. Neque convallis a cras semper auctor. Velit euismod in pellentesque massa placerat duis ultricies. Tincidunt dui ut ornare lectus sit amet est. Nunc sed id semper risus in. Senectus et netus et malesuada fames ac turpis egestas maecenas. Turpis nunc eget lorem dolor sed viverra. Leo integer malesuada nunc vel risus commodo. Tellus at urna condimentum mattis pellentesque id nibh tortor id. Ullamcorper eget nulla facilisi etiam dignissim diam quis enim lobortis. Facilisi morbi tempus iaculis urna id volutpat lacus laoreet. Tempus egestas sed sed risus pretium quam vulputate dignissim.</p>
<p class="tw-mb-16 tw-min-w-full">Lorem ipsum dolor sit amet, consectetur <a href="//google.co.uk">adipiscing</a> elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Suspendisse interdum consectetur libero id faucibus nisl tincidunt. Proin nibh nisl condimentum id venenatis a. Pellentesque habitant morbi tristique senectus et netus et. Sapien eget mi proin sed. Dui faucibus in ornare quam. Ut ornare lectus sit amet est. Sed enim ut sem viverra aliquet eget sit. Dui sapien eget mi proin. Nunc aliquet bibendum enim facilisis gravida.</p>
<p class="tw-min-w-full">Sem integer vitae justo eget magna. Neque convallis a cras semper auctor. Velit euismod in pellentesque massa placerat duis ultricies. Tincidunt dui ut ornare lectus sit amet est. Nunc sed id semper risus in. Senectus et netus et malesuada fames ac turpis egestas maecenas. Turpis nunc eget lorem dolor sed viverra. Leo integer malesuada nunc vel risus commodo. Tellus at urna condimentum mattis pellentesque id nibh tortor id. Ullamcorper eget nulla facilisi etiam dignissim diam quis enim lobortis. Facilisi morbi tempus iaculis urna id volutpat lacus laoreet. Tempus egestas sed sed risus pretium quam vulputate dignissim.</p>
</ec-main-container>
</template>
</ec-container>
Expand Down Expand Up @@ -222,7 +222,7 @@ export const withResponsiveLayout: StoryFn<typeof EcContainer> = args => ({
<div class="tw-bg-key-2 tw-text-gray-8 tw-min-h-48">Navigation panel</div>
</template>
<template #content>
<div class="tw-bg-key-6 tw-text-gray-2 tw-min-h-screen">Main content panel</div>
<div class="tw-bg-key-6 tw-text-gray-2 tw-min-h-screen tw-w-screen">Main content panel</div>
</template>
</ec-container>
`,
Expand Down
2 changes: 1 addition & 1 deletion src/components/ec-container/ec-container.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ defineProps<ContainerProps>();
}
&__content {
@apply tw-flex-1;
@apply tw-flex tw-flex-1 tw-justify-center;
@apply tw-min-w-0;
}
}
Expand Down
9 changes: 8 additions & 1 deletion src/components/ec-main-container/ec-main-container.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,16 @@ function hasSlot(slotName: string) {
</script>

<style>
:root,
:host {
--ec-main-container-max-width: 1200px;
}
.ec-main-container {
@apply tw-p-24;
@apply tw-min-h-full;
@apply tw-min-h-full tw-w-full;
max-width: var(--ec-main-container-max-width);
&__title {
@apply tw-h2;
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 39d4f3a

Please sign in to comment.