Merge pull request #4473 from brave-intl/fix/security-and-settings-st…

…yles fix spacing on settings and security and current page highlight on si…
brave-intl · Jul 10, 2024 · 4c74b74 · 4c74b74
2 parents d41690e + 2ef60cd
commit 4c74b74
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/nextjs/src/app/[locale]/publishers/NavigationOptions.tsx b/nextjs/src/app/[locale]/publishers/NavigationOptions.tsx
@@ -20,28 +20,28 @@ export default function NavigationOptions() {
       <NavigationItem
         icon='browser-home'
         href='/publishers/home'
-        isCurrent={route === '/publishers/home'}
+        isCurrent={route.includes('/publishers/home')}
       >
         {t('shared.dashboard')}
       </NavigationItem>
       <NavigationItem
         icon='window-settings'
         href={`/publishers/${user.id}/site_banners/new`}
-        isCurrent={route === `/publishers/${user.id}/site_banners/new`}
+        isCurrent={route.includes(`/publishers/${user.id}/site_banners/new`)}
       >
         {t('NavDropdown.contribution_banners')}
       </NavigationItem>
       <NavigationItem
         icon='lock'
         href='/publishers/security'
-        isCurrent={route === '/publishers/security'}
+        isCurrent={route.includes('/publishers/security')}
       >
         {t('NavDropdown.security')}
       </NavigationItem>
       <NavigationItem
         icon='settings'
         href='/publishers/settings'
-        isCurrent={route === '/publishers/settings'}
+        isCurrent={route.includes('/publishers/settings')}
       >
         {t('NavDropdown.settings')}
       </NavigationItem>

diff --git a/nextjs/src/app/[locale]/publishers/security/page.tsx b/nextjs/src/app/[locale]/publishers/security/page.tsx
@@ -81,7 +81,7 @@ export default function SecurityPage() {
       <Head>
         <title>{t('NavDropdown.security')}</title>
       </Head>
-      <section className='content-width'>
+      <section className='content-width mt-3 mb-3'>
         <Card>
           <div className='mb-3 flex flex-col items-start justify-between md:flex-row'>
             <div className='md:w-[80%]'>

diff --git a/nextjs/src/app/[locale]/publishers/settings/page.tsx b/nextjs/src/app/[locale]/publishers/settings/page.tsx
@@ -69,7 +69,7 @@ export default function SettingsPage() {
         hello
       </Head>
 
-      <section className='content-width'>
+      <section className='content-width mt-3 mb-3'>
         <Card className='mb-3'>
           <h2 className='mb-2'>{t('Settings.index.header')}</h2>
           <h4 className='mt-2'>Stay Logged-In</h4>

diff --git a/nextjs/src/app/[locale]/publishers/totp_registrations/new/page.jsx b/nextjs/src/app/[locale]/publishers/totp_registrations/new/page.jsx
@@ -59,7 +59,7 @@ export default function TOTPNewPage() {
       <Head>
         <title>Setup Authenticator</title>
       </Head>
-      <section className='content-width-sm'>
+      <section className='content-width-sm mt-3 mb-3'>
         <Card>
           <div className='[&>*]:mb-2'>
             {user.two_factor_enabled && (

diff --git a/nextjs/src/app/[locale]/publishers/u2f_registrations/new/page.tsx b/nextjs/src/app/[locale]/publishers/u2f_registrations/new/page.tsx
@@ -84,7 +84,7 @@ export default function U2fRegistrations() {
       <Head>
         <title>Register Key</title>
       </Head>
-      <section className='content-width-sm'>
+      <section className='content-width-sm mt-3 mb-3'>
         <Card>
           <h1>{t('u2f_registrations.new.heading')}</h1>
           <div className='mt-2'>