Skip to content

Commit

Permalink
Første fase nytt design
Browse files Browse the repository at this point in the history
  • Loading branch information
@Thunear
Thunear committed Feb 2, 2021
1 parent 470bb88 commit 295554b
Show file tree
Hide file tree
Showing 42 changed files with 1,365 additions and 1,918 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
_site/
.sass-cache/
.jekyll-metadata
.jekyll-cache
_pdf
.DS_Store
.idea
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use_logo: true

# logo image to use. logo images are constrained at 50px in height.
# logo: assets/difi-logo.png
logo: assets/Docs - blaasvart.png
logo: assets/docs_logo.svg

# use text title instead. text title read from uistring.title in ui strings section.
use_text_title: false
Expand Down
2 changes: 1 addition & 1 deletion _data/footer.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
about_title: Om disse sidene
about_description: >
about_description: Digdir Docs inneholder teknisk dokumentasjon om fellesløsninger som Digitaliseringsdirektoratet forvalter.

column2_title: Hvordan bidra?
column2_links:
Expand Down
3 changes: 3 additions & 0 deletions _data/main_sidebar.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,5 +109,8 @@ related_resources_list:
- title: Digitaliseringsdirektoratet
jurl: https://www.digdir.no

- title: Digdir Status
jurl: https://status.digdir.no

- title: Altinn Docs
jurl: https://altinn.github.io/docs/
2 changes: 1 addition & 1 deletion _includes/feedback.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<li><a class="email" title="Send epost med tilbakemelding" href="#" onclick="javascript:window.location='mailto:{{site.feedback_email}}?subject={{site.uistring.feedback_subject_line}} feedback&body=Jeg har noen tilbakemeldinger vedrørende {{page.title}} : ' + window.location.href;"><i class="fa fa-envelope-o topnavfeedback"></i>{{site.uistring.feedback_link_name}}</a><li>
<li><a class="email" title="Send epost med tilbakemelding" href="#" onclick="javascript:window.location='mailto:{{site.feedback_email}}?subject={{site.uistring.feedback_subject_line}} feedback&body=Jeg har noen tilbakemeldinger vedrørende {{page.title}} : ' + window.location.href;"><i class="fas fa-envelope topnavfeedback"></i>{{site.uistring.feedback_link_name}}</a><li>
95 changes: 38 additions & 57 deletions _includes/footer.html
View file
Original file line number Diff line number Diff line change
@@ -1,81 +1,62 @@
<!-- * Bootsnipp footer: http://bootsnipp.com/snippets/1KEEq (MIT license) -->

<div class="footertop">
<div class="container">
<div class="col-md-6">
<p></p>
</div>
<div class="col-md-6">
<ul class="bottom_ul">
</div>
</div>
</div>

<footer>
{% assign footer = site.data[page.footer] %}

<div class="container">

<div class="row">

<div class="col-md-4 col-sm-6">

<div class="footer-brand">

<img class="footer-brand__logo" src="/assets/img/docs_white.svg" alt=""/>
<div class="footer-brand__text">{{footer.about_description}}
</div>

</div>

<div class="col-md-4 col-sm-6 paddingtop-bottom">
{% assign footer = site.data[page.footer] %}
<h6 class="heading7">{{footer.column1_title}}</h6>
<ul class="footer-ul">
{% for link in footer.column1_links %}
<li><a class="noExtIcon" href="{{link.target}}"> {{link.text}}</a></li>
{% endfor %}
</ul>
</div>

<div class="col-md-4 col-sm-6 paddingtop-bottom">
<h6 class="heading7">{{footer.column2_title}}</h6>
<ul class="footer-ul">
{% for link in footer.column2_links %}
<li><a class="noExtIcon" href="{{link.target}}"> {{link.text}}</a></li>
{% endfor %}
</ul>
<div class="col-md-4 col-sm-6">
<div class="footer-links">
<div class="footer__heading">{{footer.column2_title}}</div>
<ul class="footer-links__list">
{% for link in footer.column2_links %}
<li class="footer-links__item"><a class="noExtIcon" href="{{link.target}}"> {{link.text}}</a>
</li>
{% endfor %}
</ul>
</div>
</div>

