Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Revert "fix: remove gap attribute"" #25

Merged
merged 2 commits into from
Oct 23, 2023
Merged

Revert "Revert "fix: remove gap attribute"" #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e69633c
Revert "Revert "fix: remove gap attribute""
LZS911 Oct 23, 2023
0e9e641
[fix]:(OrderList) remove mode in filter custom props
LZS911 Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/base/src/page/Login/style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ export const LoginPageRightStyleWrapper = styled('div')`
display: flex;
height: 100%;
align-items: center;
gap: 10px;
flex-shrink: 0;
align-self: stretch;

Expand All @@ -69,6 +68,7 @@ export const LoginPageRightStyleWrapper = styled('div')`

.label-primary {
color: ${({ theme }) => theme.baseTheme.sideMenu.title.color[0]};
margin-right: 10px;
}

.label-base {
Expand Down
24 changes: 18 additions & 6 deletions packages/base/src/page/Nav/SideMenu/GlobalSetting.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ const GlobalSetting: React.FC<{
onClick={() => handleClickItem(`/sqle/rule`)}
>
<IconViewRule />
<span>{t('dmsMenu.globalSettings.viewRule')}</span>
<span className="content-item-text">
{t('dmsMenu.globalSettings.viewRule')}
</span>
</div>
{/* FITRUE_isSQLE */}
</div>
Expand All @@ -63,37 +65,47 @@ const GlobalSetting: React.FC<{
onClick={() => handleClickItem('/userCenter')}
>
<IconUserCenter />
<span>{t('dmsMenu.globalSettings.userCenter')}</span>
<span className="content-item-text">
{t('dmsMenu.globalSettings.userCenter')}
</span>
</div>
{/* IFTRUE_isSQLE */}
<div
className="content-item"
onClick={() => handleClickItem('/sqle/reportStatistics')}
>
<IconReportStatistics />
<span>{t('dmsMenu.globalSettings.reportStatistics')}</span>
<span className="content-item-text">
{t('dmsMenu.globalSettings.reportStatistics')}
</span>
</div>
<div
className="content-item"
onClick={() => handleClickItem(`/sqle/rule`)}
>
<IconViewRule />
<span>{t('dmsMenu.globalSettings.viewRule')}</span>
<span className="content-item-text">
{t('dmsMenu.globalSettings.viewRule')}
</span>
</div>
<div
className="content-item"
onClick={() => handleClickItem(`/sqle/ruleManager`)}
>
<IconRuleManage />
<span>{t('dmsMenu.globalSettings.ruleManage')}</span>
<span className="content-item-text">
{t('dmsMenu.globalSettings.ruleManage')}
</span>
</div>
{/* FITRUE_isSQLE */}
<div
className="content-item"
onClick={() => handleClickItem(`/system`)}
>
<IconSystem />
<span>{t('dmsMenu.globalSettings.system')}</span>
<span className="content-item-text">
{t('dmsMenu.globalSettings.system')}
</span>
</div>
</div>
</EmptyBox>
Expand Down
4 changes: 3 additions & 1 deletion packages/base/src/page/Nav/SideMenu/ProjectSelector/style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { styled } from '@mui/material/styles';

export const ProjectSelectorStyleWrapper = styled(CustomSelect)`
&.${ANTD_PREFIX_STR}-select-lg.${ANTD_PREFIX_STR}-select.custom-project-selector {
margin: 4px 0;

.${ANTD_PREFIX_STR}-select-selector {
font-size: 13px;
font-weight: 500;
Expand Down Expand Up @@ -36,7 +38,6 @@ export const ProjectSelectorStyleWrapper = styled(CustomSelect)`
export const ProjectSelectorLabelStyleWrapper = styled('div')`
display: flex;
align-items: center;
gap: 8px;

&:hover {
.project-flag-icon {
Expand All @@ -52,6 +53,7 @@ export const ProjectSelectorLabelStyleWrapper = styled('div')`
}

.project-selector-label-text {
margin-left: 8px;
color: ${({ theme }) =>
theme.baseTheme.sideMenu.projectSelector.dropdown.labelColor};
}
Expand Down
12 changes: 9 additions & 3 deletions packages/base/src/page/Nav/SideMenu/UserNavigate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ const UserNavigate: React.FC<{
}}
>
<IconAccount />
<span>{t('dmsMenu.userNavigate.account')}</span>
<span className="content-item-text">
{t('dmsMenu.userNavigate.account')}
</span>
</div>
<div
className="content-item"
Expand All @@ -48,7 +50,9 @@ const UserNavigate: React.FC<{
}}
>
<IconAccount />
<span>{t('dmsMenu.userNavigate.viewVersion')}</span>
<span className="content-item-text">
{t('dmsMenu.userNavigate.viewVersion')}
</span>
</div>
<div
className="content-item"
Expand All @@ -58,7 +62,9 @@ const UserNavigate: React.FC<{
}}
>
<IconAccount />
<span>{t('dmsMenu.userNavigate.logout')}</span>
<span className="content-item-text">
{t('dmsMenu.userNavigate.logout')}
</span>
</div>
</div>
</PopoverInnerStyleWrapper>
Expand Down
15 changes: 10 additions & 5 deletions packages/base/src/page/Nav/SideMenu/style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,12 @@ export const SideMenuStyleWrapper = styled('div')`
display: flex;
flex-direction: column;
align-items: flex-start;
gap: 4px;

.title {
display: flex;
height: 60px;
padding: 8px;
align-items: center;
gap: 10px;
flex-shrink: 0;
align-self: stretch;
cursor: pointer;
Expand All @@ -52,6 +50,7 @@ export const SideMenuStyleWrapper = styled('div')`

