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

feat: try new full width fluid Container layout #730

Merged
merged 6 commits into from Jan 3, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 2 additions & 6 deletions components/app/AppFooter.vue
Expand Up @@ -8,7 +8,7 @@ const nbSocialIcons = computed(() => (socialIcons.value ? socialIconsCount.value

<template>
<footer>
<Container padded class="footer-container">
<Container fluid padded class="footer-container">
<!-- Left -->
<a v-if="docus.footer?.credits" :href="docus.footer.credits.href" rel="noopener" target="_blank" class="left">
<Component :is="docus.footer.credits.icon" v-if="docus.footer.credits.icon" class="left-icon" />
Expand All @@ -33,13 +33,9 @@ css({
footer: {
borderTopWidth: '1px',
borderTopStyle: 'solid',
borderTopColor: '{color.gray.100}',
borderTopColor: '{borders.primary.default}',
padding: '{docus.footer.padding}',

'@dark': {
borderTopColor: '{color.gray.900}'
},

':deep(.icon)': {
width: '{space.4}',
height: '{space.4}'
Expand Down
8 changes: 2 additions & 6 deletions components/app/AppHeader.vue
Expand Up @@ -6,7 +6,7 @@ const hasDialog = computed(() => navigation.value?.length > 1)

<template>
<header :class="{ 'has-dialog': hasDialog, 'has-doc-search': hasDocSearch }">
<Container>
<Container fluid>
<div class="section left">
<AppHeaderDialog v-if="hasDialog" />
<AppHeaderLogo />
Expand Down Expand Up @@ -58,14 +58,10 @@ css({
top: 0,
zIndex: 10,
width: '100%',
borderBottom: '1px solid {color.gray.100}',
borderBottom: '1px solid {borders.primary.default}',
backgroundColor: '{backdrop.background}',
height: '{docus.header.height}',

'@dark': {
borderBottom: '1px solid {color.gray.900}',
},

'.container': {
display: 'grid',
height: '100%',
Expand Down
Expand Up @@ -55,7 +55,7 @@ onBeforeUnmount(() => {
</script>

<template>
<Container padded class="docs-page-content">
<Container fluid padded class="docs-page-content">
<!-- Aside -->
<aside
v-if="hasAside"
Expand Down Expand Up @@ -114,7 +114,8 @@ css({
'@lg': {
display: 'grid',
gap: '{space.8}',
gridTemplateColumns: 'repeat(12, minmax(0, 1fr))'
// gridTemplateColumns: 'repeat(12, minmax(0, 1fr))'
gridTemplateColumns: 'minmax(250px, 250px) minmax(320px, 1fr) minmax(250px, 250px)'
}
},
'.aside-nav': {
Expand All @@ -124,10 +125,12 @@ css({
display: 'block',
position: 'sticky',
top: '{docus.header.height}',
gridColumn: 'span 2/span 2',
// gridColumn: 'span 2/span 2',
alignSelf: 'flex-start',
height: 'calc(100vh - {docus.header.height})',
py: '{space.8}',
paddingRight: '{space.8}',
borderRight: '1px solid {borders.primary.default}',
}
},
'.page-body': {
Expand All @@ -136,19 +139,20 @@ css({
flexDirection: "column",
flex: '1 1 0%',
py: '{space.8}',
// TODO: check carefully old implementation need after changing parent gridTemplateColumns
'&.one-column': {
'@lg': {
gridColumn: 'span 12 / span 12'
// gridColumn: 'span 12 / span 12'
}
},
'&.two-column': {
'@lg': {
gridColumn: 'span 10 / span 10'
// gridColumn: 'span 10 / span 10'
}
},
'&.three-column': {
'@lg': {
gridColumn: 'span 8 / span 8'
// gridColumn: 'span 8 / span 8'
}
},
'&.with-toc': {
Expand Down Expand Up @@ -202,43 +206,47 @@ css({
position: 'sticky',
top: '{docus.header.height}',
display: 'flex',
alignItems: 'center',
mx: 'calc(0px - {space.4})',
overflow: 'auto',
borderBottom: '1px solid {borders.primary.default}',
'@sm': {
mx: 'calc(0px - {space.6})',
},
'@lg': {
gridColumn: 'span 2 / span 2',
mx: 0,
alignSelf: 'flex-start',
py: '{space.8}',
px: '{space.8}',
borderLeft: '1px solid {borders.primary.default}',
height: 'calc(100vh - {docus.header.height})',
maxHeight: 'none',
borderBottom: 'none',
},
'.toc-wrapper': {
width: '100%',
height: '100%',
backdropFilter: '{backdrop.filter}',
backgroundColor: '{backdrop.background}',
px: '{space.4}',
'@sm': {
px: '{space.6}',
},
'@lg': {
px: 0,
backgroundColor: 'transparent',
backdropFilter: 'none'
},
button: {
display: 'flex',
alignItems: 'center',
py: '{space.3}',
width: '100%',
height: '100%',
py: '{space.4}',
px: '{space.4}',
'@sm': {
px: '{space.6}',
},
'@lg': {
display: 'none'
},
'.title': {
fontSize: '{text.xs.fontSize}',
lineHeight: '{text.xs.lineHeight}',
fontSize: '{text.sm.fontSize}',
lineHeight: '{text.sm.lineHeight}',
fontWeight: '{fontWeight.semibold}',
marginRight: '{space.1}',
},
Expand All @@ -255,7 +263,16 @@ css({
display: 'none',
marginBottom: '{space.4}',
'&.opened': {
display: 'block'
display: 'block',
px: '{space.4}',
maxHeight: '50vh',
overflow: 'auto',
'@sm': {
px: '{space.6}',
},
'@lg': {
px: 0,
},
},
'@lg': {
marginTop: 0,
Expand Down
4 changes: 2 additions & 2 deletions layouts/default.vue
@@ -1,5 +1,5 @@
<template>
<DocsPageContent>
<DocsPageLayout>
<slot />
</DocsPageContent>
</DocsPageLayout>
</template>