<div class="col-md-4 col-sm-6 paddingtop-bottom ">
<div class="col-md-4 col-sm-6">

<div class="footer-contact">
<div class="footer__heading">Kontakt</div>

<div class="logofooter"><img class="navbar-logo" src="assets/Docs - hvit png med ramme.png"/></div>
<p class="footer-description">{{footer.about_description}}</p>
<div class="footer-contact__item">
<span>E-post: </span><a href="mailto:webmaster@example.com">servicedesk.digdir.no</a>
</div>
<div class="footer-contact__item">
<span>Telefon:</span> <span>957 36 103</span>
</div>

<!--Added social media buttons-->
<a class="noExtIcon"href="https://twitter.com/digdir_no" onclick="_gaq.push(['_trackEvent', 'exit', 'footer', 'Twitter']);">
<span class="noExtIcon fa fa-twitter"></span></a>
<a class="footer-contact__icon" href="https://twitter.com/digdir_no"
onclick="_gaq.push(['_trackEvent', 'exit', 'footer', 'Twitter']);">
<span class="noExtIcon fab fa-twitter"></span></a>

<a class="noExtIcon" href="https://www.facebook.com/groups/samarbeidsportalen" onclick="_gaq.push(['_trackEvent', 'exit', 'footer', 'Facebook']);">
<span class="fa fa-facebook"></span></a>
<a class="footer-contact__icon" href="https://www.facebook.com/groups/samarbeidsportalen"
onclick="_gaq.push(['_trackEvent', 'exit', 'footer', 'Facebook']);">
<span class="fab fa-facebook-f"></span></a>

<a class="noExtIcon" href="https://difi.github.io/felleslosninger/feed.xml" onclick="_gaq.push(['_trackEvent', 'exit', 'footer', 'Rss',]);">
<span class="fa fa-rss"></span></a>
<a class="footer-contact__icon" href="https://difi.github.io/felleslosninger/feed.xml"
onclick="_gaq.push(['_trackEvent', 'exit', 'footer', 'Rss',]);">
<span class="fas fa-rss"></span></a>

</div>

<!--
<div class="col-md-3 col-sm-6 paddingtop-bottom">
<h6 class="heading7">{{footer.column3_title}}</h6>
<ul class="footer-ul">
{% for link in footer.column3_links %}
<li><a class="noExtIcon" href="{{link.target}}"> {{link.text}}</a></li>
{% endfor %}
</ul>
</div>
-->

</div>
</div>
</div>
</footer>
<!--subfooter start from here -->

<div class="copyright">
<div class="container">
<div class="col-md-12">
<p>© {{site.uistring.copyright}}</p>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion _includes/github_button_topnavbar.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<a target="_blank" title="Rediger i gitHub" href="{{site.github_editme_path}}/{{page.path}}" class="editButton noExtIcon"><i class="fa fa-github fa-lg"></i> {{site.uistring.github_edit_button_text}}</a>
<a target="_blank" title="Rediger i gitHub" href="{{site.github_editme_path}}/{{page.path}}" class="editButton noExtIcon"><i class="fab fa-github fa-lg"></i> {{site.uistring.github_edit_button_text}}</a>
179 changes: 93 additions & 86 deletions _includes/sidebar.html
View file
Original file line number Diff line number Diff line change
@@ -1,86 +1,100 @@
{% assign sidebar = site.data[page.sidebar] %}
<div class="mydocsidebar">


<div class="sidebar-inner">


{% if site.search_in_sidebar == true %}
<!-- search bar - uses Lunr.js -->

<div class="sidebarSearchBar">
<form action="search.html" method="get">
<div class="input-group search">
<input type="text" id="search-box" name="query" class="form-control" placeholder="{{site.uistring.search_placeholder_text}}">
<div class="input-group-btn">
<button class="btn btn-default" type="submit" value="search">
<i class="glyphicon glyphicon-search"></i>
</button>
</div>
</div>
</form>
</div>

<!-- end search bar -->
{% endif %}

{% unless page.sidebar == null %}
<div class="productTitle">{{sidebar.sidebarTitle}}</div>
<p class="external">
<a href="#" id="collapseAll">{{site.uistring.collapseall}}</a> | <a href="#" id="expandAll">{{site.uistring.expandall}}</a> | <a href="https://difi.github.io/felleslosninger/index.html" id="home_btn">{{site.uistring.home_btn}}</a>
</p>
{% endunless %}


<ul id="docnavsidebar" class="docnav">
{% for folder in sidebar.folders %}
{% unless folder.type == "frontmatter" %}
<li class="level1"><a href="{{folder.jurl | remove: "/" }}">{{folder.title}}</a>

<ul>
{% for folderitem in folder.folderitems %}

{% if folderitem.title %}
{% if page.url == folderitem.jurl %}
<li class="level1items open"><a href="{{folderitem.jurl | remove: "/" }}">{{folderitem.title}}</a></li>
{% elsif folderitem.jurl contains "http://" or folderitem.jurl contains "https://" %}
<li class="level1items"><a class="noExtIcon" href="{{folderitem.jurl }}">{{folderitem.title}}</a></li>
{% else %}
<li class="level1items"><a href="{{folderitem.jurl | remove: "/" }}">{{folderitem.title}}</a></li>
{% endif %}
{% endif %}

{% for subfolder in folderitem.subfolders %}

<li class="level2"><a class="subfoldersTitle" href="#">{{ subfolder.title }}</a>
<ul style="display:none;">
{% for subfolderitem in subfolder.subfolderitems %}

{% if subfolderitem.title %}
{% if page.url == subfolderitem.jurl %}
<li class="level2items open"><a href="{{subfolderitem.jurl | remove: "/" }}">{{subfolderitem.title}}</a></li>
<div class="test2"></div>
<div class="sidebar-inner">
{% if site.search_in_sidebar == true %}
<!-- search bar - uses Lunr.js -->

<div class="sidebarSearchBar">
<form action="search.html" method="get">
<div class="input-group search">
<input type="text" id="search-box" name="query" class="form-control"
placeholder="{{site.uistring.search_placeholder_text}}">
<div class="input-group-btn">
<button class="btn btn-default" type="submit" value="search">
<i class="glyphicon glyphicon-search"></i>
</button>
</div>
</div>
</form>
</div>

<!-- end search bar -->
{% endif %}
{% unless page.sidebar == null %}
<div class="productTitle">{{sidebar.sidebarTitle}}</div>
<p class="external">
<a href="#" id="collapseAll">{{site.uistring.collapseall}}</a> | <a href="#" id="expandAll">{{site.uistring.expandall}}</a>
| <a href="https://difi.github.io/felleslosninger/index.html" id="home_btn">{{site.uistring.home_btn}}</a>
</p>
{% endunless %}


<ul id="docnavsidebar" class="docnav">
{% for folder in sidebar.folders %}
{% unless folder.type == "frontmatter" %}
<li class="level1"><a href="{{folder.jurl | remove: "/" }}">{{folder.title}}</a>

<ul>
{% for folderitem in folder.folderitems %}

{% if folderitem.title %}
{% if page.url == folderitem.jurl %}
<li class="level1items open"><a href="{{folderitem.jurl | remove: "/" }}">{{folderitem.title}}</a>
</li>
{% elsif folderitem.jurl contains "http://" or folderitem.jurl contains "https://" %}
<li class="level2items"><a class="noExtIcon" href="{{subfolderitem.jurl }}">{{subfolderitem.title}}</a></li>
<li class="level1items"><a class="noExtIcon" href="{{folderitem.jurl }}">{{folderitem.title}}</a>
</li>
{% else %}
<li class="level2items"><a href="{{subfolderitem.jurl | remove: "/" }}">{{subfolderitem.title}}</a></li>
<li class="level1items"><a href="{{folderitem.jurl | remove: "/" }}">{{folderitem.title}}</a></li>
{% endif %}
{% endif %}

