Merge pull request #271 from TakosThings/develop

3.16.4 Close #216 Close #267
TakosThings · Aug 15, 2021 · 5a83111 · 5a83111
2 parents 29a6eb4 + 450a6a2
commit 5a83111
Show file tree

Hide file tree

Showing 10 changed files with 174 additions and 116 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 Newest Changes are at the top
 
+#### 3.16.4
+* **Fixes**
+  * The theme will now only replace icons when English is the selected language. Default icons will be used in their stead.
+  * Some missing icons when English simplified is the selected language
+
 #### 3.16.3
 * **Notes**
   * Some fixes in this release may not work for you due to a Discord A/B test (See issue [#267](https://github.com/TakosThings/Metro-for-Discord/issues/267))

diff --git a/src/components/betterdiscord/_meta.scss b/src/components/betterdiscord/_meta.scss
@@ -1,7 +1,7 @@
 /**
  * @name Metro for Discord
  * @author Tako
- * @version 3.16.3
+ * @version 3.16.4
  * @description The Metro theme for Discord
  * @source https://github.com/TakosThings/Metro-for-Discord
 */
diff --git a/src/components/core/_version_info.scss b/src/components/core/_version_info.scss
@@ -1,7 +1,7 @@
 .theme-dark .container-2lgZY8,
 .theme-dark .layer-3QrUeG[aria-label="USER_SETTINGS"] .info-1VyQPT{
     &::before{
-        content: "Metro for Discord \A Version 3.16.3";
+        content: "Metro for Discord \A Version 3.16.4";
     }
 }
 

diff --git a/src/components/home/friends/_table.scss b/src/components/home/friends/_table.scss
@@ -36,29 +36,7 @@
                     &:hover{
                         background-color: $ListLow;
                     }
-                    svg{
-                        display: none;
-                    }
-                    &::before{
-                        color: $BaseHigh;
-                        @include FontIcon;
-                        font-size: 16px;
-                    }
-                    &[aria-label="Message"]::before{
-                        content: "\E8BD";
-                    }
-                    &[aria-label="More"]::before{
-                        content: "\E712";
-                    }
-                    &[aria-label="Accept"]::before{
-                        content: "\E8FB";
-                    }
-                    &[aria-label="Ignore"]::before{
-                        content: "\E711";
-                    }
-                    &[aria-label="Unblock"]::before{
-                        content: "\E711";
-                    }
+
                 }
 
             }
@@ -152,3 +130,32 @@
         }
     }
 }
+
+// Replace icons
+html[lang^="en-"].theme-dark .container-1D34oG{
+    .actionButton-uPB8Fs{
+        svg{
+            display: none;
+        }
+        &::before{
+            color: $BaseHigh;
+            @include FontIcon;
+            font-size: 16px;
+        }
+        &[aria-label="Message"]::before{
+            content: "\E8BD";
+        }
+        &[aria-label="More"]::before{
+            content: "\E712";
+        }
+        &[aria-label="Accept"]::before{
+            content: "\E8FB";
+        }
+        &[aria-label="Ignore"]::before{
+            content: "\E711";
+        }
+        &[aria-label="Unblock"]::before{
+            content: "\E711";
+        }
+    }
+}
diff --git a/src/components/home/friends/_toolbar.scss b/src/components/home/friends/_toolbar.scss
@@ -57,8 +57,10 @@
             width: 68px;
             height: 40px;
             margin: 0;
-            > svg{
-                display: none;
+            > svg{ // Non-EN position fix
+                position: absolute;
+                top: 6px;
+                left: 22px;
             }
             &:hover{
                 background-color: $ListLow;
@@ -93,6 +95,10 @@
             display: none;
         }
     }
