Merge pull request #338 from amiaopensource/weaver-branch

Weaver branch

code_of_conduct.md

@@ -43,8 +43,8 @@ incident.
 
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.3.0, available at
-[http://contributor-covenant.org/version/1/3/0/][version]
+version 1.4.1, available at
+[https://www.contributor-covenant.org/version/1/4/code-of-conduct.html][version]
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/3/0/
+[homepage]: https://www.contributor-covenant.org/
+[version]: https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

css/css.css

@@ -1,6 +1,7 @@
 html, body {
   line-height: 1.5;
-  font-size: 16px;
+  font-size: 18px;
+  font-family: sans-serif;
   color: #888888;
   background-color: #060606;
   margin: 0;
@@ -88,9 +89,6 @@ a:visited {
   display: inline;
 }
 
-h1, h2, h3, h4, h5, h6 {
-  font-family: 'Montserrat', sans-serif;
-}
 
 h1 {
   letter-spacing: 0.1em;
@@ -116,7 +114,6 @@ h4 {
 }
 
 .intro-lead {
-  font-family: 'Montserrat', sans-serif;
   font-size: 1em;
 }
 
@@ -165,7 +162,6 @@ img {
 }
 
 div {
-  font-family: 'Merriweather', serif;
   color: white;
 }
 
@@ -177,7 +173,6 @@ div {
   color: white;
   background-color: #383838;
   padding: 14px;
-  font-family: "Montserrat";
   letter-spacing: 0.05em;
   border: 1px solid black;
   cursor: pointer;

js/js.js

@@ -18,4 +18,10 @@ $(document).ready(function() {
     $('#' + 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>");
   });
 
+  $('#open-all').on("click", function(){
+    $('input[type=checkbox]').each(function(){
+      this.checked = !this.checked;
+    })
+  });
+
 });

readme.md

@@ -44,15 +44,18 @@ 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), [Reto Kromer](https://github.com/retokromer) and [Andrew Weaver](https://github.com/privatezero)
+[Ashley Blewer](https://github.com/ablwr), [Katherine Frances Nagels](https://github.com/kfrn), [Kieran O'Leary](https://github.com/kieranjol) and [Andrew Weaver](https://github.com/privatezero)
 
 ## Contributors
 * Gathered using [octohatrack](https://github.com/LABHR/octohatrack)
 
-*GitHub Contributors*:  
+*Code Contributors*:
 ablwr (Ashley)  
+bastibeckr (Basti Becker)  
+bturkus  
 dericed (Dave Rice)  
 edsu (Ed Summers)  
+jamessam (Jim Sam)  
 jfarbowitz (Jonathan Farbowitz)  
 kfrn (Katherine Frances Nagels)  
 kgrons (Kathryn Gronsbell)  
@@ -62,17 +65,23 @@ pjotrek-b (Peter B.)
 privatezero (Andrew Weaver)  
 retokromer (Reto Kromer)  
 rfraimow  
-  
-*All Contributors*:  
+
+*All Contributors*:
 ablwr (Ashley)  
 audiovisualopen  
+bastibeckr (Basti Becker)  
 brainwane (Sumana Harihareswara)  
 bturkus  
 dericed (Dave Rice)  
+drodz11 (Dave Rodriguez)  
 edsu (Ed Summers)  
+EG-tech (Ethan Gates)  
+federicomenaquintero (Federico Mena Quintero)  
 Fizz24  
+GregH18  
 jamessam (Jim Sam)  
 jfarbowitz (Jonathan Farbowitz)  
+JonnyTech  
 jronallo (Jason Ronallo)  
 kellyhaydon (metacynic)  
 kfrn (Katherine Frances Nagels)  
@@ -80,16 +89,19 @@ kgrons (Kathryn Gronsbell)
 kieranjol (Kieran O'Leary)  
 llogan (Lou)  
 mulvya  
+nkrabben (Nick Krabbenhoeft)  
 pjotrek-b (Peter B.)  
 privatezero (Andrew Weaver)  
 retokromer (Reto Kromer)  
 rfraimow  
 richardpl (Paul B Mahol)  
+ross-spencer (Ross Spencer)  
 todrobbins (Tod Robbins)  
-  
+
 Repo: amiaopensource/ffmprovisr  
-GitHub Contributors: 12  
-All Contributors: 22  
+Code Contributors: 15  
+All Contributors: 30   
+Last updated: 2018-04-22 (4:2:2 Day)  
 
 ## AVHack Team
 
@@ -99,6 +111,7 @@ All Contributors: 22
 
 ## Sister projects
 
+[The Cable Bible](https://amiaopensource.github.io/cable-bible/): A Guide to Cables and Connectors Used for Audiovisual Tech  
 [Script Ahoy](http://dd388.github.io/crals/): Community Resource for Archivists and Librarians Scripting  
 [sourcecaster](https://datapraxis.github.io/sourcecaster/): helps you use the command line to work through common challenges that come up when working with digital primary sources.