Clean up files, add samples, adjust gulp

joedf · Aug 20, 2018 · acda4bf · acda4bf
1 parent 9a350a4
commit acda4bf
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 42 deletions.
diff --git a/SOL Samples/InfectonatorSurvivors76561198009932603.sol b/SOL Samples/InfectonatorSurvivors76561198009932603.sol
diff --git a/SOL Samples/JY1.sol b/SOL Samples/JY1.sol
diff --git a/app/css/main.css b/app/css/main.css
@@ -18,8 +18,7 @@
         url(https://fonts.gstatic.com/s/lato/v11/9k-RPmcnxYEPm8CNFsH2gg.woff)
             format('woff');
     src: local('Lato Regular'), local('Lato-Regular'),
-        url('https://mariani.life/projects/minerva/font/Lato-Regular.woff')
-            format('woff');
+        url('../font/Lato-Regular.woff') format('woff');
     unicode-range: U+0000-00ff, U+0131, U+0152-0153, U+02c6, U+02da, U+02dc,
         U+2000-206f, U+2074, U+20ac, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
 }

diff --git a/app/js/main.js b/app/js/main.js
@@ -347,20 +347,6 @@ $(function() {
         );
     }
 
-    // Alert Chrome x64 users of issues - Fixed in v56+
-    // Chrome x64 dies when using Array.apply on large array
-    // https://code.google.com/p/chromium/issues/detail?id=252492
-    if (
-        navigator.userAgent.indexOf('x64') != -1 &&
-        navigator.userAgent.indexOf('Chrome') != -1 &&
-        parseInt(navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./)[2], 10) <
-            56
-    ) {
-        msg_array.push(
-            '<p>Hello Chrome x64 user, please be aware that Chrome x64 below version 56 does not handle converting large arrays within web workers. It will error out before completing, leaving you with an empty file. Please use either Firefox, Chrome x32, or another modern browser until this bug is fixed. <a style="text-decoration:underline;"  href="https://code.google.com/p/chromium/issues/detail?id=252492" target="_blank" rel="noopener">Chrome Bug #252492</a></p>'
-        );
-    }
-
     if (msg_array.length > 0) Alert.show(msg_array.join('<hr/>'), Alert.NOTICE);
 
     // Pinned Site detection
@@ -379,32 +365,6 @@ $(function() {
         // Site mode is not supported.
     }
 
-    // Periodically reload Google Ads
-    /*console.info('start ad');
-    var googletag = googletag || {};
-    googletag.cmd = googletag.cmd || [];
-    googletag.cmd.push(function() {
-        console.info('define ad');
-        // Define the ad slot
-        var slot1 = googletag
-            .defineSlot('3734585686/', [728, 90], 'leaderboard')
-            .addService(googletag.pubads());
-
-        // Start ad fetching
-        googletag.enableServices();
-        googletag.display('leaderboard');
-
-        // Set timer to refresh slot every 30 seconds
-        setInterval(function() {
-            console.info('refresh ad');
-            googletag.pubads().refresh([slot1]);
-        }, 30000);
-    });*/
-
-    /*
-    <ins class="adsbygoogle" style="display:inline-block;width:728px;height:90px" data-ad-client="ca-pub-4393629565174725" data-ad-slot="3734585686">Ad</ins>
-    */
-
     ////////////////
     // Navigation //
     ////////////////

diff --git a/gulpfile.js b/gulpfile.js
@@ -199,6 +199,7 @@ gulp.task('fix-js', function() {
 gulp.task('fix-css', function() {
     gulp.src(['dist/css/bundle.css'])
         .pipe(replace('url(img/', `url(${cdnPath}img/`))
+        .pipe(replace('url(\'../', `url(${cdnPath}/`))
         .pipe(gulp.dest('dist/css'));
 });