Concatenate files of different resolutions (#307)

unify coding style

css/css.css

@@ -1,3 +1,12 @@
+html, body {
+  line-height: 1.5;
+  font-size: 16px;
+  color: #888888;
+  background-color: #060606;
+  margin: 0;
+  word-break: break-word;
+}
+
 .grid {
   display: grid;
   align-content: center;
@@ -26,21 +35,24 @@
   text-align: center;
 }
 
-@media only screen and (max-width: 999px)  {
+@media only screen and (max-width: 999px) {
-.grid {
+  .grid {
-  grid-template-columns: 1fr;
+    grid-template-columns: 1fr;
-  grid-template-areas:
+    grid-template-areas:
-  "header"
+    "header"
-  "sidebar"
+    "sidebar"
-  "content"
+    "content"
-  "footer";
+    "footer";
+  }
+  code {
+    word-break: break-all;
   }
 }
 
-@media only screen and (min-width: 1000px)   {
+@media only screen and (min-width: 1000px) {
   .grid {
     grid-gap: 1rem;
-    grid-template-columns: 30% auto;
+    grid-template-columns: 25% auto;
     grid-template-areas:
     "header  header"
     "sidebar content"
@@ -48,6 +60,29 @@
   }
 }
 
+@media only screen and (min-width: 1500px) {
+  .grid {
+    max-width: 70%;
+    margin: 0 auto;
+    grid-template-areas:
+    "header  header"
+    "sidebar content"
+    "footer  footer";
+  }
+}
+
+a {
+  color: #91cf91;
+}
+
+a:hover {
+  color: #5cb85c;
+}
+
+a:visited {
+  color: #449d44;
+}
+
 .license img {
   max-width: 10em;
   display: inline;
@@ -63,25 +98,37 @@ h1 {
 }
 
 h2 {
-  font-size: 3em;
+  font-size: 1.5em;
+  margin: 5px 8px 8px 8px;
+}
+
+.heading {
+  font-size: 2em;
+  margin: 6px 0px 12px 0px;
 }
 
 h3 {
-  font-size: 2em;
+  font-size: 1.5em;
+}
+
+h4 {
+  font-size: 1.2em;
 }
 
 .intro-lead {
   font-family: 'Montserrat', sans-serif;
-  font-size: 20px;
+  font-size: 1em;
-}
-
-.select-from {
-  font-size: 16px;
 }
 
 code {
-  word-break: break-all;
+  padding: 2px 4px;
+  color: #c7254e;
+  background-color: #f9f2f4;
+  border-radius: 4px;
   word-wrap: break-word;
+  max-width: 800px;
+  white-space: normal;
+  display: inline-block;
 }
 
 dd {
@@ -90,6 +137,10 @@ dd {
 
 dt {
   font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+  word-break: break-all;
+  word-wrap: break-word;
+  white-space: normal;
+  display: inline-block;
 }
 
 img {
@@ -100,67 +151,85 @@ img {
 }
 
 .sample-image {
+  margin: 0 auto;
   margin-bottom: 18px;
+  max-width: 500px;
+  text-align: center;
 }
 
+.sample-image-small {
+  margin: 0 auto;
+  margin-bottom: 18px;
+  max-width: 250px;
+  text-align: center;
+}
 
 div {
   font-family: 'Merriweather', serif;
   color: white;
 }
 
-.btn {
+.sidebar a {
-  margin: 8px;
+  text-decoration: none;
-  display: inline-block;
+}
-  vertical-align: middle;
+
-  -webkit-transform: translateZ(0);
+.recipe, .contents-list {
-  transform: translateZ(0);
+  color: white;
-  box-shadow: 0 0 1px rgba(0, 0, 0, 0);
+  background-color: #383838;
-  -webkit-backface-visibility: hidden;
+  padding: 14px;
-  backface-visibility: hidden;
+  font-family: "Montserrat";
-  -moz-osx-font-smoothing: grayscale;
+  letter-spacing: 0.05em;
+  border: 1px solid black;
+  cursor: pointer;
   position: relative;
-  padding-left: 2.5em;
+  padding-left: 2.8em;
-  -webkit-transition-duration: 0.3s;
+  transition: all .5s ease-out;
-  transition-duration: 0.3s;
-}
-
-.btn:before {
-  content: "💫";
-  position: absolute;
-  left: 1em;
-  padding: 0 1px;
-  -webkit-transform: translateZ(0);
-  transform: translateZ(0);
-  -webkit-transition-duration: 0.3s;
-  transition-duration: 0.3s;
-  -webkit-transition-property: transform;
-  transition-property: transform;
-  -webkit-transition-timing-function: ease-out;
-  transition-timing-function: ease-out;
-}
-
-.btn:hover:before, .btn:focus:before, .btn:active:before {
-  -webkit-transform: scale(1.3) translateZ(0);
-  transform: scale(1.3) translateZ(0);
 }
 
 .contents-list {
-  color: black;
+  font-size: 0.9em;
 }
 
-.contents-list:hover {
+nav .heading {
-  color: #2a9fd6;
+  word-break: normal;
+}
+
+.recipe {
+  display: block;
+  width: 90%;
+}
+
+.recipe:hover, .contents-list:hover {
+  background-color: #449d44;
+}
+
+.recipe:before {
+  content: "💫";
 }
 
 .contents-list:before {
-  content: "📼"
+  content: "📼";
+}
+
+.recipe:before, .contents-list:before {
+  position: absolute;
+  left: 1em;
+  padding-right: 1em;
+}
+
+.recipe:hover:before, .recipe:focus:before, .recipe:active:before {
+  transform: scale(1.5) translateX(0.1em);
+  transition: 0.5s;
+}
+
+.contents-list:hover:before, .contents-list:focus:before, .contents-list:active:before {
+  transform: scale(1.8) translateX(0.3em);
+  transition: 0.5s;
 }
 
 .codeblock {
   font-family: monospace
   padding: 2px 4px;
-  font-size: 90%;
   color: #c7254e;
   background-color: #f9f2f4;
   border-radius: 4px;
@@ -173,3 +242,30 @@ div {
 .footnote {
   font-size: 90%;
 }
+
+.well {
+  padding: 1em;
+  margin-bottom: 0.5em;
+  background-color: #151515;
+  border: 1px solid #030303;
+  border-radius: 8px;
+  box-shadow: inset 0 1px 1px rgba(0,0,0,0.05);
+}
+
+.hiding {
+  opacity: 0;
+  height: 0;
+  overflow: hidden;
+}
+
+input {
+  position: absolute;
+  left: -999em;
+}
+
+input[type=checkbox]:checked + div {
+  opacity: 1;
+  height: auto;
+  overflow: hidden;
+  transition: opacity .5s linear, height .5s linear;
+}

js/js.js

@@ -1,24 +1,21 @@
 $(document).ready(function() {
 
-  $(function () {
-    $('[data-toggle="tooltip"]').tooltip()
-  });
-
   // open recipe window if a hash is found in URL
   if(window.location.hash) {
     id = window.location.hash
-    $(id).collapse('show');
+    console.log(id.substring(1))
+    document.getElementById(id.substring(1)).checked = true;
     $('html, body').animate({ scrollTop: $(id).offset().top}, 1000);
-    $(id + " .link").empty();
+    $(id).closest('div').find('.link').empty();
-    $(id + " .link").append("<small>Link to this command: <a href="+window.location.href+">"+window.location.href+"</a></small>");
+    $(id).closest('div').find('.link').append("<small>Link to this command: <a href='https://amiaopensource.github.io/ffmprovisr/index.html"+window.location.hash+"'>https://amiaopensource.github.io/ffmprovisr/index.html"+window.location.hash+"</a></small>");
   }
 
   // add hash URL when recipe is opened
-  $('span[data-toggle="collapse"]').on("click", function(){
+  $('label[class="recipe"]').on("click", function(){
-    id = $(this).attr("data-target");
+    id = $(this).attr("for");
-    window.location.hash = id
+    window.location.hash = ('#' + id)
-    $(id + " .link").empty();
+    $('#' + id).closest('div').find('.link').empty();
-    $(id + " .link").append("<small>Link to this command: <a href="+window.location.href+">"+window.location.href+"</a></small>");
+    $('#' + id).closest('div').find('.link').append("<small>Link to this command: <a href='https://amiaopensource.github.io/ffmprovisr/index.html"+window.location.hash+"'>https://amiaopensource.github.io/ffmprovisr/index.html"+window.location.hash+"</a></small>");
   });
 
 });

readme.md

@@ -44,7 +44,7 @@ You can read our contributor code of conduct [here](https://github.com/amiaopens
 
 ## Maintainers
 
-[Ashley Blewer](https://github.com/ablwr), [Katherine Frances Nagels](https://github.com/kfrn), [Kieran O'Leary](https://github.com/kieranjol) and [Reto Kromer](https://github.com/retokromer)
+[Ashley Blewer](https://github.com/ablwr), [Katherine Frances Nagels](https://github.com/kfrn), [Kieran O'Leary](https://github.com/kieranjol), [Reto Kromer](https://github.com/retokromer) and [Andrew Weaver](https://github.com/privatezero)
 
 ## Contributors
 * Gathered using [octohatrack](https://github.com/LABHR/octohatrack)
@@ -104,4 +104,6 @@ All Contributors: 22
 
 ## License
 
-<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/80x15.png" /></a><br />This <span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/InteractiveResource" rel="dct:type">work</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://amiaopensource.github.io/ffmprovisr/" property="cc:attributionName" rel="cc:attributionURL">ffmprovisr</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.<br />Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="https://github.com/amiaopensource/ffmprovisr" rel="dct:source">https://github.com/amiaopensource/ffmprovisr</a>.
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/80x15.png"></a><br>
+This <span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/InteractiveResource" rel="dct:type">work</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://amiaopensource.github.io/ffmprovisr/" property="cc:attributionName" rel="cc:attributionURL">ffmprovisr</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.<br>
+Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="https://github.com/amiaopensource/ffmprovisr" rel="dct:source">https://github.com/amiaopensource/ffmprovisr</a>.

scripts/check_audio_framemd5.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
   SCRIPT=$(basename "${0}")
- VERSION='2017-07-08'
+ VERSION="2018-02-10"
-  AUTHOR='ffmprovisr'
+  AUTHOR="ffmprovisr"
-     RED='\033[1;31m'
+     RED="\033[1;31m"
-    BLUE='\033[1;34m'
+    BLUE="\033[1;34m"
-      NC='\033[0m'
+      NC="\033[0m"
 
-if [[ "${OSTYPE}" = "cygwin" ]] || [ ! $(which diff) ]; then
+if [[ "${OSTYPE}" = "cygwin" ]] || [[ ! "$(which diff)" ]]; then
     echo -e "${RED}Error: 'diff' is not installed by default. Please install 'diffutils' from Cygwin.${NC}"
     exit 1
 fi
@@ -67,9 +67,8 @@ old_file=$(grep -v '^#' "${input_hash}")
 tmp_file=$(grep -v '^#' "${md5_tmp}")
 if [[ "${old_file}" = "${tmp_file}" ]]; then
     echo -e "${BLUE}'$(basename "${input_file}")' matches '$(basename "${input_hash}")'${NC}"
-    rm "${md5_tmp}"
 else
     echo -e "${RED}The following differences were detected between '$(basename "${input_file}")' and '$(basename "${input_hash}")':${NC}"
     diff "${input_hash}" "${md5_tmp}"
-    rm "${md5_tmp}"
 fi
+rm "${md5_tmp}"

scripts/check_video_framemd5.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
   SCRIPT=$(basename "${0}")
- VERSION='2017-07-08'
+ VERSION="2018-02-10"
-  AUTHOR='ffmprovisr'
+  AUTHOR="ffmprovisr"
-     RED='\033[1;31m'
+     RED="\033[1;31m"
-    BLUE='\033[1;34m'
+    BLUE="\033[1;34m"
-      NC='\033[0m'
+      NC="\033[0m"
 
-if [[ "${OSTYPE}" = "cygwin" ]] || [ ! $(which diff) ]; then
+if [[ "${OSTYPE}" = "cygwin" ]] || [[ ! "$(which diff)" ]]; then
     echo -e "${RED}Error: 'diff' is not installed by default. Please install 'diffutils' from Cygwin.${NC}"
     exit 1
 fi
@@ -64,9 +64,8 @@ old_file=$(grep -v '^#' "${input_hash}")
 tmp_file=$(grep -v '^#' "${md5_tmp}")
 if [[ "${old_file}" = "${tmp_file}" ]]; then
     echo -e "${BLUE}'$(basename "${input_file}")' matches '$(basename "${input_hash}")'${NC}"
-    rm "${md5_tmp}"
 else
     echo -e "${RED}The following differences were detected between '$(basename "${input_file}")' and '$(basename "${input_hash}")':${NC}"
     diff "${input_hash}" "${md5_tmp}"
-    rm "${md5_tmp}"
 fi
+rm "${md5_tmp}"

scripts/ffmprovisr

@@ -10,7 +10,7 @@ if [[ "$(uname -s)" = "Darwin" ]] ; then
     else
         ffmprovisr_path=$(find /usr/local/Cellar/ffmprovisr -iname 'index.html' | sort -M | tail -n1)
     fi
-    if [ -n "${default_browser}" ] ; then
+    if [[ -n "${default_browser}" ]] ; then
         open -b "${default_browser}" "${ffmprovisr_path}"
     else
         open "${ffmprovisr_path}"