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

chore: Updating the settings icon throughout the product #37330

Merged
merged 3 commits into from
Nov 12, 2024
Merged

chore: Updating the settings icon throughout the product #37330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
001df4a
updating the settings icon overall the product
ankitakinger Nov 12, 2024
d5b45f3
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
ankitakinger Nov 12, 2024
0e57343
updating admin settings icon
ankitakinger Nov 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
24 changes: 3 additions & 21 deletions ...client/packages/design-system/ads/src/__assets__/icons/ads/settings-v3-icon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions app/client/packages/dsl/src/migrate/helpers/widget-configs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7311,7 +7311,7 @@
"controlType": "OPEN_CONFIG_PANEL",
"buttonConfig": {
"label": "Configure",
"icon": "settings-2-line"
"icon": "settings-v3"
},
"label": "Configure menu items",
"isBindProperty": false,
Expand Down Expand Up @@ -47874,7 +47874,7 @@
"controlType": "OPEN_CONFIG_PANEL",
"buttonConfig": {
"label": "Configure",
"icon": "settings-2-line"
"icon": "settings-v3"
},
"label": "Configure menu items",
"isBindProperty": false,
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/IDE/Components/ToolbarSettingsPopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const ToolbarSettingsPopover = (props: Props) => {
<ToggleButton
data-testid={props.dataTestId}
disabled={props.disabled}
icon="settings-2-line"
icon="settings-v3"
isSelected={isOpen}
onClick={handleButtonClick}
size="md"
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/ce/pages/AdminSettings/config/general.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ export const APPSMITH_ALLOWED_FRAME_ANCESTORS_SETTING: Setting = {
};

export const config: AdminConfigType = {
icon: "settings-2-line",
icon: "settings-v3",
type: SettingCategories.GENERAL,
categoryType: CategoryType.GENERAL,
controlType: SettingTypes.GROUP,
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/ce/pages/Applications/WorkspaceMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function WorkspaceMenu({
})
}
>
<Icon name="settings-2-line" size="md" />
<Icon name="settings-v3" size="md" />
Settings
</CustomMenuItem>
</>
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/components/propertyControls/DraggableListCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export function DraggableListCard(props: RenderComponentProps) {
}}
onFocus={(e) => e.stopPropagation()}
size="sm"
startIcon="settings-2-line"
startIcon="settings-v3"
/>
)}
{showDelete && (
Expand Down
2 changes: 1 addition & 1 deletion .../modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/contentConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const propertyPaneContentConfig = [
controlType: "OPEN_CONFIG_PANEL",
buttonConfig: {
label: "Configure",
icon: "settings-2-line",
icon: "settings-v3",
},
label: "Configure menu items",
isBindProperty: false,
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ function AppSettings() {
const SectionHeadersConfig: SectionHeaderProps[] = [
{
id: "t--general-settings-header",
icon: "settings-2-line",
icon: "settings-v3",
ankitakinger marked this conversation as resolved.
Show resolved Hide resolved
isSelected: selectedTab.type === AppSettingsTabs.General,
name: createMessage(GENERAL_SETTINGS_SECTION_HEADER),
onClick: () => {
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ const getQuickActionButtons = ({
},
{
className: "t--bottom-git-settings",
icon: "settings-2-line",
icon: "settings-v3",
onClick: settings,
tooltipText: createMessage(GIT_SETTINGS),
},
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/pages/Editor/gitSync/components/GitChangesList/StaticChange.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const allStaticChangeDefs: Record<
[StaticChangeKind.SETTINGS]: (status: GitStatusData) => ({
condition: status.modified.includes("application.json"),
message: "Application settings modified",
iconName: "settings-2-line",
iconName: "settings-v3",
ankitakinger marked this conversation as resolved.
Show resolved Hide resolved
}),
[StaticChangeKind.THEME]: (status: GitStatusData) => ({
condition: status.modified.includes("theme.json"),
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/pages/common/SearchBar/HomepageHeaderAction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const HomepageHeaderAction = ({
});
}}
size="md"
startIcon="settings-control"
startIcon="settings-v3"
ankitakinger marked this conversation as resolved.
Show resolved Hide resolved
/>
</Tooltip>
)}
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/widgets/MenuButtonWidget/widget/propertyConfig/contentConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export default [
controlType: "OPEN_CONFIG_PANEL",
buttonConfig: {
label: "Configure",
icon: "settings-2-line",
icon: "settings-v3",
},
label: "Configure menu items",
isBindProperty: false,
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/widgets/TableWidgetV2/widget/propertyConfig/PanelConfig/Basic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ export default {
controlType: "OPEN_CONFIG_PANEL",
buttonConfig: {
label: "Configure",
icon: "settings-2-line",
icon: "settings-v3",
},
label: "Configure menu items",
isBindProperty: false,
Expand Down
Loading