actually fixed top nav, got rid of issue with covering content

bcgsc · Mar 20, 2018 · 7d436e6 · 7d436e6
1 parent abb5752
commit 7d436e6
Show file tree

Hide file tree

Showing 25 changed files with 80 additions and 33 deletions.
diff --git a/_includes/site-feature.html b/_includes/site-feature.html
@@ -7,10 +7,10 @@
 {% endif %}
 
 {% if feature_text or feature_image %}
-  <div class="feature"{% if feature_image %} style="position:relative; background-image: url({{ feature_image }})"{% endif %}>
+  <div class="feature"{% if feature_image %} style="background-image: url({{ feature_image }})"{% endif %}>
       <div class="container  typeset">
         {{ feature_text | markdownify }}
-      <span style="position:absolute;bottom:0;font-size:10px;">
+      <span style="font-size:10px;">
       {% if page.feature_credit %}<a target="_blank" href="{{page.feature_link}}" >{% endif %}{% if page.feature_credit %} {{page.feature_credit}} {% endif %}{% if page.feature_credit %}</a>{% endif %}
       </span>
       </div>

diff --git a/_includes/site-header.html b/_includes/site-header.html
@@ -1,5 +1,5 @@
 <header class="header" >
-  <div class="container">
+  <div class="topnav container">
 
     {% if site.logo %}{% include site-logo.html %}{% endif %}
 

