Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf501802

Browse files
committed
CSS styles and propeties added to tabbed container while ensuring the styling rules of container component
1 parent6b8a497 commitf501802

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

‎client/packages/lowcoder/src/comps/comps/selectInputComp/selectCompConstants.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ export const getStyle = (
6969
}
7070
.ant-select-selection-search-input {
7171
font-family:${(styleasSelectStyleType).fontFamily} !important;
72+
text-transform:${(styleasSelectStyleType).textTransform} !important;
73+
text-decoration:${(styleasSelectStyleType).textDecoration} !important;
7274
font-size:${(styleasSelectStyleType).textSize} !important;
7375
font-weight:${(styleasSelectStyleType).textWeight};
7476
color:${(styleasSelectStyleType).text} !important;
@@ -256,7 +258,6 @@ export const SelectUIView = (
256258
label={option.label}
257259
disabled={option.disabled}
258260
key={option.value}
259-
style={{fontFamily:"Montserrat"}}
260261
>
261262
<WrapperclassName="option-label">
262263
{props.options.findIndex((option)=>hasIcon(option.prefixIcon))>-1&&

‎client/packages/lowcoder/src/comps/comps/tabs/tabbedContainerComp.tsx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,14 @@ const getStyle = (
111111
}
112112
}
113113
114+
.ant-tabs-tab-btn {
115+
font-family:${style.fontFamily};
116+
font-weight:${style.textWeight};
117+
text-transform:${style.textTransform};
118+
text-decoration:${style.textDecoration};
119+
font-style:${style.fontStyle};
120+
}
121+
114122
.ant-tabs-ink-bar {
115123
background-color:${style.accent};
116124
}

‎client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,7 @@ export const MarginStyle = [
554554
exportconstContainerStyle=[
555555
// ...BG_STATIC_BORDER_RADIUS,
556556
getStaticBorder(),
557+
// ...STYLING_FIELDS_SEQUENCE.filter((style) => style.name !== 'border'),
557558
RADIUS,
558559
BORDER_WIDTH,
559560
MARGIN,
@@ -798,21 +799,21 @@ export const MultiSelectStyle = [
798799
]asconst;
799800

800801
exportconstTabContainerStyle=[
801-
{
802+
// Keep background related properties of container as STYLING_FIELDS_SEQUENCE has rest of the properties
803+
...replaceAndMergeMultipleStyles([...ContainerStyle.filter((style)=>['border','radius','borderWidth','margin','padding'].includes(style.name)===false),...STYLING_FIELDS_SEQUENCE],'text',[{
802804
name:"tabText",
803805
label:trans("style.tabText"),
804806
depName:"headerBackground",
805807
depType:DEP_TYPE.CONTRAST_TEXT,
806808
transformer:contrastText,
807-
},
809+
},]),
808810
{
809811
name:"accent",
810812
label:trans("style.tabAccent"),
811813
depTheme:"primary",
812814
depType:DEP_TYPE.SELF,
813815
transformer:toSelf,
814816
},
815-
...ContainerStyle,
816817
]asconst;
817818

818819
exportconstModalStyle=[
@@ -1102,7 +1103,7 @@ export const ProgressStyle = [
11021103
depTheme:"canvas",
11031104
depType:DEP_TYPE.CONTRAST_TEXT,
11041105
transformer:contrastText,
1105-
}]).filter((style)=>['border','borderWidth','textTransform','textDecoration'].includes(style.name)===false),
1106+
}]).filter((style)=>['border','borderWidth','textTransform','textDecoration'].includes(style.name)===false),
11061107
TRACK,
11071108
FILL,
11081109
SUCCESS,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp