diff --git a/src/components/Header/Dropdown.tsx b/src/components/Header/Dropdown.tsx index 01a3a944..e1845ac1 100644 --- a/src/components/Header/Dropdown.tsx +++ b/src/components/Header/Dropdown.tsx @@ -23,7 +23,11 @@ const Dropdown: FC = (props) => { onChange={onChange} allowDeselect={false} value={value} - classNames={{ option: classes.dropdownOption, input: classes.dropdownBtn }} + classNames={{ + option: classes.dropdownOption, + input: classes.dropdownBtn, + description: classes.dropdownDescription, + }} /> ); }; diff --git a/src/components/Header/styles/LogQuery.module.css b/src/components/Header/styles/LogQuery.module.css index 9de7b15b..d2c5b88f 100644 --- a/src/components/Header/styles/LogQuery.module.css +++ b/src/components/Header/styles/LogQuery.module.css @@ -188,6 +188,12 @@ font-size: var(--mantine-font-size-md); } +.dropdownDescription { + font-size: 12px; + font-weight: 500; + color: var(--mantine-color-gray-6); +} + .liveTailFilterContainer { display: flex; gap: 12px; diff --git a/src/components/Misc/DeleteOrResetModal.tsx b/src/components/Misc/DeleteOrResetModal.tsx index 686f0def..29b9886a 100644 --- a/src/components/Misc/DeleteOrResetModal.tsx +++ b/src/components/Misc/DeleteOrResetModal.tsx @@ -98,7 +98,13 @@ const DeleteOrResetModal = ({ Please type {`"${confirmationText}"`} to confirm {type === 'delete' ? 'deletion' : 'reset'}. - + )} diff --git a/src/components/Misc/styles/DeleteOrResetModal.module.css b/src/components/Misc/styles/DeleteOrResetModal.module.css index 03a2273e..896293e4 100644 --- a/src/components/Misc/styles/DeleteOrResetModal.module.css +++ b/src/components/Misc/styles/DeleteOrResetModal.module.css @@ -35,3 +35,7 @@ align-items: center; justify-content: flex-end; } + +.inputField { + border-radius: rem(8px); +} diff --git a/src/pages/AccessManagement/PrivilegeTR.tsx b/src/pages/AccessManagement/PrivilegeTR.tsx index 7af21943..20f03c68 100644 --- a/src/pages/AccessManagement/PrivilegeTR.tsx +++ b/src/pages/AccessManagement/PrivilegeTR.tsx @@ -321,6 +321,7 @@ const PrivilegeTR: FC = (props) => { onChange={(value) => { setSelectedPrivilege(value ?? ''); }} + classNames={{ input: classes.selectInput, description: classes.selectDescription }} value={selectedPrivilege} nothingFoundMessage="No options" /> @@ -340,6 +341,7 @@ const PrivilegeTR: FC = (props) => { onDropdownOpen={() => setStreamSearchValue('')} data={getLogStreamListData?.data?.map((stream) => ({ value: stream.name, label: stream.name })) ?? []} searchable + classNames={{ input: classes.selectInput, description: classes.selectDescription }} label="Select a stream to assign" required /> @@ -348,6 +350,7 @@ const PrivilegeTR: FC = (props) => { type="text" placeholder={'Please enter the Tag.'} label="Tag" + classNames={{ input: styles.inputField }} onChange={(e) => { setTagInput(e.target.value); }} diff --git a/src/pages/AccessManagement/RoleTR.tsx b/src/pages/AccessManagement/RoleTR.tsx index 0dc4f270..5305f249 100644 --- a/src/pages/AccessManagement/RoleTR.tsx +++ b/src/pages/AccessManagement/RoleTR.tsx @@ -286,6 +286,7 @@ const RoleTR: FC = (props) => { onChange={(value) => { setSelectedRole(value ?? ''); }} + classNames={{ input: styles.selectInput, description: styles.selectDescription }} nothingFoundMessage="No roles found" value={selectedRole} searchValue={roleSearchValue} diff --git a/src/pages/AccessManagement/Roles.tsx b/src/pages/AccessManagement/Roles.tsx index 562025f3..6d14d6cf 100644 --- a/src/pages/AccessManagement/Roles.tsx +++ b/src/pages/AccessManagement/Roles.tsx @@ -220,6 +220,7 @@ const Roles: FC = () => { onChange={(value) => { setInputDefaultRole(value ?? ''); }} + classNames={{ input: classes.selectInput, description: classes.selectDescription }} value={inputDefaultRole} nothingFoundMessage="No options" searchable @@ -259,6 +260,7 @@ const Roles: FC = () => { onChange={(e) => { setCreateRoleInput(e.target.value); }} + classNames={{ input: classes.inputField }} value={createRoleInput} required /> @@ -270,6 +272,7 @@ const Roles: FC = () => { setSelectedPrivilege(value ?? ''); }} value={selectedPrivilege} + classNames={{ input: classes.selectInput, description: classes.selectDescription }} nothingFoundMessage="No options" required /> @@ -282,6 +285,7 @@ const Roles: FC = () => { onChange={(value) => { setSelectedStream(value ?? ''); }} + classNames={{ input: classes.selectInput, description: classes.selectDescription }} value={SelectedStream} searchValue={streamSearchValue} onSearchChange={(value) => setStreamSearchValue(value)} @@ -300,6 +304,7 @@ const Roles: FC = () => { onChange={(e) => { setTagInput(e.target.value); }} + classNames={{ input: classes.inputField }} /> ) : ( '' diff --git a/src/pages/AccessManagement/Users.tsx b/src/pages/AccessManagement/Users.tsx index 6bd63d73..051f80b5 100644 --- a/src/pages/AccessManagement/Users.tsx +++ b/src/pages/AccessManagement/Users.tsx @@ -150,6 +150,7 @@ const Users: FC = () => { onChange={(e) => { setCreateUserInput(e.target.value); }} + classNames={{ input: classes.inputField }} value={createUserInput} required /> @@ -165,6 +166,7 @@ const Users: FC = () => { onDropdownClose={() => setRoleSearchValue(selectedRole)} onDropdownOpen={() => setRoleSearchValue('')} data={getRolesData?.data || []} + classNames={{ input: classes.selectInput, description: classes.selectDescription }} searchable label="Select a role to assign" required diff --git a/src/pages/AccessManagement/styles/AccessManagement.module.css b/src/pages/AccessManagement/styles/AccessManagement.module.css index f00f519b..f11826e3 100644 --- a/src/pages/AccessManagement/styles/AccessManagement.module.css +++ b/src/pages/AccessManagement/styles/AccessManagement.module.css @@ -145,3 +145,19 @@ .tableHeader { font-weight: 600; } + +.inputField { + border-radius: rem(8px); +} + +.selectDescription { + font-size: 12px; + font-weight: 500; + color: var(--mantine-color-gray-6); +} + +.selectInput { + cursor: pointer; + border: 1px var(--mantine-color-gray-2) solid; + border-radius: rem(8px); +} diff --git a/src/pages/Dashboards/CreateDashboardModal.tsx b/src/pages/Dashboards/CreateDashboardModal.tsx index 07b571de..e39b9855 100644 --- a/src/pages/Dashboards/CreateDashboardModal.tsx +++ b/src/pages/Dashboards/CreateDashboardModal.tsx @@ -113,13 +113,13 @@ const CreateDashboardModal = () => { { Time Range { title={Duplicate Tile}> - + diff --git a/src/pages/Dashboards/styles/CreateDashboardModal.module.css b/src/pages/Dashboards/styles/CreateDashboardModal.module.css index bfe979e1..9896da0a 100644 --- a/src/pages/Dashboards/styles/CreateDashboardModal.module.css +++ b/src/pages/Dashboards/styles/CreateDashboardModal.module.css @@ -7,3 +7,19 @@ font-weight: 500; font-size: 0.7rem; } + +.inputField { + border-radius: rem(8px); +} + +.selectDescription { + font-size: 12px; + font-weight: 500; + color: var(--mantine-color-gray-6); +} + +.selectInput { + cursor: pointer; + border: 1px var(--mantine-color-gray-2) solid; + border-radius: rem(8px); +} diff --git a/src/pages/Dashboards/styles/DashboardView.module.css b/src/pages/Dashboards/styles/DashboardView.module.css index e76f7951..197a28fe 100644 --- a/src/pages/Dashboards/styles/DashboardView.module.css +++ b/src/pages/Dashboards/styles/DashboardView.module.css @@ -34,3 +34,7 @@ font-size: 0.8rem; text-align: center; } + +.inputField { + border-radius: rem(8px); +} diff --git a/src/pages/Dashboards/styles/Form.module.css b/src/pages/Dashboards/styles/Form.module.css index 08ee3bb7..d21aaca0 100644 --- a/src/pages/Dashboards/styles/Form.module.css +++ b/src/pages/Dashboards/styles/Form.module.css @@ -75,3 +75,19 @@ color: var(--mantine-color-gray-7); cursor: pointer; } + +.inputField { + border-radius: rem(8px); +} + +.selectDescription { + font-size: 12px; + font-weight: 500; + color: var(--mantine-color-gray-6); +} + +.selectInput { + cursor: pointer; + border: 1px var(--mantine-color-gray-2) solid; + border-radius: rem(8px); +} diff --git a/src/pages/Home/CreateStreamModal.tsx b/src/pages/Home/CreateStreamModal.tsx index db2dae34..3da7f7cb 100644 --- a/src/pages/Home/CreateStreamModal.tsx +++ b/src/pages/Home/CreateStreamModal.tsx @@ -129,8 +129,21 @@ const FieldRow = (props: { const rmvBtnProps = _.isFunction(props.onRemove) ? { onClick: props.onRemove } : { color: 'gray' }; return ( - - @@ -176,7 +189,12 @@ const SchemaTypeField = (props: { inputProps: GetInputPropsReturnType }) => { Choose dynamic or static schema - ); }; @@ -563,7 +581,7 @@ const CreateStreamForm = (props: { toggleModal: () => void }) => { { key="search-stream" value={searchTerm} rightSection={shortcutKeyElement} + classNames={{ input: homeStyles.searchBar }} rightSectionWidth={80} onChange={(event) => { setSearchTerm(event.target.value); diff --git a/src/pages/Home/styles/CreateStreamModal.module.css b/src/pages/Home/styles/CreateStreamModal.module.css index 0d79e3be..3f0cf8a6 100644 --- a/src/pages/Home/styles/CreateStreamModal.module.css +++ b/src/pages/Home/styles/CreateStreamModal.module.css @@ -30,3 +30,19 @@ color: var(--mantine-color-gray-5); cursor: pointer; } + +.inputField { + border-radius: rem(8px); +} + +.selectDescription { + font-size: 12px; + font-weight: 500; + color: var(--mantine-color-gray-6); +} + +.selectInput { + cursor: pointer; + border: 1px var(--mantine-color-gray-2) solid; + border-radius: rem(8px); +} diff --git a/src/pages/Home/styles/Home.module.css b/src/pages/Home/styles/Home.module.css index e980a0cc..2408eca0 100644 --- a/src/pages/Home/styles/Home.module.css +++ b/src/pages/Home/styles/Home.module.css @@ -37,3 +37,7 @@ color: black; } } + +.searchBar { + border-radius: rem(8px); +} diff --git a/src/pages/Login/index.tsx b/src/pages/Login/index.tsx index 9c2183a4..53337244 100644 --- a/src/pages/Login/index.tsx +++ b/src/pages/Login/index.tsx @@ -58,6 +58,7 @@ const Login: FC = () => { )} { { label: 'Schema Fields', value: 'schema' }, ]} value={configViewType} + classNames={{ input: classes.streamInput, description: classes.streamSelectDescription }} allowDeselect={false} onChange={(value) => onChange(value)} style={{ width: '100%', height: '100%' }} @@ -73,7 +74,12 @@ const SearchBar = (props: { const { placeholder, value, onChangeHandler } = props; return ( - + ); }; diff --git a/src/pages/Stream/Views/Manage/Settings.tsx b/src/pages/Stream/Views/Manage/Settings.tsx index b7096348..d291851e 100644 --- a/src/pages/Stream/Views/Manage/Settings.tsx +++ b/src/pages/Stream/Views/Manage/Settings.tsx @@ -77,7 +77,7 @@ const RetentionForm = (props: { updateRetentionConfig: ({ config }: { config: an style={{ width: '50%' }} /> onChange(e)} diff --git a/src/pages/Stream/components/Querier/FilterQueryBuilder.tsx b/src/pages/Stream/components/Querier/FilterQueryBuilder.tsx index fe5fcff2..6a7b93e1 100644 --- a/src/pages/Stream/components/Querier/FilterQueryBuilder.tsx +++ b/src/pages/Stream/components/Querier/FilterQueryBuilder.tsx @@ -99,8 +99,16 @@ const RuleView = (props: RuleViewType) => { const isError = !isDisabled ? value === '' : false; return ( - +