From 583ba80c7e0ed87297bd2d1fa52582aa1fd2c78a Mon Sep 17 00:00:00 2001
From: Scott Bishel <scott.bishel@mattermost.com>
Date: Wed, 16 Apr 2025 08:21:00 -0600
Subject: [PATCH] revert css changes, add new css (#30699)

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 .../custom_profile_attributes.scss            |  19 +++
 .../custom_profile_attributes.tsx             | 120 +++++++++---------
 .../admin_console/schema_admin_settings.scss  |   6 -
 .../src/sass/routes/_admin-console.scss       |  18 ---
 4 files changed, 81 insertions(+), 82 deletions(-)
 create mode 100644 webapp/channels/src/components/admin_console/custom_profile_attributes/custom_profile_attributes.scss

diff --git a/webapp/channels/src/components/admin_console/custom_profile_attributes/custom_profile_attributes.scss b/webapp/channels/src/components/admin_console/custom_profile_attributes/custom_profile_attributes.scss
new file mode 100644
index 0000000000..48feccba38
--- /dev/null
+++ b/webapp/channels/src/components/admin_console/custom_profile_attributes/custom_profile_attributes.scss
@@ -0,0 +1,19 @@
+.custom-profile-attributes {
+    border-top: 1px solid rgba(61, 60, 64, 0.08);
+    border-bottom: 1px solid rgba(61, 60, 64, 0.08);
+    margin-bottom: 25px;
+    
+    .section-header {
+        padding: 24px 0px;
+        border-bottom: none;
+    
+        .section-title {
+            font-size: 16px;
+            font-weight: bold;
+        }
+    
+        .section-subtitle {
+            font-size: 14px;
+        }
+    }
+}
diff --git a/webapp/channels/src/components/admin_console/custom_profile_attributes/custom_profile_attributes.tsx b/webapp/channels/src/components/admin_console/custom_profile_attributes/custom_profile_attributes.tsx
index 5e748b09db..b6a34f4b3e 100644
--- a/webapp/channels/src/components/admin_console/custom_profile_attributes/custom_profile_attributes.tsx
+++ b/webapp/channels/src/components/admin_console/custom_profile_attributes/custom_profile_attributes.tsx
@@ -2,6 +2,7 @@
 // See LICENSE.txt for license information.
 
 import React, {useEffect, useState, memo} from 'react';
+import './custom_profile_attributes.scss';
 import {FormattedMessage} from 'react-intl';
 import {useSelector} from 'react-redux';
 import {Link} from 'react-router-dom';
@@ -118,64 +119,67 @@ const CustomProfileAttributes: React.FC<Props> = (props: Props): JSX.Element | n
     }
 
     return (
-        <SettingsGroup
-            id={props.id}
-            title={
-                <FormattedMessage
-                    id='admin.customProfileAttributes.title'
-                    defaultMessage='Custom profile attributes sync'
-                />
-            }
-            subtitle={
-                <FormattedMessage
-                    id='admin.customProfileAttributes.subtitle'
-                    defaultMessage='You can add or remove custom profile attributes by going to the <link>system properties page</link>.'
-                    values={{
-                        link: (msg: string) => (
-                            <Link
-                                to='/admin_console/site_config/system_properties'
-                            >
-                                {msg}
-                            </Link>
-                        ),
-                    }}
-                />
-            }
-        >
-            {attributes.map((attr) => (
-                <TextSetting
-                    key={attr.id}
-                    id={`custom_profile_attribute-${attr.name}`}
-                    label={attr.name}
-                    value={attr.attrs?.[attributeKey] as string || ''}
-                    onChange={(id, newValue) => {
-                        setAttributes((prevAttrs) => prevAttrs.map((a) => {
-                            if (a.id === attr.id) {
-                                return {
-                                    ...a,
-                                    attrs: {
-                                        ...a.attrs,
-                                        [attributeKey]: newValue,
-                                    },
-                                };
-                            }
-                            return a;
-                        }));
-                        props.setSaveNeeded();
-                    }}
-                    setByEnv={false}
-                    disabled={props.isDisabled}
-                    placeholder={{id: 'admin.customProfileAttr.placeholder', defaultMessage: 'E.g.: "fieldName"'}}
-                    helpText={
-                        <AttributeHelpText
-                            attributeKey={attributeKey}
-                            attributeName={attr.name}
-                            attributeType={attr.type}
-                        />
-                    }
-                />
-            ))}
-        </SettingsGroup>
+        <div className='custom-profile-attributes'>
+            <SettingsGroup
+                id={props.id}
+                title={
+                    <FormattedMessage
+                        id='admin.customProfileAttributes.title'
+                        defaultMessage='Custom profile attributes sync'
+                    />
+                }
+                container={false}
+                subtitle={
+                    <FormattedMessage
+                        id='admin.customProfileAttributes.subtitle'
+                        defaultMessage='You can add or remove custom profile attributes by going to the <link>system properties page</link>.'
+                        values={{
+                            link: (msg: string) => (
+                                <Link
+                                    to='/admin_console/site_config/system_properties'
+                                >
+                                    {msg}
+                                </Link>
+                            ),
+                        }}
+                    />
+                }
+            >
+                {attributes.map((attr) => (
+                    <TextSetting
+                        key={attr.id}
+                        id={`custom_profile_attribute-${attr.name}`}
+                        label={attr.name}
+                        value={attr.attrs?.[attributeKey] as string || ''}
+                        onChange={(id, newValue) => {
+                            setAttributes((prevAttrs) => prevAttrs.map((a) => {
+                                if (a.id === attr.id) {
+                                    return {
+                                        ...a,
+                                        attrs: {
+                                            ...a.attrs,
+                                            [attributeKey]: newValue,
+                                        },
+                                    };
+                                }
+                                return a;
+                            }));
+                            props.setSaveNeeded();
+                        }}
+                        setByEnv={false}
+                        disabled={props.isDisabled}
+                        placeholder={{id: 'admin.customProfileAttr.placeholder', defaultMessage: 'E.g.: "fieldName"'}}
+                        helpText={
+                            <AttributeHelpText
+                                attributeKey={attributeKey}
+                                attributeName={attr.name}
+                                attributeType={attr.type}
+                            />
+                        }
+                    />
+                ))}
+            </SettingsGroup>
+        </div>
     );
 };
 
