mirror of
https://github.com/seigler/dashdev-website
synced 2025-07-27 06:46:09 +00:00
fix(template, css): layout improvements
This commit is contained in:
parent
4c55b4ff59
commit
174edc90a4
3 changed files with 48 additions and 64 deletions
|
@ -15,30 +15,19 @@
|
||||||
*,
|
*,
|
||||||
*:before,
|
*:before,
|
||||||
*:after {
|
*:after {
|
||||||
box-sizing: border-box;
|
box-sizing: inherit;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
/* font-family: georgia, cambria, "times new roman", times, serif; */
|
|
||||||
font-family: 'Open Sans', sans-serif;
|
font-family: 'Open Sans', sans-serif;
|
||||||
font-size: 1.05em;
|
font-size: 1.05em;
|
||||||
/* only with position static text will auto-format when making window smaller */
|
|
||||||
/* position: relative; */
|
|
||||||
/* margin-top: 60px; */
|
|
||||||
/* margin-left: 310px; */
|
|
||||||
/* TODO: not sure this is clean solution */
|
|
||||||
/* set background-color for all parts default, specially below content */
|
|
||||||
/* background-color: #f7f2ea; */
|
|
||||||
/* color: #111833; */
|
|
||||||
line-height: 1.5;
|
line-height: 1.5;
|
||||||
/* TODO: put footer at bottom
|
box-sizing: border-box;
|
||||||
https://stackoverflow.com/questions/643879/css-to-make-html-page-footer-stay-at-bottom-of-the-page-with-a-minimum-height-b */
|
min-height: 100vh;
|
||||||
/* min-height: 100%; */
|
display: flex;
|
||||||
/* TODO: repair, only scrolling in body possible */
|
flex-direction: column;
|
||||||
overflow: auto;
|
|
||||||
/* padding-top: 30px; */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
article,
|
article,
|
||||||
|
@ -185,20 +174,18 @@ p.articleinfo {
|
||||||
color: #111833;
|
color: #111833;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* layout */
|
/* layout */
|
||||||
|
|
||||||
main {
|
main {
|
||||||
/* for page and article template */
|
/* for page and article template */
|
||||||
clear: both;
|
clear: both;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
margin-top: 60px;
|
|
||||||
/* margin-bottom: 0; */
|
|
||||||
background-color: #f7f2ea;
|
background-color: #f7f2ea;
|
||||||
/* min-height: 100%; */
|
|
||||||
/* min-width: 100%; */
|
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
min-height: 100%;
|
min-height: 100%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
flex-grow: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
|
@ -217,9 +204,10 @@ article {
|
||||||
/* this only applys to <section> while .content is also applied */
|
/* this only applys to <section> while .content is also applied */
|
||||||
/* for page and article template */
|
/* for page and article template */
|
||||||
/* Distance left, right 4em */
|
/* Distance left, right 4em */
|
||||||
padding: 0 4em;
|
padding: 0 1em;
|
||||||
/* Distance top 2em for content */
|
/* Distance top 2em for content */
|
||||||
padding-top: 2em;
|
padding-top: 2em;
|
||||||
|
flex-grow: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
article a:link,
|
article a:link,
|
||||||
|
@ -233,31 +221,19 @@ article a:hover {
|
||||||
}
|
}
|
||||||
|
|
||||||
header {
|
header {
|
||||||
/* header global */
|
|
||||||
clear: both;
|
|
||||||
width: 100%;
|
|
||||||
/* eg can overwrite value for "if desktop" below */
|
|
||||||
height: 60px;
|
|
||||||
overflow: auto;
|
|
||||||
background-color: #111833;
|
background-color: #111833;
|
||||||
border-bottom: solid;
|
border-bottom: solid;
|
||||||
color: #66fcf1;
|
color: #66fcf1;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
padding: 7px 1em 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
footer {
|
footer {
|
||||||
/* footer global */
|
/* footer global */
|
||||||
/* TODO: move footer bottom when article not end of page */
|
|
||||||
clear: both;
|
clear: both;
|
||||||
/* width: 100%; */
|
|
||||||
margin-left: 310px;
|
|
||||||
height: 70px;
|
|
||||||
/* margin-top: -70px; */
|
|
||||||
/* overflow: auto; */
|
|
||||||
background-color: #f7f2ea;
|
background-color: #f7f2ea;
|
||||||
}
|
margin-top: 2em;
|
||||||
|
|
||||||
footer {
|
|
||||||
/* font-family: 'Open Sans', sans-serif; */
|
|
||||||
font-size: 0.90em;
|
font-size: 0.90em;
|
||||||
padding: 1em;
|
padding: 1em;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
@ -336,39 +312,52 @@ footer a:hover {
|
||||||
border-bottom: 1px solid #ccc;
|
border-bottom: 1px solid #ccc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.subpages .nav.sub {
|
||||||
|
background-color: #111833;
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
@media (min-width: 16em) {
|
@media (min-width: 16em) {
|
||||||
.nav li {
|
.nav li {
|
||||||
flex: 1 1 50%;
|
flex: 1 1 50%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: 32em) {
|
main > .content {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
flex-grow: 1;
|
||||||
|
padding-top: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* styles.css | http://localhost:3000/css/styles.css */
|
||||||
|
|
||||||
|
@media (min-width: 50em) {
|
||||||
header {
|
header {
|
||||||
/* header global */
|
/* header global */
|
||||||
position: fixed;
|
position: fixed;
|
||||||
/* defined global above */
|
flex-direction: row;
|
||||||
/* height: 60px; */
|
align-items: center;
|
||||||
|
width: 100%;
|
||||||
|
height: 60px;
|
||||||
top: 0;
|
top: 0;
|
||||||
}
|
padding: 0 1em;
|
||||||
.logo {
|
|
||||||
float: left;
|
|
||||||
margin-left: 20px;
|
|
||||||
}
|
}
|
||||||
.nav.main {
|
.nav.main {
|
||||||
float: right;
|
margin-left: auto;
|
||||||
margin-right: 20px;
|
margin-right: 20px;
|
||||||
}
|
}
|
||||||
.nav li {
|
.nav li {
|
||||||
flex: 1 1 auto;
|
flex: 1 1 auto;
|
||||||
}
|
}
|
||||||
.nav.main li {
|
.nav.main li {
|
||||||
width: 6em;
|
padding: 0 0.5em;
|
||||||
}
|
}
|
||||||
main {
|
main {
|
||||||
/* global template */
|
/* global template */
|
||||||
/* position: static; */
|
/* position: static; */
|
||||||
/* margin-top: 60px; */
|
padding-top: 60px;
|
||||||
/* min-height: 100%; */
|
min-height: 100%;
|
||||||
/* margin: 0px 0px 0px 0px; */
|
/* margin: 0px 0px 0px 0px; */
|
||||||
/* padding: 3em 0em 2em 0em; */
|
/* padding: 3em 0em 2em 0em; */
|
||||||
/* overflow: auto; */
|
/* overflow: auto; */
|
||||||
|
@ -389,18 +378,15 @@ footer a:hover {
|
||||||
}
|
}
|
||||||
.subpages .nav.sub {
|
.subpages .nav.sub {
|
||||||
/* article template */
|
/* article template */
|
||||||
height: 100%;
|
|
||||||
width: 310px;
|
width: 310px;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
/* z-index: 1; */
|
/* z-index: 1; */
|
||||||
top: 0;
|
top: 60px;
|
||||||
left: 0;
|
left: 0;
|
||||||
background-color: #111833;
|
bottom: 0;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
overflow-y: scroll;
|
overflow-y: scroll;
|
||||||
padding-top: 40px;
|
padding-top: 20px;
|
||||||
margin-top: 60px;
|
|
||||||
color: #fff;
|
|
||||||
}
|
}
|
||||||
.nav.sub ul {
|
.nav.sub ul {
|
||||||
/* margin-top: 1em; */
|
/* margin-top: 1em; */
|
||||||
|
@ -427,4 +413,8 @@ footer a:hover {
|
||||||
.nav.page a.next {
|
.nav.page a.next {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
article {
|
||||||
|
padding-left: 4em;
|
||||||
|
padding-right: 4em;
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -54,12 +54,12 @@
|
||||||
|
|
||||||
</article>
|
</article>
|
||||||
|
|
||||||
|
{{> footer template='article' }}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
{{> footer template='article' }}
|
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
|
@ -1,10 +1,4 @@
|
||||||
<header>
|
<header>
|
||||||
|
|
||||||
<div class="content">
|
|
||||||
|
|
||||||
<p class="logo"><a href="{{ root }}">{{ name }}</a></p>
|
<p class="logo"><a href="{{ root }}">{{ name }}</a></p>
|
||||||
{{> navmain }}
|
{{> navmain }}
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</header>
|
</header>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue