diff --git a/source/_nav_item.erb b/source/_nav_item.erb
index 7b9784d..712ec53 100644
--- a/source/_nav_item.erb
+++ b/source/_nav_item.erb
@@ -1,15 +1,26 @@
<% if items.size > 0 %>
<% items.each do |i| %>
- -
- <%= i.data.title %>
- <%= partial :nav_item, :locals => {
- :items => resources.select{ |r|
+
-
+ <% children = resources
+ .select{ |r|
r.url.split("/").size == i.url.split("/").size + 1 &&
r.url.start_with?(i.url)
- },
- :resources => resources
- } %>
+ }
+ .sort{ |a, b| a.data.title <=> b.data.title }
+ .sort{ |a, b| -(a.data.priority || 0) <=> -(b.data.priority || 0) }
+ %>
+ <% if children.size == 0 %>
+ <%= i.data.title %>
+ <% else %>
+
+ <%= i.data.title %>
+ <%= partial :nav_item, :locals => {
+ :items => children,
+ :resources => resources
+ } %>
+
+ <% end %>
<% end %>
diff --git a/source/stylesheets/site.css.scss b/source/stylesheets/site.css.scss
index be97742..46b7c1a 100644
--- a/source/stylesheets/site.css.scss
+++ b/source/stylesheets/site.css.scss
@@ -60,14 +60,8 @@ nav {
li {
a {
- display: block;
padding: 2em 0em;
- border-bottom: 2px solid transparent;
transition: all ease-in 0.2s;
-
- &:hover {
- border-bottom-color: $plume;
- }
}
}
}
@@ -83,6 +77,12 @@ main nav li {
display: flex;
align-items: center;
justify-content: center;
+ border-bottom: 2px solid transparent;
+
+ &:hover {
+ border-bottom-color: $plume;
+ }
+
img {
margin: 0px 20px;
}
@@ -153,15 +153,17 @@ aside {
li {
display: inline;
- a {
+ & > a, & > details {
display: block;
padding: 2em;
border-bottom: none;
- border-left: 5px solid transparent;
- transition: all ease-in 0.2s;
+ }
+
+ & > a, & > details > summary > a {
+ opacity: 0.6;
&:hover {
- border-left-color: $plume;
+ opacity: 1;
}
}
}