diff --git a/_sass/_theme.scss b/_sass/_theme.scss
@@ -2,7 +2,7 @@
 
 
 body {
-  margin-top: 10%;
+  margin-top: 100px;
   background: $backgroundColour;
   color: $bodyColour;
   height: 100%;
@@ -141,7 +141,6 @@ table {
 
 .container {
   width: 100%;
-  max-width: 1200px;
   margin: 0 auto;
 }
 
@@ -193,7 +192,7 @@ span.software-title{
   align-items: flex-end;
 }
 
-.header{
+.topnav{
   position: fixed;
   width: 100%;
   top: 0;

diff --git a/_site/assets/styles.css b/_site/assets/styles.css
diff --git a/_site/categories.html b/_site/categories.html
@@ -32,7 +32,7 @@
 	<body class="layout-categories  categories">
 
 		<header class="header">
-  <div class="container">
+  <div class="topnav container">
 
     <a class="logo" href="/">
   <img src="/assets/logo.png" alt="Bioinformatics Technology Lab logo">

diff --git a/_site/conference/2017/09/23/another-post.html b/_site/conference/2017/09/23/another-post.html
@@ -34,7 +34,7 @@
 	<body class="layout-post  one-more-example">
 
 		<header class="header">
-  <div class="container">
+  <div class="topnav container">
 
     <a class="logo" href="/">
   <img src="/assets/logo.png" alt="Bioinformatics Technology Lab logo">

diff --git a/_site/conference/2018/01/02/ABCD-conference.html b/_site/conference/2018/01/02/ABCD-conference.html
@@ -34,7 +34,7 @@
 	<body class="layout-post  presenting-at-abcd-conference">
 
 		<header class="header">
-  <div class="container">
+  <div class="topnav container">
 
     <a class="logo" href="/">
   <img src="/assets/logo.png" alt="Bioinformatics Technology Lab logo">

diff --git a/_site/feed.xml b/_site/feed.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.6.2">Jekyll</generator><link href="http://localhost:4000/feed.xml" rel="self" type="application/atom+xml" /><link href="http://localhost:4000/" rel="alternate" type="text/html" /><updated>2018-03-09T16:10:03-08:00</updated><id>http://localhost:4000/</id><title type="html">Bioinformatics Technology Lab</title><subtitle>Bioinformatics Technology Lab at Canada's Michael Smith Genome Sciences Centre. Primarily interested in de novo genome assembly. More description.</subtitle><entry><title type="html">Presenting at ABCD Conference</title><link href="http://localhost:4000/conference/2018/01/02/ABCD-conference.html" rel="alternate" type="text/html" title="Presenting at ABCD Conference" /><published>2018-01-02T00:00:00-08:00</published><updated>2018-01-02T00:00:00-08:00</updated><id>http://localhost:4000/conference/2018/01/02/ABCD-conference</id><content type="html" xml:base="http://localhost:4000/conference/2018/01/02/ABCD-conference.html">&lt;p&gt;John Smith and James Green presented their research at ABCD Conference this past weekend&lt;/p&gt;
+<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.6.2">Jekyll</generator><link href="http://localhost:4000/feed.xml" rel="self" type="application/atom+xml" /><link href="http://localhost:4000/" rel="alternate" type="text/html" /><updated>2018-03-20T13:45:14-07:00</updated><id>http://localhost:4000/</id><title type="html">Bioinformatics Technology Lab</title><subtitle>Bioinformatics Technology Lab at Canada's Michael Smith Genome Sciences Centre. Primarily interested in de novo genome assembly. More description.</subtitle><entry><title type="html">Presenting at ABCD Conference</title><link href="http://localhost:4000/conference/2018/01/02/ABCD-conference.html" rel="alternate" type="text/html" title="Presenting at ABCD Conference" /><published>2018-01-02T00:00:00-08:00</published><updated>2018-01-02T00:00:00-08:00</updated><id>http://localhost:4000/conference/2018/01/02/ABCD-conference</id><content type="html" xml:base="http://localhost:4000/conference/2018/01/02/ABCD-conference.html">&lt;p&gt;John Smith and James Green presented their research at ABCD Conference this past weekend&lt;/p&gt;
 
 &lt;!-- more --&gt;
 

diff --git a/_site/index.html b/_site/index.html
@@ -32,7 +32,7 @@
 	<body class="layout-default  home">
 
 		<header class="header">
-  <div class="container">
+  <div class="topnav container">
 
     <a class="logo" href="/">
   <img src="/assets/logo.png" alt="Bioinformatics Technology Lab logo">
@@ -131,12 +131,12 @@
 
 
 
-  <div class="feature" style="position:relative; background-image: url(assets/background.jpg)">
+  <div class="feature" style="background-image: url(assets/background.jpg)">
       <div class="container  typeset">
         <h1 id="bioinformatics-technology-lab">Bioinformatics Technology Lab</h1>
 <p>Led by Dr. Inanc Birol at <a href="http://www.bcgsc.ca/">BC Cancer’s Michael Smith Genome Sciences Centre</a></p>
 
-      <span style="position:absolute;bottom:0;font-size:10px;">
+      <span style="font-size:10px;">
       <a target="_blank" href="http://mkweb.bcgsc.ca/fun/hdtr/"> Photo by Martin Krzywinski </a>
       </span>
       </div>

diff --git a/_site/member/ahammond.html b/_site/member/ahammond.html
@@ -32,7 +32,7 @@
 	<body class="layout-profile  austin-hammond">
 
 		<header class="header">
-  <div class="container">
+  <div class="topnav container">
 
     <a class="logo" href="/">
   <img src="/assets/logo.png" alt="Bioinformatics Technology Lab logo">

diff --git a/_site/member/jma.html b/_site/member/jma.html
@@ -32,7 +32,7 @@
 	<body class="layout-profile  something">
 
 		<header class="header">
-  <div class="container">
+  <div class="topnav container">
 
     <a class="logo" href="/">
   <img src="/assets/logo.png" alt="Bioinformatics Technology Lab logo">

diff --git a/_site/member/rwarren.html b/_site/member/rwarren.html
@@ -32,7 +32,7 @@
 	<body class="layout-profile  rene-warren">
 
 		<header class="header">
-  <div class="container">
+  <div class="topnav container">
 
     <a class="logo" href="/">
   <img src="/assets/logo.png" alt="Bioinformatics Technology Lab logo">

diff --git a/_site/member/sjackman.html b/_site/member/sjackman.html
@@ -32,7 +32,7 @@
 	<body class="layout-profile  shaun-jackman">
 
 		<header class="header">
-  <div class="container">
+  <div class="topnav container">
 
     <a class="logo" href="/">
   <img src="/assets/logo.png" alt="Bioinformatics Technology Lab logo">

diff --git a/_site/members.html b/_site/members.html
@@ -32,7 +32,7 @@
 	<body class="layout-page  members">
 
 		<header class="header">
-  <div class="container">
+  <div class="topnav container">
 
     <a class="logo" href="/">
   <img src="/assets/logo.png" alt="Bioinformatics Technology Lab logo">
@@ -131,6 +131,17 @@
 
 
 
+  <div class="feature" style="background-image: url(assets/background.jpg)">
+      <div class="container  typeset">
+        <h1 id="bioinformatics-technology-lab">Bioinformatics Technology Lab</h1>
+<p>Led by Dr. Inanc Birol at <a href="http://www.bcgsc.ca/">BC Cancer’s Michael Smith Genome Sciences Centre</a></p>
+
+      <span style="font-size:10px;">
+      <a target="_blank" href="http://mkweb.bcgsc.ca/fun/hdtr/"> Photo by Martin Krzywinski </a>
+      </span>
+      </div>
+  </div>
+
 
 
 </header>

diff --git a/_site/news-content.html b/_site/news-content.html
@@ -29,9 +29,9 @@
 
 
 	</head>
-	<body class="layout-default">
+	<body style="margin-top:0px;" class="layout-">
+
 
-
 	<section class="section  typeset">
 		<ul class="list  list--posts">
 
@@ -102,6 +102,5 @@ <h4><a href="/software/2016/08/27/example-post-one.html">ABySS 2.0 released</a><
 	</section>
 
 
-
 	</body>
 </html>
diff --git a/_site/news.html b/_site/news.html
@@ -37,7 +37,7 @@
 	<body class="layout-blog  news">
 
 		<header class="header">
-  <div class="container">
+  <div class="topnav container">
 
     <a class="logo" href="/">
   <img src="/assets/logo.png" alt="Bioinformatics Technology Lab logo">

diff --git a/_site/projects.html b/_site/projects.html
@@ -32,7 +32,7 @@
 	<body class="layout-page  projects">
 
 		<header class="header">
-  <div class="container">
+  <div class="topnav container">
 
     <a class="logo" href="/">
   <img src="/assets/logo.png" alt="Bioinformatics Technology Lab logo">

diff --git a/_site/publications.html b/_site/publications.html
@@ -32,7 +32,7 @@
 	<body class="layout-page  publications">
 
 		<header class="header">
-  <div class="container">
+  <div class="topnav container">
 
     <a class="logo" href="/">
   <img src="/assets/logo.png" alt="Bioinformatics Technology Lab logo">

diff --git a/_site/software.html b/_site/software.html
@@ -32,7 +32,7 @@
 	<body class="layout-page  software">
 
 		<header class="header">
-  <div class="container">
+  <div class="topnav container">
 
     <a class="logo" href="/">
   <img src="/assets/logo.png" alt="Bioinformatics Technology Lab logo">

diff --git a/_site/software/2016/08/27/example-post-one.html b/_site/software/2016/08/27/example-post-one.html
@@ -34,7 +34,7 @@
 	<body class="layout-post  abyss-2-0-released">
 
 		<header class="header">
-  <div class="container">
+  <div class="topnav container">
 
     <a class="logo" href="/">
   <img src="/assets/logo.png" alt="Bioinformatics Technology Lab logo">

diff --git a/_site/softwareblurbs/FORMATTING-README.html b/_site/softwareblurbs/FORMATTING-README.html
@@ -32,7 +32,7 @@
 	<body class="layout-page">
 
 		<header class="header">
-  <div class="container">
+  <div class="topnav container">
 
     <a class="logo" href="/">
   <img src="/assets/logo.png" alt="Bioinformatics Technology Lab logo">

diff --git a/_site/sw.js b/_site/sw.js
@@ -1,4 +1,4 @@
-const version = '20180309161003';
+const version = '20180320134514';
 const cacheName = `static::${version}`;
 
 const buildContentBlob = () => {

diff --git a/index.md b/index.md
@@ -1,12 +1,12 @@
 ---
 title: Home
+layout: default
 feature_text: |
   # Bioinformatics Technology Lab   
   Led by Dr. Inanc Birol at [BC Cancer's Michael Smith Genome Sciences Centre](http://www.bcgsc.ca/) 
 feature_image: "assets/background.jpg"
 feature_credit: Photo by Martin Krzywinski
 feature_link: http://mkweb.bcgsc.ca/fun/hdtr/
-layout: default
 ---
 
 {% include site-header.html %}

diff --git a/members.md b/members.md
@@ -1,6 +1,12 @@
 ---
 layout: page
 title: Members
+feature_text: |
+  # Bioinformatics Technology Lab   
+  Led by Dr. Inanc Birol at [BC Cancer's Michael Smith Genome Sciences Centre](http://www.bcgsc.ca/) 
+feature_image: "assets/background.jpg"
+feature_credit: Photo by Martin Krzywinski
+feature_link: http://mkweb.bcgsc.ca/fun/hdtr/
 ---
 
 <img class="avatar" src="assets/avatars/ibirol.jpeg"> **Inanc Birol, Principal Investigator**  

diff --git a/news-content.html b/news-content.html
@@ -1,6 +1,35 @@
---- 
-layout: default 
---- 
+---
+---
+
+<!DOCTYPE html>
+<html lang="{{ site.lang | default: "en-US" }}">
+	<head>
+		<!-- General meta -->
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="icon" href="/favicon.png" type="image/x-icon">
+		<base target="_parent">
+
+		{% if page.indexing == false %}
+			<meta name="robots" content="noindex">
+		{% endif %}
+
+		{% if page.collectionpage %}
+			{% seo title=false %}
+
+			{% assign collectiondata = site.collections | where: "label", page.collectionpage | first %}
+			<title>{{ collectiondata.title }} - {{ site.title }}</title>
+			<meta property="og:title" content="{{ collectiondata.title }}">
+			<meta name="description" content="{{ collectiondata.description }}">
+			<meta property="og:description" content="{{ collectiondata.description }}">
+		{% else %}
+			{% seo %}
+		{% endif %}
+
+    <link rel="stylesheet" href="{{ "/assets/styles.css" | relative_url }}">
+
+		{% if site.avatarurl %}{% include site-favicons.html %}{% endif %}
+	</head>
+	<body style="margin-top:0px;" class="layout-{{ page.layout }}{% if page.title %}  {{ page.title | slugify }}{% endif %}">
 
 {% if paginator.posts %}
 	<section class="section  typeset">
@@ -34,3 +63,6 @@ <h4><a href="{{ site.baseurl }}{{ page.url }}">{{ page.title }}</a></h4>
 		</ul>
 	</section>
 {% endif %}
+
+	</body>
+</html>