Skip to content

Fix/padding condition #957

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

Merged
merged 2 commits into from
Jun 13, 2024
Merged

Fix/padding condition #957

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
98ac923
condition updated
MenamAfzal Jun 12, 2024
aeaa42f
styling updated
MenamAfzal Jun 12, 2024
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 client/packages/lowcoder/src/comps/comps/buttonComp/linkComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const Link = styled(Button)<{
font-style:${props.$style.fontStyle};
font-family:${props.$style.fontFamily};
font-weight:${props.$style.textWeight};
border: ${props.$style.borderWidth} solid ${props.$style.border};
border: ${props.$style.borderWidth} ${props.$style.borderStyle} ${props.$style.border};
border-radius:${props.$style.radius ? props.$style.radius:'0px'};
text-transform:${props.$style.textTransform ? props.$style.textTransform:''};
text-decoration:${props.$style.textDecoration ? props.$style.textDecoration:''} !important;
Expand Down
6 changes: 6 additions & 0 deletions client/packages/lowcoder/src/comps/comps/containerComp/cardComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ const Wrapper = styled.div<{
margin: ${props => props.$headerStyle?.margin};
padding: ${props => props.$headerStyle?.padding};
}
.ant-card-head-title{
font-size: ${props => props.$headerStyle?.textSize};
font-family: ${props => props.$headerStyle?.fontFamily};
}
.ant-card .ant-card-actions {
border-top: 1px solid ${props => props.$style?.border};
}
Expand All @@ -72,6 +76,8 @@ const Wrapper = styled.div<{
display: flex;
flex-direction: column;
justify-content: space-between;
margin: ${props => props.$style?.margin};
padding: ${props => props.$style?.padding};
background-color: ${props => props.$style?.background};
border: ${props => props.$style?.border};
rotate: ${props => props.$style?.rotation};
Expand Down
5 changes: 3 additions & 2 deletions client/packages/lowcoder/src/comps/comps/dividerComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ type IProps = DividerProps & {

const StyledDivider = styled(Divider) <IProps>`
margin-top: 3.5px;
rotate:${props=>props.$style.rotation};
.ant-divider-inner-text {
height: 32px;
display: flex;
Expand All @@ -50,8 +51,8 @@ const StyledDivider = styled(Divider) <IProps>`
return props.$style.margin;
}};
padding: ${(props) => props.$style.padding};

border-top: ${(props) => (props.$style.borderWidth && props.$style.borderWidth != "0px" ? props.$style.borderWidth : "1px")} ${(props) => (props.dashed ? "dashed" : "solid")} ${(props) => props.$style.border};
border-radius:${props=>props.$style.radius};
border-top: ${(props) => (props.$style.borderWidth && props.$style.borderWidth != "0px" ? props.$style.borderWidth : "1px")} ${(props) => props.$style.borderStyle} ${(props) => props.$style.border};
""
.ant-divider-inner-text::before, .ant-divider-inner-text::after {
border-block-start: ${(props) => (props.$style.borderWidth && props.$style.borderWidth != "0px" ? props.$style.borderWidth : "1px")} ${(props) => (props.dashed ? "dashed" : "solid")} ${(props) => props.$style.border} !important;
Expand Down
4 changes: 4 additions & 0 deletions client/packages/lowcoder/src/comps/comps/fileComp/fileComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ const getStyle = (style: FileStyleType) => {
font-weight:${style.textWeight};
font-style:${style.fontStyle};
border-width:${style.borderWidth};
border-style:${style.borderStyle};
text-decoration:${style.textDecoration};
text-transform:${style.textTransform};
text-transform:${style.textTransform};
}

.ant-btn:not(:disabled) {
Expand Down
4 changes: 3 additions & 1 deletion client/packages/lowcoder/src/comps/comps/iframeComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ const Wrapper = styled.div<{$style: IframeStyleType; $animationStyle:AnimationSt
props.$style.borderWidth ? props.$style.borderWidth : '1px'}
solid ${(props) => props.$style.border};
border-radius: calc(min(${(props) => props.$style.radius}, 20px));
rotate:${props => props.$style.rotation}
rotate:${props => props.$style.rotation};
margin:${props => props.$style.margin};
padding:${props => props.$style.padding};
${props=>props.$animationStyle}
iframe {
border: 0;
Expand Down
3 changes: 3 additions & 0 deletions client/packages/lowcoder/src/comps/comps/mediaComp/colorPickerComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ export function getStyle(style: ColorPickerStyleType) {
&:not(.ant-input-disabled, .ant-input-affix-wrapper-disabled),
input {
background-color: ${style.background};
color:${style.text};
font-weight:${style.textWeight};
font-family:${style.fontFamily};
border-color: ${style.border};
&:focus,
&.ant-input-affix-wrapper-focused {
Expand Down
2 changes: 1 addition & 1 deletion client/packages/lowcoder/src/comps/comps/meetingComp/controlButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const Container = styled.div<{ $style: any }>`
const getStyle = (style: any) => {
return css`
button {
border: 1px solid ${style.border};
border: ${style.borderWidth} ${style.borderStyle} ${style.border};
border-radius: ${style.radius};
margin: ${style.margin};
rotate: ${style.rotation};
Expand Down
12 changes: 7 additions & 5 deletions client/packages/lowcoder/src/comps/comps/navComp/navComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,18 @@ type IProps = {
$borderColor: string;
$borderWidth: string;
$borderRadius: string;
$animationStyle:AnimationStyleType;
$borderStyle: string;
$animationStyle: AnimationStyleType;
};

const Wrapper = styled("div")<
Pick<IProps, "$bgColor" | "$borderColor" | "$borderWidth" | "$borderRadius"|"$animationStyle">
Pick<IProps, "$bgColor" | "$borderColor" | "$borderWidth" | "$borderRadius"|"$borderStyle"|"$animationStyle">
>`
${props=>props.$animationStyle}
height: 100%;
border-radius: ${(props) => props.$borderRadius ? props.$borderRadius : '2px'};
border-radius: ${(props) =>props.$borderRadius ? props.$borderRadius : '2px'};
box-sizing: border-box;
border: ${(props) => props.$borderWidth ? `${props.$borderWidth}` : '1px'} solid ${(props) => props.$borderColor};
border: ${(props) => props.$borderWidth ? `${props.$borderWidth}` : '1px'} ${props=>props.$borderStyle} ${(props) => props.$borderColor};
background-color: ${(props) => props.$bgColor};
`;

Expand Down Expand Up @@ -212,11 +213,12 @@ const NavCompBase = new UICompBuilder(childrenMap, (props) => {

return (
<Wrapper
$borderStyle={props.style.borderStyle}
$animationStyle={props.animationStyle}
$borderColor={props.style.border}
$bgColor={props.style.background}
$borderWidth={props.style.borderWidth}
$borderRadius={props.style.borderRadius}
$borderRadius={props.style.radius}
>
<NavInner $justify={justify}>
{props.logoUrl && (
Expand Down
2 changes: 1 addition & 1 deletion client/packages/lowcoder/src/comps/comps/responsiveLayout/responsiveLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const RowWrapper = styled(Row)<{
${(props) => props.$animationStyle}
height: 100%;
border-radius: ${(props) => props.$style?.radius};
border-width: ${(props) => props.$style?.borderWidth}px;
border-width: ${(props) => props.$style?.borderWidth};
border-color: ${(props) => props.$style?.border};
border-style: ${(props) => props.$style?.borderStyle};
padding: ${(props) => props.$style.padding};
Expand Down
5 changes: 4 additions & 1 deletion client/packages/lowcoder/src/comps/comps/tabs/tabbedContainerComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const getStyle = (
return css`
&.ant-tabs {
overflow: hidden;
border: ${style.borderWidth} solid ${style.border};
border: ${style.borderWidth} ${style.borderStyle} ${style.border};
border-radius: ${style.radius};
padding: ${style.padding};
background-color: ${style.background};
Expand All @@ -91,11 +91,13 @@ const getStyle = (
.react-grid-layout {
border-radius: 0;
background-color: ${bodyStyle.background || 'transparent'};
padding: ${bodyStyle.containerBodyPadding};
}
}

> .ant-tabs-nav {
background-color: ${headerStyle.headerBackground || 'transparent'};
padding: ${headerStyle.containerHeaderPadding};

.ant-tabs-tab {
div {
Expand All @@ -108,6 +110,7 @@ const getStyle = (
}

.ant-tabs-tab-btn {
color: ${style.tabText} !important;
font-size: ${style.textSize};
font-family:${style.fontFamily};
font-weight:${style.textWeight};
Expand Down
1 change: 1 addition & 0 deletions client/packages/lowcoder/src/comps/comps/triContainerComp/triContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const getStyle = (style: ContainerStyleType) => {
border-color: ${style.border};
border-width: ${style.borderWidth};
border-radius: ${style.radius};
border-style: ${style.borderStyle};
overflow: hidden;
padding: ${style.padding};
${style.background && `background-color: ${style.background};`}
Expand Down
6 changes: 5 additions & 1 deletion client/packages/lowcoder/src/comps/generators/uiCompBuilder.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,11 @@ function UIView(props: {
} else {
return '0px'; // Both rotation and box-shadow are empty or restricted
}
} else if (rotationVal !== '' && rotationVal !== '0deg') {
}else if (
rotationVal === null ||
rotationVal === undefined ||
rotationVal === '0px'
){return '0px'} else if (rotationVal !== '' && rotationVal !== '0deg') {
// Rotation applied
if (
boxShadowVal === null ||
Expand Down
Loading