Merge branch 'master' into gh-pages

Author: Justin M

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 ## Please Contribute!
 
-* I would like to add unit tests before modifying any of the comparing/highlighting logic
 * Please make sure there is an issue reported before creating a pull request
+* Pull requests should be directed at fixing a previously reported issue.
 * Please follow similar syntax conventions
 * setup steps are [in the readme](https://github.com/justspamjustin/online-json-diff/blob/master/README.md#setup)

README.md

@@ -1,6 +1,6 @@
 # online-json-diff
 
-http://json-diff.com
+https://json-diff.com
 
 ![screenshot](https://raw.github.com/justspamjustin/online-json-diff/master/img/screen.png)
 

css/main.css

@@ -183,21 +183,6 @@ h2 {
   display: block;
 }
 
-.carbon-img {
-  text-align: center;
-  padding-bottom: 12px;
-}
-
-.carbon-text {
-  color: #e4e4e4;
-  font-size: 12px;
-}
-
-.carbon-poweredby {
-  color: #9a9a9a;
-  font-size: 10px;
-}
-
 .diff-inputs {
   width: calc(100% - 200px);
   float: left;
@@ -281,13 +266,8 @@ body.lighttheme {
   border-right-width: 1px;
 }
 
-.lighttheme #carbonads {
-  background-color: transparent;
-  border: solid 2px #dddddd;
-}
-
-.lighttheme .carbon-text {
-  color: #1D1F21;
+.lighttheme .ad-container * {
+  color: #1D1F21 !important;
 }
 
 button {

index.html

@@ -50,15 +50,14 @@ <h2 class="left">Online JSON Compare</h2>
 
       </div>
       <div class="ad-container">
-        <div id="carbonads">
-          <span>
-            <span id="ad-wrap" class="carbon-wrap">
-              <a href="https://blitapp.com?ref=json-diff-txt" class="carbon-text" target="_blank" rel="noopener">Screenshots of websites to your inbox. Try it free.</a>
-            </span>
-          </span>
-        </div>
+        <!-- BEGIN COPY CODEFUND EMBED -->
+        <div id="codefund"></div>
+        <script
+          src="https://app.codefund.io/properties/700/funder.js"
+          async
+        ></script>
+        <!-- END COPY CODEFUND EMBED -->
       </div>
-      <div class="made-by-text"><a href="https://blitapp.com?ref=json-diff" target="_blank" rel="noopener noreferrer">made with ♥ by <img src="img/blit_logo.svg"/></a></div>
     </div>
     <div class="diff-inputs">
       <div id="left-input" class="json-diff-input split">