oyvindskaaden
/
glados.no
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into production

pull/3/head
Øyvind Skaaden 2020-08-16 15:22:40 +02:00
parent c478eec4fa 0bd406c224
commit cb0eab5bc6
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
_layouts/default.html
View File

@ -23,18 +23,18 @@
<p>{{ site.description | default: site.github.project_tagline }}</p> <p>{{ site.description | default: site.github.project_tagline }}</p>
{% if site.github.is_project_page %} {% if site.github.is_project_page %}
<p class="view"><a href="{{ site.github.repository_url }}">View the source on my private git <small>{{ site.github.repository_nwo }}</small></a></p> <p class="view"><a href="{{ site.github.repository_url }}">Vis kilden på min private git <small>{{ site.github.repository_nwo }}</small></a></p>
{% endif %} {% endif %}
{% if site.github.is_user_page %} {% if site.github.is_user_page %}
<p class="view"><a href="{{ site.github.owner_url }}">View My GitHub Profile</a></p> <p class="view"><a href="{{ site.github.owner_url }}">Se min githubprofil!</a></p>
{% endif %} {% endif %}
{% if site.show_downloads %} {% if site.show_downloads %}
<ul class="downloads"> <ul class="downloads">
<li><a href="{{ site.github.zip_url }}">Download <strong>ZIP File</strong></a></li> <li><a href="{{ site.github.zip_url }}">Last ned <strong>ZIP fil</strong></a></li>
<li><a href="{{ site.github.tar_url }}">Download <strong>TAR Ball</strong></a></li> <li><a href="{{ site.github.tar_url }}">Last ned <strong>TAR Ball</strong></a></li>
<li><a href="{{ site.github.repository_url }}">View On <strong>GitHub</strong></a></li> <li><a href="{{ site.github.repository_url }}">Vis på <strong>GitHub</strong></a></li>
</ul> </ul>
{% endif %} {% endif %}
</header> </header>
@ -45,9 +45,9 @@
</section> </section>
<footer> <footer>
{% if site.github.is_project_page %} {% if site.github.is_project_page %}
<p>This project is maintained by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a></p> <p>Denne siden er vedlikeholdt av <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a></p>
{% endif %} {% endif %}
<p><small>Hosted on GLaDOS &mdash; Theme by <a href="https://github.com/orderedlist">orderedlist</a></small></p> <p><small>Levert av GLaDOS &mdash; Tema av <a href="https://github.com/orderedlist">orderedlist</a></small></p>
</footer> </footer>
</div> </div>
<script src="{{ "/assets/js/scale.fix.js" | relative_url }}"></script> <script src="{{ "/assets/js/scale.fix.js" | relative_url }}"></script>

4
index.md
View File

@ -2,10 +2,6 @@
layout: default layout: default
--- ---
=======
Testing
master
Prosjekter, dokumenter og annet Prosjekter, dokumenter og annet
------------------------------- -------------------------------
* [NTNU prosjekter og filer](./files/ntnu/) * [NTNU prosjekter og filer](./files/ntnu/)