diff --git a/webapp/channels/src/components/admin_console/schema_admin_settings.scss b/webapp/channels/src/components/admin_console/schema_admin_settings.scss
index 7c407362de..32bae08f20 100644
--- a/webapp/channels/src/components/admin_console/schema_admin_settings.scss
+++ b/webapp/channels/src/components/admin_console/schema_admin_settings.scss
@@ -23,12 +23,6 @@
 
     .section-body {
         padding: 28px 32px;
-
-        .section-header {
-            padding: 24px 0px;
-            border-top: 1px solid rgba(61, 60, 64, 0.08);
-            border-bottom: none;
-        }
     }
 }
 
diff --git a/webapp/channels/src/sass/routes/_admin-console.scss b/webapp/channels/src/sass/routes/_admin-console.scss
index a0da59f430..c6c6a71cb6 100644
--- a/webapp/channels/src/sass/routes/_admin-console.scss
+++ b/webapp/channels/src/sass/routes/_admin-console.scss
@@ -62,24 +62,6 @@
 
     .admin-console__content {
         max-width: 920px;
-
-        .admin-console__content {
-            border-bottom: 1px solid rgba(61, 60, 64, 0.08);
-        }    
-
-        .section-header {
-            padding: 24px 0px;
-            border-top: 1px solid rgba(61, 60, 64, 0.08);
-
-            .section-title {
-                font-size: 16px;
-                font-weight: bold;
-            }
-    
-            .section-subtitle {
-                font-size: 14px;
-            }    
-        }
     }
 
     .admin-console__checkbox-list {