Skip to content

Commit

Permalink
Fix alignment issues due to errant padding
Browse files Browse the repository at this point in the history
  • Loading branch information
Corofides committed Oct 26, 2023
1 parent b9ffa3d commit c001eb6
Show file tree
Hide file tree
Showing 14 changed files with 41 additions and 26 deletions.
12 changes: 6 additions & 6 deletions docs/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"files": {
"main.css": "/Shimmer/static/css/main.26385b54.css",
"main.js": "/Shimmer/static/js/main.ace9f61d.js",
"main.css": "/Shimmer/static/css/main.94fe4876.css",
"main.js": "/Shimmer/static/js/main.50346afb.js",
"static/js/787.f3470a97.chunk.js": "/Shimmer/static/js/787.f3470a97.chunk.js",
"index.html": "/Shimmer/index.html",
"main.26385b54.css.map": "/Shimmer/static/css/main.26385b54.css.map",
"main.ace9f61d.js.map": "/Shimmer/static/js/main.ace9f61d.js.map",
"main.94fe4876.css.map": "/Shimmer/static/css/main.94fe4876.css.map",
"main.50346afb.js.map": "/Shimmer/static/js/main.50346afb.js.map",
"787.f3470a97.chunk.js.map": "/Shimmer/static/js/787.f3470a97.chunk.js.map"
},
"entrypoints": [
"static/css/main.26385b54.css",
"static/js/main.ace9f61d.js"
"static/css/main.94fe4876.css",
"static/js/main.50346afb.js"
]
}
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/Shimmer/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/Shimmer/logo192.png"/><link rel="manifest" href="/Shimmer/manifest.json"/><title>React App</title><script defer="defer" src="/Shimmer/static/js/main.ace9f61d.js"></script><link href="/Shimmer/static/css/main.26385b54.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/Shimmer/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/Shimmer/logo192.png"/><link rel="manifest" href="/Shimmer/manifest.json"/><title>React App</title><script defer="defer" src="/Shimmer/static/js/main.50346afb.js"></script><link href="/Shimmer/static/css/main.94fe4876.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
2 changes: 0 additions & 2 deletions docs/static/css/main.26385b54.css

This file was deleted.

1 change: 0 additions & 1 deletion docs/static/css/main.26385b54.css.map

This file was deleted.

2 changes: 2 additions & 0 deletions docs/static/css/main.94fe4876.css

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

1 change: 1 addition & 0 deletions docs/static/css/main.94fe4876.css.map

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

Large diffs are not rendered by default.

File renamed without changes.

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,12 @@ function App() {
return (
<div className="Post">
<Page>
<div className={"Content"}>
<div className={"BlockPage"}>
{posts.map(({name, author, date_published}) => {
return (
<PostPreview name={name} author={author} date_published={date_published} />
)
})}
</div>
<div className={"BlockPage"}>
{posts.map(({name, author, date_published}) => {
return (
<PostPreview name={name} author={author} date_published={date_published} />
)
})}
</div>
</Page>
</div>
Expand Down
3 changes: 0 additions & 3 deletions src/App.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ html, body, #root {
grid-template-rows: auto;
column-gap: 16px;
row-gap: 16px;
padding: 16px;
width: 100%;
max-width: 1920px;
margin: 0 auto;
}

6 changes: 5 additions & 1 deletion src/Page/Page.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ export default ({children}) => {
return (
<div className={"Page"}>
<SiteHeader />
{children}
<div className={"PageContent"}>
<div className={"Content"}>
{children}
</div>
</div>
<SiteFooter />
</div>
)
Expand Down
12 changes: 12 additions & 0 deletions src/Page/Page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,16 @@
box-sizing: border-box;
display: flex;
flex-direction: column;
}

.PageContent {
width: 100%;
padding: 16px;
box-sizing: border-box;

.Content {
box-sizing: border-box;
max-width: 1920px;
margin: 0 auto;
}
}
4 changes: 4 additions & 0 deletions src/SiteHeader/SiteHeader.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ nav {
text-decoration: none;
color: $glimmering-silver;

&:last-of-type {
padding-right: 0;
}

}

}

0 comments on commit c001eb6

Please sign in to comment.