+}
+
+
+html[lang^="en-"].theme-dark .container-1D34oG .container-1r6BKw{
     div[aria-label="New group DM"]::before{
         content: "\E902";
     }

diff --git a/src/components/notices/_language.scss b/src/components/notices/_language.scss
@@ -1,45 +1,45 @@
-html[lang="da"],    // Danish
-html[lang="de"],    // German
-html[lang="es-ES"], // Spanish
-html[lang="fr"],    // French
-html[lang="hr"],    // Croatian
-html[lang="it"],    // Italian
-html[lang="lt"],    // Lithuanian
-html[lang="hu"],    // Hungary
-html[lang="nl"],    // Dutch
-html[lang="no"],    // Norwegian
-html[lang="pl"],    // Polish
-html[lang="pt-BR"], // Portuguese, Brazilian
-html[lang="ro"],    // Romanian
-html[lang="fi"],    // Finnish
-html[lang="sv-SE"], // Sweden
-html[lang="vi"],    // Vietnamese
-html[lang="tr"],    // Turkish
-html[lang="cs"],    // Czech
-html[lang="el"],    // Greek
-html[lang="bg"],    // Bulgarian
-html[lang="ru"],    // Russian
-html[lang="uk"],    // Ukrainian
-html[lang="th"],    // Thai
-html[lang="zh-CN"], // Chinese
-html[lang="ja"],    // Japanese
-html[lang="zh-TW"], // Chinese/Taiwan
-html[lang="ko"]{    // Korea
-    .app-2rEoOp{
-        padding-top: 32px;
-        &::after{
-            content: "This theme requires English to be the selected Language. Press 'CTRL + comma' to open your settings.";
-            height: 32px;
-            width: 100%;
-            position: absolute;
-            top: 0;
-            display: block;
-            z-index: 999;
-            background-color: $alert;
-            color: #FFF;
-            @include FontBody;
-            text-align: center;
-            line-height: 32px;
-        }
-    }
-}
+// html[lang="da"],    // Danish
+// html[lang="de"],    // German
+// html[lang="es-ES"], // Spanish
+// html[lang="fr"],    // French
+// html[lang="hr"],    // Croatian
+// html[lang="it"],    // Italian
+// html[lang="lt"],    // Lithuanian
+// html[lang="hu"],    // Hungary
+// html[lang="nl"],    // Dutch
+// html[lang="no"],    // Norwegian
+// html[lang="pl"],    // Polish
+// html[lang="pt-BR"], // Portuguese, Brazilian
+// html[lang="ro"],    // Romanian
+// html[lang="fi"],    // Finnish
+// html[lang="sv-SE"], // Sweden
+// html[lang="vi"],    // Vietnamese
+// html[lang="tr"],    // Turkish
+// html[lang="cs"],    // Czech
+// html[lang="el"],    // Greek
+// html[lang="bg"],    // Bulgarian
+// html[lang="ru"],    // Russian
+// html[lang="uk"],    // Ukrainian
+// html[lang="th"],    // Thai
+// html[lang="zh-CN"], // Chinese
+// html[lang="ja"],    // Japanese
+// html[lang="zh-TW"], // Chinese/Taiwan
+// html[lang="ko"]{    // Korea
+//     .app-2rEoOp{
+//         padding-top: 32px;
+//         &::after{
+//             content: "This theme requires English to be the selected Language. Press 'CTRL + comma' to open your settings.";
+//             height: 32px;
+//             width: 100%;
+//             position: absolute;
+//             top: 0;
+//             display: block;
+//             z-index: 999;
+//             background-color: $alert;
+//             color: #FFF;
+//             @include FontBody;
+//             text-align: center;
+//             line-height: 32px;
+//         }
+//     }
+// }
diff --git a/src/components/primary/channels/_account.scss b/src/components/primary/channels/_account.scss
@@ -33,6 +33,26 @@
         }
     }
 
+    // Place the setting button in the guilds list
+    button:last-child{
+        position: absolute;
+        width: 48px;
+        height: 48px;
+        bottom: 0;
+        left: 0;
+    }
+    // Mute/Deafen buttons
+    button:nth-child(1),
+    button:nth-child(2){
+        width: 60px;
+        height: 48px;
+    }
+
+
+}
+
+// Replace icons
+html[lang^="en-"].theme-dark .container-3baos1{
     .button-14-BFJ{
         height: 48px;
         border-radius: 0;
@@ -48,21 +68,6 @@
         }
     }
 
