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

fix: login screens jarring #1446

Merged
merged 2 commits into from
Jun 14, 2022
Merged

fix: login screens jarring #1446

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
04a4348
fix: use flexbox to position footer
drewdelano Jun 10, 2022
647e6ba
fix: add callback to the product routes
drewdelano Jun 10, 2022
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
2 changes: 1 addition & 1 deletion packages/website/pages/_app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import Footer from '../components/footer/footer.js';
*/
const App = ({ Component, pageProps }) => {
const { pathname } = useRouter();
const productRoutes = ['/login', '/account', '/tokens'];
const productRoutes = ['/login', '/account', '/tokens', '/callback'];
// const marketingRoutes = ['/', '/pricing', '/about', '/faq', '/terms'];
const productApp = productRoutes.includes(pathname);
const pageClass = pathname.includes('docs') ? 'docs-site' : productApp ? 'product-app' : 'marketing-site';
Expand Down
3 changes: 3 additions & 0 deletions packages/website/styles/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ body:not(.docs-site) #__next {
#master-container {
position: relative;
&.product-app {
min-height: 100vh;
display: flex;
flex-flow: column nowrap;
background-color: $ebony;
@include background_Dark;
}
Expand Down
4 changes: 4 additions & 0 deletions packages/website/styles/layouts/pageContainer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
@include fontSize_Medium;
@include fontWeight_Regular;

.product-app & {
flex: 1 1 auto;
}

h3 {
font-size: $fontSize_MediumExtraLarge;
}
Expand Down