Merge pull request #29 from TakosThings/develop

0.0.11 Closes #18 Closes #27 Closes #28
TakosThings · Feb 16, 2022 · 832860c · 832860c
2 parents 740aa1a + 065fa06
commit 832860c
Show file tree

Hide file tree

Showing 14 changed files with 153 additions and 49 deletions.
diff --git a/src/fluent.scss b/src/fluent.scss
@@ -61,6 +61,7 @@
 @import 'modules/modals/lightbox';
 @import 'modules/modals/link_gate';
 @import 'modules/modals/modal';
+@import 'modules/modals/quality_rating';
 @import 'modules/modals/quickswitcher';
 @import 'modules/modals/reactors';
 

diff --git a/src/modules/betterdiscord/_plugin_support.scss b/src/modules/betterdiscord/_plugin_support.scss
@@ -16,3 +16,6 @@
 
 // https://betterdiscord.app/plugin/PluginRepo
 @import "plugins/DevilBro.PluginRepo";
+
+// https://betterdiscord.app/plugin/ReadAllNotificationsButton
+@import "plugins/DevilBro.ReadAllNotificationsButton"
diff --git a/src/modules/betterdiscord/plugins/_DevilBro.ReadAllNotificationsButton.scss b/src/modules/betterdiscord/plugins/_DevilBro.ReadAllNotificationsButton.scss
@@ -0,0 +1,15 @@
+.theme-dark .listItem-3SmSlK.frame-oXWS21{
+    &:active{
+        transform: none;
+    }
+    .childWrapper-1j_1ub{
+        background-color: transparent;
+        color: $TextFillColorSecondary;
+        font-size: 10px;
+        text-transform: capitalize;
+
+        &:hover{
+            background-color: $ControlFillColorDefault;
+        }
+    }
+}
diff --git a/src/modules/core/_metadata.scss b/src/modules/core/_metadata.scss
@@ -1 +1 @@
-$version: "0.0.10";
+$version: "0.0.11";
diff --git a/src/modules/core/_reset.scss b/src/modules/core/_reset.scss
@@ -3,6 +3,7 @@
 :root{
     --font-primary: "Segoe UI Variable Text", "Segoe UI Variable Static Text", "Segoe UI", "Comic Sans MS", Helvetica, Arial, sans-serif;
     --font-display: "Segoe UI Variable Display", "Segoe UI Variable Static Display", "Segoe UI", "Comic Sans MS", Helvetica, Arial, sans-serif;
+    --font-code: Consolas, Menlo, Monaco, "Courier New", monospace;
 }
 
 *,

diff --git a/src/modules/icons/main/_account.scss b/src/modules/icons/main/_account.scss
@@ -48,3 +48,21 @@ html[lang^="en-"].theme-dark .panels-3wFtMD .button-12Fmur{
         content: "\EA14"; // DisconnectDisplay
     }
 }
+
+html[lang^="en-"].theme-dark .panels-3wFtMD .actionButtons-2vEOUh .button-1EGGcP{
+    // &[aria-label="#{map-get($translate, CAMERA)}"]::before,
+    // &[aria-label="#{map-get($translate, CAMERA_ON)}"]::before,
+    // &[aria-label="#{map-get($translate, CAMERA_OFF)}"]::before,
+    // &[aria-label="#{map-get($translate, CAMERA_UNAVAILABLE)}"]::before{
+    &:nth-of-type(1)::before{
+        content: "\E114"; // Camera
+    }
+    // &[aria-label="#{map-get($translate, SHARE_YOUR_SCREEN)}"]::before,
+    // &[aria-label="#{map-get($translate, SCREEN_SHARE_ON)}"]::before{
+    &:nth-of-type(2)::before{
+        content: "\EC15"; // MiracastLogoSmall
+    }
+    &:nth-of-type(3)::before{
+        content: "\E789" // Megaphone
+    }
+}
diff --git a/src/modules/main/channels/_rtc.scss b/src/modules/main/channels/_rtc.scss
@@ -6,7 +6,7 @@
     .actionButtons-2vEOUh{
         grid-gap: 4px;
         button{
-            min-width: calc(120px - 16px) !important;
+            min-width: unset;
             background-color: $ControlFillColorDefault !important;
             border: 1px solid $ControlStrokeColorDefault !important;
             border-radius: 4px;
@@ -18,9 +18,11 @@
                 background-color: $ControlFillColorTertiary !important;
             }
 
-            // Replace icon
-            svg{
-                display: none;
+            .contents-3ca1mk{
+                font-size: 0;
+                svg{
+                    margin-right: 0;
+                }
             }
         }
     }
@@ -34,3 +36,14 @@
         @include TypeBody;
     }
 }
