fix 404.html conflict
This commit is contained in:
Cameron Himes
commit
edd2048c00
GPG Key ID:
D59E00E4DA64F95D
|
|
@ -0,0 +1,2 @@
|
||||||
|
public/
|
||||||
|
Session.vim
|
||||||
|
|
@ -0,0 +1,24 @@
|
||||||
|
Copyright 2022 Mountain Linux
|
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
are permitted provided that the following conditions are met:
|
||||||
|
|
||||||
|
1. Redistributions of source code must retain the above copyright notice, this
|
||||||
|
list of conditions and the following disclaimer.
|
||||||
|
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
this list of conditions and the following disclaimer in the documentation
|
||||||
|
and/or other materials provided with the distribution.
|
||||||
|
3. Neither the name of the copyright holder nor the names of its contributors
|
||||||
|
may be used to endorse or promote products derived from this software without
|
||||||
|
specific prior written permission.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
|
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
|
||||||
|
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||||
|
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
# The URL the site will be built for
|
||||||
|
base_url = "https://mountainlinux.club"
|
||||||
|
|
||||||
|
# Whether to automatically compile all Sass files in the sass directory
|
||||||
|
compile_sass = true
|
||||||
|
|
||||||
|
# Whether to build a search index to be used later on by a JavaScript library
|
||||||
|
build_search_index = true
|
||||||
|
|
||||||
|
[markdown]
|
||||||
|
# Whether to do syntax highlighting
|
||||||
|
# Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola
|
||||||
|
highlight_code = true
|
||||||
|
|
||||||
|
[extra]
|
||||||
|
# Put all your custom variables here
|
||||||
|
toolbar_pages = [
|
||||||
|
["About Us", "about"],
|
||||||
|
["Chat", "chat"],
|
||||||
|
["Get involved", "getinvolved"],
|
||||||
|
["Projects", "projects"],
|
||||||
|
["Helpful Resources", "resources"],
|
||||||
|
["Unhelpful Resources", "unresources"],
|
||||||
|
["Members' PGP Keys", "keys"],
|
||||||
|
]
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
+++
|
||||||
|
title="About Us"
|
||||||
|
+++
|
||||||
|
|
||||||
|
This is an about us page
|
||||||
|
|
@ -0,0 +1,38 @@
|
||||||
|
$sidebar_width: 20%;
|
||||||
|
$sidebar_background: rgba(255, 0, 0, .1);
|
||||||
|
$body_background: rgba(0, 255, 0, .1);
|
||||||
|
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
nav {
|
||||||
|
height: 100%;
|
||||||
|
position: fixed;
|
||||||
|
width: $sidebar_width;
|
||||||
|
background: $sidebar_background;
|
||||||
|
padding-top: 32px;
|
||||||
|
padding-bottom: 16px;
|
||||||
|
img {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
div {
|
||||||
|
padding: 0 16px 0 16px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
main {
|
||||||
|
height: 100%;
|
||||||
|
box-sizing: border-box;
|
||||||
|
margin-left: $sidebar_width;
|
||||||
|
background: $body_background;
|
||||||
|
padding-top: 50px;
|
||||||
|
article {
|
||||||
|
margin: auto;
|
||||||
|
border: 1px solid blue;
|
||||||
|
padding: 16px;
|
||||||
|
max-width: 1000px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media screen and (max-width: 1000px) {
|
||||||
|
@import "mobile.scss";
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
body {
|
||||||
|
nav {
|
||||||
|
position: unset;
|
||||||
|
height: auto;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
main {
|
||||||
|
margin-left: 0;
|
||||||
|
height: auto;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>
|
||||||
|
{% if page.title %}
|
||||||
|
{{ page.title }}
|
||||||
|
{% else %}
|
||||||
|
Mountain Linux Club
|
||||||
|
{% endif %}
|
||||||
|
</title>
|
||||||
|
<link rel="stylesheet" href="{{ get_url(path='main.css') }}">
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
{% include "sidebar.html" %}
|
||||||
|
<main>
|
||||||
|
<article>
|
||||||
|
{% block content %}
|
||||||
|
{% endblock %}
|
||||||
|
</article>
|
||||||
|
</main>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
{% extends "base.html" %}
|
||||||
|
{% block content %}
|
||||||
|
This will be the homepage
|
||||||
|
{% endblock %}
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
{% extends "base.html" %}
|
||||||
|
{% block content %}
|
||||||
|
{% if page.title %}
|
||||||
|
<h1>{{ page.title }}</h1>
|
||||||
|
{% endif %}
|
||||||
|
{{ page.content | safe }}
|
||||||
|
{% endblock %}
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
<nav>
|
||||||
|
<div>
|
||||||
|
<a href="/"><img src="{{ get_url(path='logo.png') }}"></a>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<ul>
|
||||||
|
{% for page in config.extra.toolbar_pages %}
|
||||||
|
<li>
|
||||||
|
<a href="{{ get_url(path=page[1]) }}">{{ page[0] }}</a>
|
||||||
|
</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
Loading…
Reference in New Issue