{% for subsubfolder in subfolderitem.subsubfolders %}
<li class="level3"><a class="subfoldersTitle" href="#">{{ subsubfolder.title }}</a>
{% for subfolder in folderitem.subfolders %}

<li class="level2"><a class="subfoldersTitle" href="#">{{ subfolder.title }}</a>
<ul style="display:none;">
{% for subsubfolderitem in subsubfolder.subsubfolderitems %}
{% for subfolderitem in subfolder.subfolderitems %}

{% if subsubfolderitem.title %}
{% if page.url == subsubfolderitem.jurl %}
<li class="level3items open"><a href="{{subsubfolderitem.jurl | remove: "/" }}">{{subsubfolderitem.title}}</a></li>
{% if subfolderitem.title %}
{% if page.url == subfolderitem.jurl %}
<li class="level2items open"><a href="{{subfolderitem.jurl | remove: "/"
}}">{{subfolderitem.title}}</a></li>
{% elsif folderitem.jurl contains "http://" or folderitem.jurl contains "https://" %}
<li class="level3items"><a href="{{subsubfolderitem.jurl }}">{{subsubfolderitem.title}}</a></li>
<li class="level2items"><a class="noExtIcon" href="{{subfolderitem.jurl }}">{{subfolderitem.title}}</a>
</li>
{% else %}
<li class="level3items"><a href="{{subsubfolderitem.jurl | remove: "/" }}">{{subsubfolderitem.title}}</a></li>
<li class="level2items"><a href="{{subfolderitem.jurl | remove: "/"
}}">{{subfolderitem.title}}</a></li>
{% endif %}
{% endif %}

{% for subsubfolder in subfolderitem.subsubfolders %}
<li class="level3"><a class="subfoldersTitle" href="#">{{ subsubfolder.title }}</a>
<ul style="display:none;">
{% for subsubfolderitem in subsubfolder.subsubfolderitems %}

{% if subsubfolderitem.title %}
{% if page.url == subsubfolderitem.jurl %}
<li class="level3items open"><a href="{{subsubfolderitem.jurl | remove: "/"
}}">{{subsubfolderitem.title}}</a></li>
{% elsif folderitem.jurl contains "http://" or folderitem.jurl contains "https://"
%}
<li class="level3items"><a href="{{subsubfolderitem.jurl }}">{{subsubfolderitem.title}}</a>
</li>
{% else %}
<li class="level3items"><a href="{{subsubfolderitem.jurl | remove: "/"
}}">{{subsubfolderitem.title}}</a></li>
{% endif %}
{% endif %}

{% endfor %}
</ul>
</li>

{% endfor %}

{% endfor %}
</ul>
</li>
Expand All @@ -89,28 +103,21 @@

{% endfor %}
</ul>
</li>

{% endfor %}
{% endunless %}
{% endfor %}

{% endfor %}
</li>
</ul>
{% endunless %}
{% endfor %}

</li>
</ul>

<hr class="resourceSeparator"></hr>
<!-- <div class="relatedResources">{{sidebar.related_resources_title}}</div>-->
<ul id="entrypages">
{% for item in sidebar.related_resources_list %}
<li><a class="noExtIcon" href="{{item.jurl }}">{{item.title}}</a></li>
{% endfor %}

<hr class="resourceSeparator"></hr>
<div class="relatedResources">{{sidebar.related_resources_title}}</div>
<ul id="entrypages">
{% for item in sidebar.related_resources_list %}
<li><a class="noExtIcon" href="{{item.jurl }}">{{item.title}}</a></li>
{% endfor %}

</ul>

</div>
</ul>
</div>
</div>
<script>$("li.open").parents('li').toggleClass("open");</script>
Loading

0 comments on commit 295554b

Please sign in to comment.