Merge branch 'master' of https://github.com/ClearVision/ClearVision-v6

ClearVision · Nov 16, 2024 · ec8378b · ec8378b
2 parents 5a1a837 + 9ef455b
commit ec8378b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 20 deletions.
diff --git a/lib/selectors/selectorPlaceholders.scss b/lib/selectors/selectorPlaceholders.scss
@@ -529,7 +529,7 @@
 .actions_bf1a22 {
   @extend %activityPanelActions !optional;
 }
-.liveBadge_bf1a22 {
+.liveBadge_aa73eb {
   @extend %panelLiveBadge !optional;
 }
 .noiseCancellationPopout_adcaac {
@@ -3663,7 +3663,7 @@ pre {
 .container_ac201b {
   @extend %roleAssignPopout !optional;
 }
-.loading_cea94f {
+.loading_f3e233 {
   @extend %loading !optional;
 }
 .container_b11c5e {
@@ -3814,7 +3814,7 @@ pre {
 .detailsBlock_a206c7 {
   @extend %userSettingsSubsPayDetailsBlock !optional;
 }
-.premiumSubscriptionAccountCredit_ca73a1 {
+.premiumSubscriptionAccountCredit_b7f69f {
   @extend %userSettingsSubsAccountCredit !optional;
 }
 .defaultIndicator_ede133 {

diff --git a/src/messages/codeblock.scss b/src/messages/codeblock.scss
@@ -2,7 +2,7 @@
 %markup {
   // INLINE CODE
   code%codeInline {
-    padding: 3.5px 7.5px;
+    padding: 1px 5px;
     background-color: hsla(0, 0%, 100%, 0.1);
     border-radius: 3px;
     color: hsla(0, 0%, 100%, 0.7);

diff --git a/src/modals/soundboard.scss b/src/modals/soundboard.scss
@@ -5,9 +5,9 @@
 }
 %soundboardSound {
   background: transparent;
-    border: 1px solid $main-color;
+  border: 1px solid $main-color;
   box-shadow: inset 0 -4px $main-color;
-    transition: all 0.15s ease-in-out;
+  transition: all 0.15s ease-in-out;
   &:hover {
     background: $hover-color;
   }
@@ -24,4 +24,4 @@
 %soundboardAddText,
 %soundboardSecondaryButton {
   color: $text-normal;
-}
+}
diff --git a/src/popouts/applicationPopout.scss b/src/popouts/applicationPopout.scss
@@ -117,5 +117,5 @@
   }
 }
 %appPopoutSearchItemUnderline {
-	right: 4px
-}
+  right: 4px;
+}
diff --git a/src/profiles/userProfiles.scss b/src/profiles/userProfiles.scss
@@ -4,7 +4,6 @@
 %userProfileOuter:not(%userProfileCustomThemem, %userSettingsProfilePreview) {
   background: transparent;
   %userProfileInner {
-
     // POPOUT
     &%userProfileSmall {
       background: cv('bg.popout.overlay');
@@ -31,7 +30,7 @@
       }
     }
   }
-  
+
   // STATUS
   %userProfileStatusBubbleOuter {
     background-color: hsla(0, 0%, 0%, 0.6);
@@ -76,24 +75,24 @@
   %userProfileListRow {
     transition: all 0.15s ease-in-out;
     &:hover {
-	    background: linear-gradient(to right, hsla(0, 0%, 100%, 0.04) 10%, hsla(0, 0%, 100%, 0.04) 90%, transparent);
+      background: linear-gradient(to right, hsla(0, 0%, 100%, 0.04) 10%, hsla(0, 0%, 100%, 0.04) 90%, transparent);
     }
   }
 
   // NOTES
   %userProfileNote {
     textarea:focus {
-      background-color: hsla(0, 0%, 100%, .07);
+      background-color: hsla(0, 0%, 100%, 0.07);
     }
   }
 }
 
 // GENERAL
 // CONNECTED ACCOUNTS
 %userProfileConnectedAccountVerifiedIcon {
-	background: url(https://clearvision.github.io/icons/verified.svg) center/18px no-repeat;
-	opacity: 0.5;
-	z-index: 1;
+  background: url(https://clearvision.github.io/icons/verified.svg) center/18px no-repeat;
+  opacity: 0.5;
+  z-index: 1;
   %flowerStar {
     opacity: 0;
   }
@@ -102,11 +101,11 @@
   }
 }
 %userProfileConnectedAccountOpenIcon {
-	background: url(https://clearvision.github.io/icons/popout.svg) center/18px no-repeat;
+  background: url(https://clearvision.github.io/icons/popout.svg) center/18px no-repeat;
   opacity: 0.3;
   transition: all 0.15s ease-in-out;
   transform: none;
   > polygon {
     display: none;
   }
-}
+}
diff --git a/src/settings/serverSettings.scss b/src/settings/serverSettings.scss
@@ -417,10 +417,10 @@
   }
 }
 
-// MEMBERS MANAGEMENT 
+// MEMBERS MANAGEMENT
 %guildSettingsMembersMoved {
   background-color: rgba(0, 0, 0, 0.6);
 }
 %guildSettingsShowMembersInChannelList {
   background: rgba(0, 0, 0, 0.4);
-}
+}