projects / rnaseq-cwl-training.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 56c5047)
Merge pull request #340 from tracykteal/calendar
authorRaniere Silva <raniere@rgaiacs.com>
Wed, 15 Aug 2018 16:20:42 +0000 (17:20 +0100)
committerGitHub <noreply@github.com>
Wed, 15 Aug 2018 16:20:42 +0000 (17:20 +0100)
added workshop calendar

_layouts/base.html patch | blob | history
assets/css/lesson.scss patch | blob | history

diff --git a/_layouts/base.html b/_layouts/base.html
index 99d6567434a839aaeb0ad1f08f701c1483098af9..8a2e4b5134a8857d377f6bd7c2e7bc3a2cfaf119 100644 (file)
--- a/_layouts/base.html
+++ b/_layouts/base.html
@@ -1,5 +1,21 @@
 ---
 ---
+
+{% comment %}
+When rendering websites locally, `site.github.url` doesn't get resolved
+properly unless GitHub PAT are set up and available in the environment.
+This leads to warnings and errors when trying to serve the site locally.
+To work around this, we use the `jekyll.environment` variable which is set to
+`development` when rendering the site locally, and set to `production` on
+GitHub where `site.github.url` will be defined.
+{% endcomment %}
+
+{% if jekyll.environment == "development" %}
+{% assign search_domain_url = "" %}
+{% elsif jekyll.environment == "production" %}
+{% assign search_domain_url = site.github.url  %}
+{% endif %}
+
 <!doctype html>
 <html lang="en">
   <head>
@@ -8,7 +24,7 @@
     <meta http-equiv="last-modified" content="{{ site.time }}">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <!-- meta "search-domain" used for google site search function google_search() -->
-    <meta name="search-domain" value="{{ site.github.url }}">
+    <meta name="search-domain" value="{{ search_domain_url }}">
     <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/bootstrap.css" />
     <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/bootstrap-theme.css" />
     <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/lesson.css" />
diff --git a/assets/css/lesson.scss b/assets/css/lesson.scss
index 8a7b29548dd218d86ad411a27ecee7b255737f45..0a2ecc6b0e4ebab683cbb10bd73b3c4afcf17208 100644 (file)
--- a/assets/css/lesson.scss
+++ b/assets/css/lesson.scss
@@ -29,10 +29,10 @@ $color-testimonial: #fc8dc1 !default;
 //----------------------------------------
 
 @mixin cdSetup($color) {
-  color: $color;
-  border-left: solid 5px $color;
-  margin-bottom: 0px;
-  border-radius: 4px 0 0 4px;
+    color: $color;
+    border-left: solid 5px $color;
+    margin: 15px;
+    border-radius: 4px 0 0 4px;
 }
 
 .error  { @include cdSetup($color-error); }
@@ -81,8 +81,11 @@ $codeblock-padding: 5px !default;
   padding-right: 0;
   border: 1px solid;
   border-color: $color;
+  border-radius: 4px;
   padding-bottom: $codeblock-padding;
 
+  margin: 15px;
+
   h2 {
     padding-top: $codeblock-padding;
     padding-bottom: $codeblock-padding;
@@ -126,6 +129,10 @@ $codeblock-padding: 5px !default;
 font-size: 18px;
 }
 
+blockquote p {
+    margin: 5px;
+}
+
 //----------------------------------------
 // Override Bootstrap settings.
 //----------------------------------------