Skip to content

Commit

Permalink
FLOE-540: Fixed alignment of navigation; added to other pages
Browse files Browse the repository at this point in the history
  • Loading branch information
@thinkbulecount2
thinkbulecount2 committed Feb 28, 2018
1 parent 4e729cd commit 05042d7
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 23 deletions.
7 changes: 0 additions & 7 deletions css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,6 @@ body {
display:block;
}

.floe .floe-nav {
display: flex;
justify-content: space-between;
flex-direction: column;
align-self: flex-end;
}

.floe .floe-nav ul li {
list-style: none;
font-weight: bold;
Expand Down
26 changes: 19 additions & 7 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,25 @@
</div>

<div class="floe">
<header class="floe-header">
<h1><a rel="home" title="Home" href="index.html" class="floe-header-logo">floe
<span class="floe-header-tagline">
flexible learning for open education
</span></a>
</h1>
</header>
<div class="row">
<div class="columns small-12 medium-9 large-9">
<header class="floe-header">
<h1><a rel="home" title="Home" href="index.html" class="floe-header-logo">floe
<span class="floe-header-tagline">
flexible learning for open education
</span></a>
</h1>
</header>
</div>
<div class="columns small-12 medium-3 large-3 align-self-bottom">
<nav class="floe-nav">
<ul>
<li><a href="news/index.html">News</a></li>
<li><a href="resources.html">Resources</a></li>
</ul>
</nav>
</div>
</div>

<div id="content" class="floe-content floe-story">
<div class="flc-toc-tocContainer toc"> </div>
Expand Down
26 changes: 19 additions & 7 deletions news/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,25 @@
</div>

<div class="floe">
<header class="floe-header">
<h1><a rel="home" title="Home" href="../index.html" class="floe-header-logo">floe
<span class="floe-header-tagline">
flexible learning for open education
</span></a>
</h1>
</header>
<div class="row">
<div class="columns small-12 medium-9 large-9">
<header class="floe-header">
<h1><a rel="home" title="Home" href="index.html" class="floe-header-logo">floe
<span class="floe-header-tagline">
flexible learning for open education
</span></a>
</h1>
</header>
</div>
<div class="columns small-12 medium-3 large-3 align-self-bottom">
<nav class="floe-nav">
<ul>
<li><a href="index.html">News</a></li>
<li><a href="/resources.html">Resources</a></li>
</ul>
</nav>
</div>
</div>

<div id="content" class="floe-content">
<div class="flc-toc-tocContainer toc"> </div>
Expand Down
4 changes: 2 additions & 2 deletions resources.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ <h1><a rel="home" title="Home" href="index.html" class="floe-header-logo">floe
</h1>
</header>
</div>
<div class="columns small-12 medium-3 large-3">
<div class="columns small-12 medium-3 large-3 align-self-bottom">
<nav class="floe-nav">
<ul>
<li><a href="news/index.html">News</a></li>
Expand Down Expand Up @@ -382,7 +382,7 @@ <h2 class="floe-resource-title"><button aria-expanded="false" class="floe-resour
</a>
</p>
<p>
The <a href="practice of co-design https://guide.inclusivedesign.ca/practices/PracticeCoDesign.html">practice of co-design</a> allows users to become active participants in the design process by facilitating their direct input into the creation of solutions that meet their needs, rather than limiting users to the role of research subjects or consultants.
The <a href="https://guide.inclusivedesign.ca/practices/PracticeCoDesign.html">practice of co-design</a> allows users to become active participants in the design process by facilitating their direct input into the creation of solutions that meet their needs, rather than limiting users to the role of research subjects or consultants.
</p>
</li>
<li>
Expand Down

0 comments on commit 05042d7

Please sign in to comment.