Merge pull request #15 from twisterarmy/theme-nin-original

Theme nin original
twisterarmy · May 9, 2021 · 0155fae · 0155fae
2 parents 04eeb07 + 4eb5c10
commit 0155fae
Show file tree

Hide file tree

Showing 53 changed files with 8,832 additions and 2 deletions.
diff --git a/js/interface_common.js b/js/interface_common.js
@@ -2747,6 +2747,12 @@ function changeStyle() {
         // we use .ajax because .getScript requires 'unsafe-inline' CSP rule for now, see https://github.com/jquery/jquery/issues/3969
         $.ajax({dataType: 'text', url: 'theme_nin/js/theme_option.js'})
             .done(function(res) {eval(res);});
+    } else if (theme === 'nin_original') {
+        theme = 'nin'; // related to native theme in class definitions, so easiest way to integrate original version
+        style = 'theme_nin_original/css/style.css';
+        profile = 'theme_nin_original/css/profile.css';
+        $.ajax({dataType: 'text', url: 'theme_nin_original/js/theme_option.js'})
+            .done(function(res) {eval(res);});
     } else if (theme === 'calm') {
         style = 'theme_calm/css/style.css';
         profile = 'theme_calm/css/profile.css';

diff --git a/js/twister_io.js b/js/twister_io.js
@@ -425,8 +425,20 @@ function getAvatar(peerAlias, img) {
         return;
 
     if (peerAlias === 'nobody') {
-        img.attr('src', ($.Options.theme.val === 'nin') ?
-            'theme_nin/img/tornado_avatar.png' : 'img/tornado_avatar.png');
+
+        var avatar = 'img/tornado_avatar.png';
+
+        switch ($.Options.theme.val) {
+          case 'nin':
+            avatar = 'theme_nin/img/tornado_avatar.png';
+          break;
+          case 'nin_original':
+            avatar = 'theme_nin_original/img/tornado_avatar.png';
+          break;
+        }
+
+        img.attr('src', avatar);
+
         return;
     }
 

diff --git a/theme_nin_original/css/Symbola.ttf b/theme_nin_original/css/Symbola.ttf
diff --git a/theme_nin_original/css/fonts/DroidSerif-Italic.ttf b/theme_nin_original/css/fonts/DroidSerif-Italic.ttf
diff --git a/theme_nin_original/css/fonts/fontello/fontello.eot b/theme_nin_original/css/fonts/fontello/fontello.eot
diff --git a/theme_nin_original/css/fonts/fontello/fontello.svg b/theme_nin_original/css/fonts/fontello/fontello.svg
diff --git a/theme_nin_original/css/fonts/fontello/fontello.ttf b/theme_nin_original/css/fonts/fontello/fontello.ttf
diff --git a/theme_nin_original/css/fonts/fontello/fontello.woff b/theme_nin_original/css/fonts/fontello/fontello.woff
diff --git a/theme_nin_original/css/fonts/ionicons/ionicons.eot b/theme_nin_original/css/fonts/ionicons/ionicons.eot