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

Scotty sszoverview - layout improvements #46

Merged
merged 6 commits into from
Apr 20, 2021
Merged

Scotty sszoverview - layout improvements #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
03fb02b
fixed responsiveness to xs screen for specs page
ScottyPoi Apr 20, 2021
f826f9a
improve merkle-proofs responsiveness
ScottyPoi Apr 20, 2021
75f8d83
improve specs page responsive layout
ScottyPoi Apr 20, 2021
01c7034
improve overview pages responsive layout
ScottyPoi Apr 20, 2021
5030a11
improve implementations pages layout responsiveness
ScottyPoi Apr 20, 2021
b5c1c2f
correct documentation link
ScottyPoi Apr 20, 2021
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
10 changes: 4 additions & 6 deletions components/layout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const contentStyle = {
export default function Layout({ children }) {
console.log('fuck everything')
return (
<div className='d-flex container fluid'>
<div className='container'>
<Head>
<meta charSet="utf-8" />
</Head>
Expand All @@ -49,18 +49,16 @@ export default function Layout({ children }) {
</div>
</div>
</div>
<div className="container-fluid Content" style={contentStyle}>
<div className="container">
<div className='d-flex row justify-content-between position-relative d-none d-sm-block'>
<div className='col-2 justify-content-start position-fixed top-10 start-0 '>
<nav className="nav align-items-stretch">
<NavBar { ...MainPage.args } />
</nav>
</div>
{/* <div className='col-8'></div> */}
<div className='col-2 position-fixed top-10 end-0'><OnThisPage></OnThisPage></div>
</div>
<div className='row position-static justify-content-around'>
<div className='col-10'>{children}</div>
<div className='d-flex row position-static justify-content-xs-start justify-content-sm-around'>
<div className='col-12 col-sm-10'>{children}</div>

</div>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-JEW9xMcG8R+pH31jmWH6WWP0WintQrMb4s7ZOdauHnUtxwoG2vI5DkLtS3qm9Ekf" crossOrigin="anonymous"></script>
Expand Down
2 changes: 1 addition & 1 deletion data/site-pages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
},
{
"name": "Documentation",
"url": "/specs",
"url": "/documentation",
"title": "Documentation",
"pages": [
{
Expand Down
1 change: 1 addition & 0 deletions overview/overview.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ title: Overview
section: Overview
toc: []
---
<div align='center'>

# SSZ Overview

Expand Down
4 changes: 2 additions & 2 deletions pages/implementations/[id].jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ export default function ImplementationsPage({ implementationsPageData }) {
{implementationsPageData.title}
{implementationsPageData.id}
</Head>
<div className='d-flex row justify-content-start'>
<div className='d-flex col-9'>
<div className='d-flex row justify-content-center'>
<div className='d-flex col-12'>
<div dangerouslySetInnerHTML={{ __html: implementationsPageData.contentHtml}} />
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions pages/merkle-proofs.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ export default function Specs({ MerkleProofsData }) {
return (
<div className='row '>
<div className='col'>
<div className='row'>
<div className='col-8'>
<div className='row justify-content-center'>
<div className='col-12 col-sm-10'>
<div className='row'>
<h1>Merkle Proofs</h1>
<div><p>from Ethereum 2.0</p></div>
Expand All @@ -62,7 +62,7 @@ export default function Specs({ MerkleProofsData }) {
</div>

<div className={`row justify-content-end fixed-top overflow-y-scroll ${styles.toc}`}>
<div className={`col-4 position-fixed ${styles.scroll}`}>
<div className={`col-3 d-none d-sm-block position-fixed ${styles.scroll}`}>
{scrollspy}
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions pages/overview/[id].jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ export default function OverviewPage({ overviewPageData }) {

return (
<div className='container'>
<div className='row'>
<div className='col-8' dangerouslySetInnerHTML={{ __html: overviewPageData.contentHtml}} />
<div className='row justify-content-center'>
<div className='col-12 col-sm-10' dangerouslySetInnerHTML={{ __html: overviewPageData.contentHtml}} />
</div>
<div className='row justify-content-between'>
<div className='col-2'>
Expand All @@ -43,7 +43,7 @@ export default function OverviewPage({ overviewPageData }) {
</div>
</div>
<div className='d-flex row justify-content-end position-fixed fixed-top'>
<div className='col-4'>
<div className='col-2'>
<br /><br /><br /><br />
<div className='row d-none d-sm-block'>
<PageTOC { ...Sections.args } />
Expand Down
6 changes: 3 additions & 3 deletions pages/specs.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ export default function Specs({ SpecsData }) {
return (
<div className='row '>
<div className='col'>
<div className='row'>
<div className='col-8'>
<div className='row justify-content-center'>
<div className='col-12 col-sm-10'>
<div className='row'>
<h1>Simple Serialize Specs</h1>
<div><p>from Ethereum 2.0</p></div>
Expand All @@ -62,7 +62,7 @@ export default function Specs({ SpecsData }) {
</div>

<div className={`row justify-content-end fixed-top overflow-y-scroll ${styles.toc}`}>
<div className={`col-4 position-fixed ${styles.scroll}`}>
<div className={`col-3 d-none d-sm-block position-fixed ${styles.scroll}`}>
{scrollspy}
</div>
</div>
Expand Down