Merge pull request #250 from amiaopensource/moves-cc-img

moves cc-by img into repo

css/css.css

@@ -1,7 +1,84 @@
+.grid {
+  display: grid;
+  align-content: center;
+  grid-template-areas:
+   "header"
+   "sidebar"
+   "content"
+   "footer";
+}
+
+.header {
+  grid-area: header;
+  text-align: center;
+}
+
+.content {
+  grid-area: content;
+}
+
+.sidebar {
+  grid-area: sidebar;
+}
+
+.footer {
+  grid-area: footer;
+  text-align: center;
+}
+
+@media only screen and (max-width: 999px)  {
+.grid {
+  grid-template-columns: 1fr;
+  grid-template-areas:
+  "header"
+  "sidebar"
+  "content"
+  "footer";
+  }
+}
+
+@media only screen and (min-width: 1000px)   {
+  .grid {
+    grid-gap: 1rem;
+    grid-template-columns: 30% auto;
+    grid-template-areas:
+    "header  header"
+    "sidebar content"
+    "footer  footer";
+  }
+}
+
+.license img {
+  max-width: 10em;
+  display: inline;
+}
+
 h1, h2, h3, h4, h5, h6 {
   font-family: 'Montserrat', sans-serif;
 }
 
+h1 {
+  letter-spacing: 0.1em;
+  font-size: 7vw;
+}
+
+h2 {
+  font-size: 3em;
+}
+
+h3 {
+  font-size: 2em;
+}
+
+.intro-lead {
+  font-family: 'Montserrat', sans-serif;
+  font-size: 20px;
+}
+
+.select-from {
+  font-size: 16px;
+}
+
 code {
   word-break: break-all;
   word-wrap: break-word;
@@ -26,11 +103,6 @@ img {
   margin-bottom: 18px;
 }
 
-h1 {
-  letter-spacing: 8px;
-  font-size: 86px;
-  line-height: 120px;
-}
 
 div {
   font-family: 'Merriweather', serif;
@@ -73,6 +145,18 @@ div {
   transform: scale(1.3) translateZ(0);
 }
 
+.contents-list {
+  color: black;
+}
+
+.contents-list:hover {
+  color: #2a9fd6;
+}
+
+.contents-list:before {
+  content: "📼"
+}
+
 .codeblock {
   font-family: monospace
   padding: 2px 4px;
@@ -89,15 +173,3 @@ div {
 .footnote {
   font-size: 90%;
 }
-
-@media only screen and (min-width: 576px) {
-  img {
-    max-width: 60%;
-  }
-}
-
-@media only screen and (min-width: 992px) {
-  img {
-    width: 100%;
-  }
-}

js/js.js

@@ -4,25 +4,21 @@ $(document).ready(function() {
     $('[data-toggle="tooltip"]').tooltip()
   });
 
-  // open modal window if a hash is found in URL
+  // open recipe window if a hash is found in URL
   if(window.location.hash) {
-    $(window.location.hash).modal('show');
-    // add direct link to modal window
-    $(".link").empty();
-    $(".link").append("<small>Link to this command: <a href="+window.location.href+">"+window.location.href+"</a></small>");
+    id = window.location.hash
+    $(id).collapse('show');
+    $('html, body').animate({ scrollTop: $(id).offset().top}, 1000);
+    $(id + " .link").empty();
+    $(id + " .link").append("<small>Link to this command: <a href="+window.location.href+">"+window.location.href+"</a></small>");
   }
 
-  // add hash to URL when modal is opened
-  $('span[data-toggle="modal"]').on("click", function(){
-    window.location.hash = $(this).attr("data-target");
-    // add direct link to modal window
-    $(".link").empty();
-    $(".link").append("<small>Link to this command: <a href="+window.location.href+">"+window.location.href+"</a></small>");
-  });
-
-  // remove hash from URL when modal is closed
-  $(document).on('hide.bs.modal', function (e) {
-    history.pushState("", document.title, window.location.pathname);
+  // add hash URL when recipe is opened
+  $('span[data-toggle="collapse"]').on("click", function(){
+    id = $(this).attr("data-target");
+    window.location.hash = id
+    $(id + " .link").empty();
+    $(id + " .link").append("<small>Link to this command: <a href="+window.location.href+">"+window.location.href+"</a></small>");
   });
 
 });

scripts/ffmprovisr

@@ -1,14 +1,14 @@
 #!/usr/bin/env bash
 
-# This allows to open ffmprovisr locally from the terminal.
+# This allows to open the online version of the ffmprovisr, when the computer is
+# connected to the Web, and the local version otherwise.
 
 if [[ "$(uname -s)" = "Darwin" ]] ; then
     default_browser=$(plutil -convert json ~/Library/Preferences/com.apple.LaunchServices/com.apple.launchservices.secure.plist -r -o - | grep https -b1 | tail -n1 | cut -d'"' -f4)
-    if [ -d /usr/local/Cellar/ffmprovisr ] ; then
-        ffmprovisr_path=$(find /usr/local/Cellar/ffmprovisr -iname 'index.html' | sort -M | tail -n1)
-    fi
-    if [ -z "${ffmprovisr_path}" ] ; then
+    if ping -c 1 amiaopensource.github.io >/dev/null 2>&1 ; then
         ffmprovisr_path='https://amiaopensource.github.io/ffmprovisr/'
+    else
+        ffmprovisr_path=$(find /usr/local/Cellar/ffmprovisr -iname 'index.html' | sort -M | tail -n1)
     fi
     if [ -n "${default_browser}" ] ; then
         open -b "${default_browser}" "${ffmprovisr_path}"
@@ -16,11 +16,12 @@ if [[ "$(uname -s)" = "Darwin" ]] ; then
         open "${ffmprovisr_path}"
     fi
 elif [[ "$(uname -s)" = "Linux" ]] ; then
-    if [ -d ~/.linuxbrew/Cellar/ffmprovisr ] ; then
+    if ping -c 1 amiaopensource.github.io >/dev/null 2>&1 ; then
+        ffmprovisr_path='https://amiaopensource.github.io/ffmprovisr/'
+    else
         ffmprovisr_path=$(find ~/.linuxbrew/Cellar/ffmprovisr -iname 'index.html' | sort -M | tail -n1)
     fi
-    if [ -z "${ffmprovisr_path}" ] ; then
-        ffmprovisr_path='https://amiaopensource.github.io/ffmprovisr/'
-    fi
     xdg-open "${ffmprovisr_path}"
+else
+    echo "Please locate the 'ffmprovisr' folder, and open the 'index.html' file in a browser."
 fi