Commit 08e695da authored by NGPixel's avatar NGPixel

feat: Page now uses max height + new logo

parent 6a734510
This diff was suppressed by a .gitattributes entry.
html { html {
box-sizing: border-box; box-sizing: border-box;
font-family: $core-font-standard; font-family: $core-font-standard;
height: 100%;
} }
*, *:before, *:after { *, *:before, *:after {
box-sizing: inherit; box-sizing: inherit;
...@@ -10,12 +11,19 @@ html { ...@@ -10,12 +11,19 @@ html {
display: none; display: none;
} }
#root {
padding-bottom: 67px;
position: relative;
min-height: 100%;
}
body { body {
background-color: mc('blue-grey','100'); background-color: lighten(mc('blue-grey','50'), 5%);
height: 100%;
} }
main { main {
background-color: #FFF; background-color: lighten(mc('blue-grey','50'), 5%);
} }
a { a {
......
.footer { .footer {
background-color: mc('blue-grey','50'); background-color: mc('blue-grey','50');
border-bottom: 5px solid mc('blue-grey','100');
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 25px; padding: 0 25px;
height: 70px;
font-size: 13px; font-size: 13px;
font-weight: 500; font-weight: 500;
color: mc('blue-grey','500'); color: mc('blue-grey','500');
position: absolute;
right: 0;
bottom: 0;
left: 0;
ul { ul {
padding: 0; padding: 0;
......
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
&.is-featured { &.is-featured {
border-top-left-radius: 4px; border-top-left-radius: 4px;
border-top-right-radius: 4px; border-top-right-radius: 4px;
background-color: mc('indigo', '300'); background-color: mc($primary, '400');
border-bottom-color: mc('indigo', '400'); border-bottom-color: mc($primary, '500');
color: #FFF; color: #FFF;
> i::before { > i::before {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
color: mc('blue-grey', '50'); color: mc('blue-grey', '50');
width: 250px; width: 250px;
max-width: 250px; max-width: 250px;
min-height: 80vh; min-height: calc(100vh - 120px);
aside { aside {
padding: 1px 0 15px 0; padding: 1px 0 15px 0;
......
...@@ -22,13 +22,9 @@ $primary: 'indigo'; ...@@ -22,13 +22,9 @@ $primary: 'indigo';
.welcome { .welcome {
text-align: center; text-align: center;
padding: 25px 0 0; padding: 50px 0 15px 0;
color: mc('grey', '700'); color: mc('grey', '700');
h1 {
margin-top: 5px;
}
h2 { h2 {
margin: 0; margin: 0;
} }
......
...@@ -28,7 +28,7 @@ block rootNavRight ...@@ -28,7 +28,7 @@ block rootNavRight
block content block content
#page-type-view(data-entrypath=pageData.meta.path) #page-type-view.page-type-container(data-entrypath=pageData.meta.path)
.container.is-fluid.has-mkcontent .container.is-fluid.has-mkcontent
.columns.is-gapless .columns.is-gapless
......
...@@ -10,7 +10,7 @@ block content ...@@ -10,7 +10,7 @@ block content
#page-type-welcome #page-type-welcome
.container .container
.welcome .welcome
img(src='/favicons/android-icon-144x144.png', alt='Wiki.js') img(src='/images/logo.png', alt='Wiki.js')
h1 Welcome to your Wiki.js! h1 Welcome to your wiki!
h2 Let's get started and create the home page. h2 Let's get started and create the home page.
a.button.is-indigo(href='/create/home') Create Home Page a.button.is-indigo(href='/create/home') Create Home Page
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment