Merge pull request #125 from SableClient/style-fixes

style fixes

Author: 7w1

.jjconflict-base-0/src/app/features/settings/about/About.tsx

@@ -243,6 +243,13 @@ export function About({ requestClose }: AboutProps) {
                       </Button>
                     }
                   />
+                </SequenceCard>
+                <SequenceCard
+                  className={SequenceCardStyle}
+                  variant="SurfaceVariant"
+                  direction="Column"
+                  gap="400"
+                >
                   <SettingTile
                     title="Report an Issue"
                     description="Report a bug or request a feature on GitHub."

.jjconflict-base-0/src/app/features/settings/notifications/SystemNotification.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable no-nested-ternary */
 import { useCallback, useEffect, useState } from 'react';
-import { Box, Text, Switch, Button, color, Spinner } from 'folds';
+import { Box, Text, Switch, Button, color, Spinner, config } from 'folds';
 import { IPusherRequest } from '$types/matrix-sdk';
 import { useAtom } from 'jotai';
 import { SequenceCard } from '$components/sequence-card';
@@ -315,7 +315,9 @@ export function SystemNotification() {
         <DeregisterAllPushersSetting />
       </SequenceCard>
 
-      <Text size="L400">Badges</Text>
+      <Text size="L400" style={{ paddingTop: config.space.S700 }}>
+        Badges
+      </Text>
       <Text size="T300" style={{ opacity: 0.7 }}>
         {badgeBehaviourSummary()}
       </Text>

.jjconflict-base-1/src/app/features/settings/about/About.tsx

@@ -243,6 +243,13 @@ export function About({ requestClose }: AboutProps) {
                       </Button>
                     }
                   />
+                </SequenceCard>
+                <SequenceCard
+                  className={SequenceCardStyle}
+                  variant="SurfaceVariant"
+                  direction="Column"
+                  gap="400"
+                >
                   <SettingTile
                     title="Report an Issue"
                     description="Report a bug or request a feature on GitHub."

.jjconflict-base-1/src/app/features/settings/notifications/SystemNotification.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable no-nested-ternary */
 import { useCallback, useEffect, useState } from 'react';
-import { Box, Text, Switch, Button, color, Spinner } from 'folds';
+import { Box, Text, Switch, Button, color, Spinner, config } from 'folds';
 import { IPusherRequest } from '$types/matrix-sdk';
 import { useAtom } from 'jotai';
 import { SequenceCard } from '$components/sequence-card';
@@ -315,7 +315,9 @@ export function SystemNotification() {
         <DeregisterAllPushersSetting />
       </SequenceCard>
 
-      <Text size="L400">Badges</Text>
+      <Text size="L400" style={{ paddingTop: config.space.S700 }}>
+        Badges
+      </Text>
       <Text size="T300" style={{ opacity: 0.7 }}>
         {badgeBehaviourSummary()}
       </Text>

.jjconflict-side-0/src/app/features/settings/about/About.tsx

@@ -243,6 +243,13 @@ export function About({ requestClose }: AboutProps) {
                       </Button>
                     }
                   />
+                </SequenceCard>
+                <SequenceCard
+                  className={SequenceCardStyle}
+                  variant="SurfaceVariant"
+                  direction="Column"
+                  gap="400"
+                >
                   <SettingTile
                     title="Report an Issue"
                     description="Report a bug or request a feature on GitHub."

.jjconflict-side-0/src/app/features/settings/notifications/SystemNotification.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable no-nested-ternary */
 import { useCallback, useEffect, useState } from 'react';
-import { Box, Text, Switch, Button, color, Spinner } from 'folds';
+import { Box, Text, Switch, Button, color, Spinner, config } from 'folds';
 import { IPusherRequest } from '$types/matrix-sdk';
 import { useAtom } from 'jotai';
 import { SequenceCard } from '$components/sequence-card';
@@ -315,7 +315,9 @@ export function SystemNotification() {
         <DeregisterAllPushersSetting />
       </SequenceCard>
 
-      <Text size="L400">Badges</Text>
+      <Text size="L400" style={{ paddingTop: config.space.S700 }}>
+        Badges
+      </Text>
       <Text size="T300" style={{ opacity: 0.7 }}>
         {badgeBehaviourSummary()}
       </Text>

.jjconflict-side-1/src/app/features/settings/about/About.tsx

@@ -243,6 +243,13 @@ export function About({ requestClose }: AboutProps) {
                       </Button>
                     }
                   />
+                </SequenceCard>
+                <SequenceCard
+                  className={SequenceCardStyle}
+                  variant="SurfaceVariant"
+                  direction="Column"
+                  gap="400"
+                >
                   <SettingTile
                     title="Report an Issue"
                     description="Report a bug or request a feature on GitHub."

.jjconflict-side-1/src/app/features/settings/notifications/SystemNotification.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable no-nested-ternary */
 import { useCallback, useEffect, useState } from 'react';
-import { Box, Text, Switch, Button, color, Spinner } from 'folds';
+import { Box, Text, Switch, Button, color, Spinner, config } from 'folds';
 import { IPusherRequest } from '$types/matrix-sdk';
 import { useAtom } from 'jotai';
 import { SequenceCard } from '$components/sequence-card';
@@ -315,7 +315,9 @@ export function SystemNotification() {
         <DeregisterAllPushersSetting />
       </SequenceCard>
 
-      <Text size="L400">Badges</Text>
+      <Text size="L400" style={{ paddingTop: config.space.S700 }}>
+        Badges
+      </Text>
       <Text size="T300" style={{ opacity: 0.7 }}>
         {badgeBehaviourSummary()}
       </Text>

.jjconflict-side-2/src/app/features/settings/about/About.tsx

@@ -243,6 +243,13 @@ export function About({ requestClose }: AboutProps) {
                       </Button>
                     }
                   />
+                </SequenceCard>
+                <SequenceCard
+                  className={SequenceCardStyle}
+                  variant="SurfaceVariant"
+                  direction="Column"
+                  gap="400"
+                >
                   <SettingTile
                     title="Report an Issue"
                     description="Report a bug or request a feature on GitHub."

.jjconflict-side-2/src/app/features/settings/notifications/SystemNotification.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable no-nested-ternary */
 import { useCallback, useEffect, useState } from 'react';
-import { Box, Text, Switch, Button, color, Spinner } from 'folds';
+import { Box, Text, Switch, Button, color, Spinner, config } from 'folds';
 import { IPusherRequest } from '$types/matrix-sdk';
 import { useAtom } from 'jotai';
 import { SequenceCard } from '$components/sequence-card';
@@ -315,7 +315,9 @@ export function SystemNotification() {
         <DeregisterAllPushersSetting />
       </SequenceCard>
 
-      <Text size="L400">Badges</Text>
+      <Text size="L400" style={{ paddingTop: config.space.S700 }}>
+        Badges
+      </Text>
       <Text size="T300" style={{ opacity: 0.7 }}>
         {badgeBehaviourSummary()}
       </Text>