fix missing icons in wallpaper settings (#4308)

* remove references to non-existing icons * fix missing icons in wallpaper settings * add pr number to changelog
deltachat · Nov 2, 2024 · e2cc34e · e2cc34e
1 parent f83ce46
commit e2cc34e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,7 @@
 - improve keyboard and screen-reader accessibility #4210
 - "Page Up" / "Page Down" not working on scrollable elements except for messages list #4269
 - make name more readable in sticker reply #3291
+- fix missing icons in wallpaper settings #4308
 
 <a id="1_47_0"></a>
 

diff --git a/images/icons/image_outline.svg b/images/icons/image_outline.svg
diff --git a/images/icons/palette.svg b/images/icons/palette.svg
diff --git a/packages/frontend/scss/dialogs/_settings.scss b/packages/frontend/scss/dialogs/_settings.scss
@@ -40,7 +40,7 @@
   align-content: center;
   justify-content: center;
   background-color: #d6d6d6 !important;
-  color: #545454;
+  --icon-color: #545454;
 }
 
 .background-options > div,

diff --git a/packages/frontend/src/components/Icon/index.tsx b/packages/frontend/src/components/Icon/index.tsx
@@ -20,14 +20,15 @@ export type IconName =
   | 'favorite'
   | 'forum'
   | 'image'
+  | 'image_outline'
   | 'info'
   | 'lead-pencil'
   | 'list'
   | 'map'
-  | 'media'
   | 'minus'
   | 'more'
   | 'open_in_new'
+  | 'palette'
   | 'paperclip'
   | 'person'
   | 'person-filled'
@@ -41,7 +42,6 @@ export type IconName =
   | 'settings'
   | 'swap_vert'
   | 'swap_hor'
-  | 'tint'
   | 'undo'
   | 'upload-file'
 

diff --git a/packages/frontend/src/components/Icon/styles.module.scss b/packages/frontend/src/components/Icon/styles.module.scss
@@ -23,6 +23,10 @@
     background-color: var(--fullScreenMediaButtons);
   }
 
+  &.iconColorCSSVar {
+    background-color: var(--icon-color);
+  }
+
   &.remove {
     &:hover {
       background-color: #bf0000;

diff --git a/packages/frontend/src/components/Settings/Appearance.tsx b/packages/frontend/src/components/Settings/Appearance.tsx
@@ -279,14 +279,14 @@ function BackgroundSelector({
             className='custom-image'
             aria-label={tx('pref_background_custom_image')}
           >
-            <Icon icon='media' size={30} />
+            <Icon icon='image_outline' size={36} coloring='iconColorCSSVar' />
           </div>
           <div
             onClick={onButton.bind(null, SetBackgroundAction.customColor)}
             className='custom-color'
             aria-label={tx('pref_background_custom_color')}
           >
-            <Icon icon='tint' size={30} />
+            <Icon icon='palette' size={36} coloring='iconColorCSSVar' />
           </div>
         </div>
       </div>