-    // Mute/Deafen buttons
-    button[aria-label="Mute"],
-    button[aria-label="Deafen"]{
-        width: 60px;
-
-    }
-
-    // Place the setting button in the guilds list
-    button[aria-label="User settings"]{
-        position: absolute;
-        width: 48px;
-        bottom: 0;
-        left: 0;
-    }
-
     // Icon replacements
     button[aria-label="Mute"][aria-checked="false"]::before{
         content: "\E720";
@@ -78,7 +83,8 @@
         content: "\E74F";
         color: $alert;
     }
-    button[aria-label="User settings"]::before{
+    button[aria-label="User settings"]::before,
+    button[aria-label="User Settings"]::before{
         content: "\E713";
     }
 }
diff --git a/src/components/primary/channels/_activity.scss b/src/components/primary/channels/_activity.scss
@@ -2,6 +2,10 @@
     height: 48px;
     padding: 0 0 0 8px;
     border-bottom: 0;
+
+}
+
+html[lang^="en-"].theme-dark .activityPanel-28dQGo{
     .actions-aUdUfC{
         button{
             width: 48px;

diff --git a/src/components/primary/channels/_rtc.scss b/src/components/primary/channels/_rtc.scss
@@ -36,27 +36,7 @@
     .button-14-BFJ{
         width: 48px;
         height: 48px;
-        .contents-18-Yxp{
-            display: none;
-        }
-        &::before{
-            @include FontIcon;
-                font-size: 16px;
-        }
-        // Icon replcements
-        &[aria-label="Disconnect"]::before,
-        &[aria-label="Exit Quietly"]::before{
-            content: "\E89B";
-        }
-        &[aria-label^="Noise suppression powered by Krisp"]::before{
-            content: "\F61F";
-        }
-        &[aria-label*="Camera"]::before{
-            content: "\E960";
-        }
-        &[aria-label^="Share Your screen"]::before{
-            content: "\EBC6";
-        }
+
     }
 
     // Webcam/screen share options
@@ -79,6 +59,39 @@
                 font-size: 16px;
             }
         }
+
+    }
+}
+
+
+html[lang^="en-"].theme-dark .container-1giJp5{
+    .button-14-BFJ{
+        .contents-18-Yxp{
+            display: none;
+        }
+        &::before{
+            @include FontIcon;
+                font-size: 16px;
+        }
+        // Icon replcements
+        &[aria-label="Disconnect"]::before,
+        &[aria-label="Exit Quietly"]::before{
+            content: "\E89B";
+        }
+        &[aria-label^="Noise suppression powered by Krisp"]::before,
+        &[aria-label^="Noise Suppression powered by Krisp"]::before{ // US
+            content: "\F61F";
+        }
+        &[aria-label*="Camera"]::before{
+            content: "\E960";
+        }
+        &[aria-label^="Share Your screen"]::before,
+        &[aria-label^="Share Your Screen"]::before{ // US
+            content: "\EBC6";
+        }
+    }
+
+    .actionButtons-14eAc_{
         .contents-18-Yxp{
             display: none;
         }
@@ -87,13 +100,15 @@
         button[aria-label="Exit Quietly"]::before{
             content: "\E89B";
         }
-        button[aria-label^="Noise suppression powered by Krisp"]::before{
+        button[aria-label^="Noise suppression powered by Krisp"]::before,
+        button[aria-label^="Noise Suppression powered by Krisp"]::before{ // US
             content: "\F61F";
         }
         button[aria-label*="Camera"]::before{
             content: "\E960";
         }
-        button[aria-label^="Share Your screen"]::before{
+        button[aria-label^="Share Your screen"]::before,
+        button[aria-label^="Share Your Screen"]::before{ // US
             content: "\EBC6";
         }
     }