Skip to content

Commit 9a72dd5

Browse files
apply branding styles by default
1 parent 5d20a9b commit 9a72dd5

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

client/packages/lowcoder/src/components/ThemeSettingsSelector.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ export default function ThemeSettingsSelector(props: ColorConfigProps) {
238238
<div className="desc">{desc}</div>
239239
</div>
240240

241-
{themeSettingKey !== "borderRadius" &&
241+
{themeSettingKey !== "radius" &&
242242
themeSettingKey !== "margin" &&
243243
themeSettingKey !== "padding" &&
244244
themeSettingKey !== "gridColumns" &&
@@ -283,7 +283,7 @@ export default function ThemeSettingsSelector(props: ColorConfigProps) {
283283
/>
284284
</div>
285285
)} */}
286-
{themeSettingKey === "borderRadius" && (
286+
{themeSettingKey === "radius" && (
287287
<div className="config-input">
288288
<Radius $radius={defaultRadius || "0"}>
289289
<div>

client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,6 @@ export function TableCompView(props: {
825825

826826
return (
827827
<BackgroundColorContext.Provider value={style.background} >
828-
829828
<BackgroundWrapper ref={ref} $style={style} $tableAutoHeight={tableAutoHeight}>
830829
{toolbar.position === "above" && toolbarView}
831830
<TableWrapper

client/packages/lowcoder/src/pages/setting/theme/ThemeCompPanel.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ const IconContain = (props: {
7979
isSelected: boolean,
8080
}) => {
8181
const { Icon, isSelected } = props;
82-
console.log(isSelected);
8382
return (
8483
<CompIconDiv $w={64} $h={64} $isSelected={isSelected}>
8584
<Icon />

client/packages/lowcoder/src/pages/setting/theme/detail/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ class ThemeDetailPage extends React.Component<ThemeDetailPageProps, ThemeDetailP
167167
this.setState({
168168
theme: {
169169
...this.state.theme,
170-
[params.themeSettingKey]: params.color || params.radius || params.chart || params.margin || params.padding || params.gridColumns,
170+
[params.themeSettingKey]: params.color || params.radius || params.chart || params.margin || params.padding || params.gridColumns || params.borderWidth || params.borderStyle || params.fontFamily,
171171
},
172172
});
173173
}
@@ -209,7 +209,7 @@ class ThemeDetailPage extends React.Component<ThemeDetailPageProps, ThemeDetailP
209209
color: this.state.theme.primarySurface,
210210
},
211211
{
212-
settingsKey: 'borderColor',
212+
settingsKey: 'border',
213213
name: trans('themeDetail.borderColor'),
214214
desc: trans('themeDetail.borderColorDesc'),
215215
color: this.state.theme.border || this.state.theme.borderColor,
@@ -256,7 +256,7 @@ class ThemeDetailPage extends React.Component<ThemeDetailPageProps, ThemeDetailP
256256
title: trans('themeDetail.borders'),
257257
items: [
258258
{
259-
settingsKey: 'borderRadius',
259+
settingsKey: 'radius',
260260
name: trans('themeDetail.borderRadius'),
261261
desc: trans('themeDetail.borderRadiusDesc'),
262262
type: "radius",

0 commit comments

Comments
 (0)