.label-primary {
color: ${({ theme }) => theme.baseTheme.sideMenu.title.color[0]};
margin-right: 10px;
}

.label-base {
Expand Down Expand Up @@ -244,7 +243,6 @@ export const PopoverInnerStyleWrapper = styled('div')`
display: flex;
height: 32px;
align-items: center;
gap: 8px;
align-self: stretch;
border-radius: 4px;
font-size: 13px;
Expand All @@ -258,6 +256,10 @@ export const PopoverInnerStyleWrapper = styled('div')`
background-color: ${({ theme }) =>
theme.baseTheme.sideMenu.userNavigate.content.hoverBackgroundColor};
}

&-text {
margin-left: 8px;
}
}
}

Expand All @@ -281,21 +283,23 @@ export const PopoverInnerStyleWrapper = styled('div')`
padding: 3px;
justify-content: center;
align-items: flex-start;
gap: 4px;
border-radius: 100px;
border: ${({ theme }) =>
theme.baseTheme.sideMenu.userNavigate.footer.iconWrapper.border};
background-color: ${({ theme }) =>
theme.baseTheme.sideMenu.userNavigate.footer.iconWrapper
.backgroundColor};

&-wrapper:first-of-type {
margin-right: 4px;
}

&-wrapper {
display: flex;
width: 26px;
height: 26px;
justify-content: center;
align-items: center;
gap: 10px;
cursor: pointer;
color: ${({ theme }) =>
theme.baseTheme.sideMenu.userNavigate.footer.iconWrapper.color};
Expand Down Expand Up @@ -327,6 +331,7 @@ export const CEModeProjectWrapperStyleWrapper = styled('div')`
border: 1px solid
${({ theme }) => theme.sharedTheme.uiToken.colorBorderSecondary};
border-radius: 4px;
margin: 4px 0;

.project-flag-icon {
margin-right: 8px;
Expand Down
2 changes: 1 addition & 1 deletion packages/base/src/page/Project/Detail/NotFoundRecentlyProject/ProjectSelectorModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const ProjectSelectorModal: React.FC<ProjectSelectorModalProps> = ({
}
>
<SelectProjectModalContentStyleWrapper>
<span>{t('dmsProject.detail.modalTips')}</span>
<span className="modal-tips">{t('dmsProject.detail.modalTips')}</span>
<ProjectSelector
value={projectSelectorValue}
onChange={setProjectSelectorValue}
Expand Down
5 changes: 4 additions & 1 deletion packages/base/src/page/Project/Detail/NotFoundRecentlyProject/style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ export const SelectProjectModalContentStyleWrapper = styled('div')`
display: flex;
flex-direction: column;
width: 100%;
gap: 16px;

.modal-tips {
margin-bottom: 16px;
}

.custom-select-project.custom-project-selector {
width: 90%;
Expand Down
6 changes: 3 additions & 3 deletions packages/shared/lib/components/ActiontechTable/components/style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ export const ColumnsSettingDropdownStyleWrapper = styled('div')`
.columns-setting-item {
display: flex;
align-items: center;
gap: 8px;
cursor: pointer;
width: 80%;
padding: 4px 8px;
Expand All @@ -82,6 +81,7 @@ export const ColumnsSettingDropdownStyleWrapper = styled('div')`
theme.sharedTheme.components.columnsSetting.dropdown.item.labelColor};
overflow: hidden;
max-width: 70%;
margin-left: 8px;
}
}
}
Expand Down Expand Up @@ -143,7 +143,6 @@ export const CustomFilterRangePickerStyleWrapper = styled(BasicRangePicker)`

export const InlineTableActionButtonsStyleWrapper = styled('div')`
display: flex;
gap: 8px;

.actiontech-table-actions-button {
height: 24px;
Expand All @@ -153,6 +152,7 @@ export const InlineTableActionButtonsStyleWrapper = styled('div')`
.actiontech-table-actions-more-button {
height: 24px;
width: 24px;
margin-left: 8px;
}
`;

Expand All @@ -174,7 +174,6 @@ export const InlineTableActionMoreButtonPopoverStyleWrapper = styled('div')`
cursor: pointer;
display: flex;
align-items: center;
gap: 8px;
padding: 0 8px;
border-radius: 4px;

Expand All @@ -188,6 +187,7 @@ export const InlineTableActionMoreButtonPopoverStyleWrapper = styled('div')`
font-size: 13px;
font-weight: 500;
line-height: 20px;
margin-left: 8px;
}

&-icon {
Expand Down
6 changes: 0 additions & 6 deletions packages/shared/lib/components/BasicSelect/style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,3 @@ export const BasicSelectStyleWrapper = styled(Select<any>)`
}
}
`;

export const BasicSelectOptionLabelStyleWrapper = styled('span')`
display: flex;
gap: 8px;
`;
export const BasicSelectPlaceholderStyleWrapper = styled('span')``;
12 changes: 8 additions & 4 deletions packages/shared/lib/components/CustomSelect/style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,17 @@ export const CustomSelectStyleWrapper = styled(BasicSelect)`
.custom-select-placeholder {
display: inline-flex;
align-items: center;
gap: 8px;

&-value {
margin-left: 8px;
}
}
}

.${ANTD_PREFIX_STR}-select-selection-item {
.custom-select-option-content {
display: inline-flex;
align-items: center;
gap: 8px;
max-width: 100%;
}
}
Expand All @@ -56,7 +58,9 @@ export const CustomSelectStyleWrapper = styled(BasicSelect)`
padding-inline-end: 24px;

.${ANTD_PREFIX_STR}-select-selection-overflow {
gap: 2px;
&-item:not(:first-of-type) {
margin-left: 2px;
}
}
}
}
Expand All @@ -79,9 +83,9 @@ export const CustomSelectStyleWrapper = styled(BasicSelect)`

export const CustomSelectOptionLabelStyleWrapper = styled('span')`
display: flex;
gap: 8px;

.custom-select-option-content-prefix {
margin-right: 8px;
color: ${({ theme }) =>
theme.sharedTheme.components.customSelect.content.prefixColor};
}
Expand Down
10 changes: 8 additions & 2 deletions packages/sqle/src/page/Home/CommonTable/style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,23 @@ import { styled } from '@mui/material/styles';

export const DashboardNameStyleWrapper = styled('div')`
display: flex;
gap: 12px;
align-items: center;

.custom-icon {
margin-right: 12px;
}
`;

export const TableTitleStyleWrapper = styled('header')`
display: flex;
gap: 8px;
align-items: center;
font-size: 16px;
font-weight: 600;
color: ${({ theme }) => theme.sharedTheme.uiToken.colorTextBase};

.custom-icon {
margin-right: 8px;
}
`;

export const NoBorderedPageHeaderWrapper = styled('div')`
Expand Down
1 change: 1 addition & 0 deletions packages/sqle/src/page/Order/AuditDetail/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ const AuditDetail: React.FC<OrderDetailAuditResultProps> = ({
<Space
hidden={auditResultActiveKey === OVERVIEW_TAB_KEY}
className="audit-result-actions-wrap"
size={12}
>
<TableFilterButton
updateAllSelectedFilterItem={updateAllSelectedFilterItem}
Expand Down
2 changes: 0 additions & 2 deletions packages/sqle/src/page/Order/AuditDetail/style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ export const OrderDetailAuditResultStyleWrapper = styled('section')`
}

.${ANTD_PREFIX_STR}-space.audit-result-actions-wrap {
gap: 12px !important;

.${ANTD_PREFIX_STR}-divider.audit-result-actions-divider {
margin: 0;
height: 28px;
Expand Down
Loading
Loading