+
+// Icons
+html[lang^="en-"].theme-dark .panels-3wFtMD .button-1EGGcP{
+    &::before{
+        @include FontIconFluent;
+        font-size: 16px;
+    }
+    .contents-3ca1mk{
+        display: none;
+    }
+}
diff --git a/src/modules/main/chat/_chatbox.scss b/src/modules/main/chat/_chatbox.scss
@@ -208,7 +208,6 @@
         }
         .option-Tt7anD{
             margin-left: 0;
-            @include FontMonospace;
             @include TypeBody;
             &::before{
                 content: "{";
@@ -222,5 +221,16 @@
             }
         }
     }
+
+    // Replying to message
+    .clipContainer-31nYlH{
+        margin-top: 0;
+    }
+    .replyBar-1oi75v{
+        background-color: transparent;
+        .replyLabel-WWnhHi{
+            color: $TextFillColorPrimary;
+        }
+    }
 }
 
diff --git a/src/modules/main/guilds/_guilds.scss b/src/modules/main/guilds/_guilds.scss
@@ -14,19 +14,26 @@
     .listItem-3SmSlK{
         margin: 0;
         width: 48px;
-        &:hover::before,
-        &.bd-selected::before{
-            content: "";
-            position: absolute;
-            width: 40px;
-            height: 40px;
-            top: 4px;
-            background-color: $ControlFillColorSecondary;
-            border-radius: 4px;
-        }
-        &:hover::before{
-            box-shadow: inset 0 0 0 1px $SubtleFillColorSecondary;
+
+        // Hover state
+        .wrapper-28eC3z{
+            &:hover::before,
+            &.bd-selected::before{
+                content: "";
+                position: absolute;
+                width: 40px;
+                height: 40px;
+                top: 4px;
+                left: 4px;
+                background-color: $ControlFillColorSecondary;
+                border-radius: 4px;
+                z-index: -1;
+            }
+            &:hover::before{
+                box-shadow: inset 0 0 0 1px $SubtleFillColorSecondary;
+            }
         }
+
         // Pill
         .pill-2RsI5Q, // Guild
         .pill-L_aLMQ, // Home
@@ -133,6 +140,11 @@
             bottom: 4px;
             z-index: 1;
         }
+        .numberBadge-37OJ3S{
+            background-color: $SystemFillColorCriticalBackground !important; // For some reason this is in line
+            @include TypeCaption;
+            color: $SystemFillColorCritical;
+        }
     }
     // Folders
     .wrapper-38slSD{

diff --git a/src/modules/main/toolbar/_search.scss b/src/modules/main/toolbar/_search.scss
@@ -1,6 +1,6 @@
 .theme-dark .chat-2ZfjoI .search-39IXmY{
     margin: 0;
-    .searchBar-zdmu7v{
+    .searchBar-jGtisZ{
         width: 64px;
         height: 36px;
         background-color: transparent;
@@ -13,13 +13,13 @@
             background-color: $ControlFillColorSecondary;
         }
         .public-DraftEditorPlaceholder-root,
-        .icon-1nNws_{
+        .icon-tZMHgY{
             display: none;
         }
     }
 
     // Icon when not active
-    .search-1FM8Qc:not(.focused-8aNhVB):not(.open-3y3yI_)::before{
+    .search-2Mwzzq:not(.focused-1xh-wG):not(.open-1F8u2c)::before{
         content: "\e721"; // Search
         width: 64px;
         font-size: 16px;
@@ -30,9 +30,9 @@
         position: absolute;
     }
 
-    .search-1FM8Qc.focused-8aNhVB .searchBar-zdmu7v,
-    .search-1FM8Qc.open-3y3yI_ .searchBar-zdmu7v,
-    .search-1FM8Qc.popout-open .searchBar-zdmu7v{
+    .search-2Mwzzq.focused-1xh-wG .searchBar-jGtisZ,
+    .search-2Mwzzq.open-1F8u2c .searchBar-jGtisZ,
+    .search-2Mwzzq.popout-open .searchBar-jGtisZ{
         width: 232px;
         height: 32px;
         margin: 0 4px;
@@ -43,22 +43,22 @@
         border-bottom-width: 2px;
         border-radius: 4px;
     }
-    .search-1FM8Qc.focused-8aNhVB .searchBar-zdmu7v{
+    .search-2Mwzzq.focused-1xh-wG .searchBar-jGtisZ{
         background-color: $ControlFillColorInputActiveBrush;
         border-color: $ControlElevationBorder;
         border-bottom-color: $AccentBase;
     }
 
-    .search-1FM8Qc.open-3y3yI_ .icon-38sknP,
-    .search-1FM8Qc.focused-8aNhVB .icon-38sknP,
-    .search-1FM8Qc.open-3y3yI_ .searchBar-zdmu7v .public-DraftEditorPlaceholder-root,
-    .search-1FM8Qc.focused-8aNhVB .searchBar-zdmu7v .public-DraftEditorPlaceholder-root{
+    .search-2Mwzzq.open-1F8u2c .icon-38sknP,
+    .search-2Mwzzq.focused-1xh-wG .icon-38sknP,
+    .search-2Mwzzq.open-1F8u2c .searchBar-jGtisZ .public-DraftEditorPlaceholder-root,
+    .search-2Mwzzq.focused-1xh-wG .searchBar-jGtisZ .public-DraftEditorPlaceholder-root{
         display: block;
     }
-    .search-1FM8Qc .DraftEditor-root .DraftEditor-editorContainer{
+    .search-2Mwzzq .DraftEditor-root .DraftEditor-editorContainer{
         height: 26px;
     }
-    .search-1FM8Qc .searchBar-zdmu7v .DraftEditor-root{
+    .search-2Mwzzq .searchBar-jGtisZ .DraftEditor-root{
         color: $TextFillColorPrimary;
         @include TypeBody;
         .public-DraftEditor-content{
@@ -70,11 +70,11 @@
             box-sizing: border-box;
         }
     }
-    .seasearch-1FM8Qcrch .searchBar-zdmu7v .public-DraftEditorPlaceholder-root{
+    .seasearch-2Mwzzqrch .searchBar-jGtisZ .public-DraftEditorPlaceholder-root{
         color: $TextFillColorSecondary;
         @include TypeBody;
     }
-    .search-1FM8Qc .searchBar-zdmu7v .icon-3cZ1F_{
+    .search-2Mwzzq .searchBar-jGtisZ .icon-3cZ1F_{
         top: 7px;
     }
 

diff --git a/src/modules/mixins/_font.scss b/src/modules/mixins/_font.scss
@@ -1,10 +1,9 @@
-// DEBUG: 2021-07-30 - Comic sans used as fall back font for debugging
 @mixin FontNormal{
     font-family: var(--font-primary);
 }
 
 @mixin FontMonospace{
-    font-family: Consolas, Menlo, Monaco, "Courier New", monospace;
+    font-family: var(--font-code);
 }
 
 @mixin FontIconFluent{

diff --git a/src/modules/modals/_quality_rating.scss b/src/modules/modals/_quality_rating.scss
@@ -0,0 +1,16 @@
+.theme-dark{
+    .header-C83U_D{
+        @include TypeSubtitle;
+        text-align: left;
+    }
+    .ratingBody-1GrX6N{
+        @include TypeBody;
+        color: $TextFillColorPrimary;
+        text-align: left;
+    }
+
+    .emojis-2ZPdTX{
+        width: auto;
+        margin: 32px 0 -16px 0;
+    }
+}
diff --git a/src/modules/popouts/_search.scss b/src/modules/popouts/_search.scss
@@ -4,13 +4,13 @@
     border: 1px solid $SurfaceStrokeColorDefault;
     border-radius: 8px;
 
-    .header-3A13BX{
+    .header-1BR0Ro{
         @include TypeBodyStrong;
         color: $TextFillColorPrimary;
         text-transform: none;
     }
 
-    .option-2KkUJO{
+    .option-ayUoaq{
         margin: 1px 10px;
         height: 32px;
         border: 1px solid transparent;
@@ -23,30 +23,46 @@
             display: none;
         }
 
-        .filter-5YbOzJ,
-        .answer-2fBfuP,
+        .filter-2QaH9y,
+        .answer-14OVbQ,
         .displayedNick-2dDbfG,
         .displayUsername-14aOpK,
-        .nonText-3_4gtu,
+        .nonText-28q_Ot,
         strong{
             @include TypeBody;
         }
 
-        .filter-5YbOzJ,
-        .displayedNick-2dDbfG,
+        .filter-2QaH9y,
+        .displayedNick-1atSpT,
         strong{
-            color: $TextFillColorPrimary
+            color: $TextFillColorPrimary;
+            @include TypeBody;
         }
-        .answer-2fBfuP,
-        .displayUsername-14aOpK{
+        .answer-14OVbQ,
+        .displayUsername-UTerwm{
             color: $TextFillColorSecondary;
+            @include TypeBody;
         }
     }
-    .resultsGroup-1BPR25 .searchClearHistory-2Be-92,
-    .resultsGroup-1BPR25 .searchLearnMore-7__o_n{
+    .resultsGroup-cfY57t .resultsGroup-cfY57t,
+    .resultsGroup-cfY57t .searchLearnMore-1gNL3A{
         top: 16px;
     }
 
+    // "Search for..." header
+    .queryContainer-ZunrLZ{
+        background-color: $CardStrokeColorDefault;
+        .queryText-j8z984{
+            @include TypeBody;
+            color: $TextFillColorPrimary;
+            text-transform: none;
+            strong::before,
+            strong::after{
+                content: "\"";
+            }
+        }
+    }
+
 
     // Calendar
     .react-datepicker{

diff --git a/src/modules/settings/_navigation.scss b/src/modules/settings/_navigation.scss
@@ -57,13 +57,13 @@
             }
         }
         // Move nitro icon to left side
-        .premiumLabel-V52REm svg{
+        .premiumLabel-3HPvdB svg{
             position: absolute;
             left: -32px;
             fill: $TextFillColorPrimary;
         }
         // Remove background div from nitro option
-        .selectedBackground-1qyzak{
+        .selectedBackground-1t6xXq{
             display: none;
         }
     }