From 53629b93bc69b6b9c7b833507e2897d5974ab988 Mon Sep 17 00:00:00 2001 From: Simon L Date: Tue, 8 Nov 2022 13:10:58 +0100 Subject: [PATCH 1/2] fix missing share icon Signed-off-by: Simon L --- apps/files_sharing/css/icons.css | 4 ++-- apps/files_sharing/css/icons.scss | 6 +++--- apps/user_status/css/user-status-menu.css | 2 +- apps/user_status/css/user-status-menu.scss | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/files_sharing/css/icons.css b/apps/files_sharing/css/icons.css index ff5c5844df614..c914d8e512f72 100644 --- a/apps/files_sharing/css/icons.css +++ b/apps/files_sharing/css/icons.css @@ -78,7 +78,7 @@ */ .icon-room { /* $dir is the app name, so we add this to the icon var to avoid conflicts between apps */ - background-image: var(--icon-app-dark); + background-image: var(--icon-talk-dark); } .icon-circle { @@ -88,7 +88,7 @@ .icon-guests { /* $dir is the app name, so we add this to the icon var to avoid conflicts between apps */ - background-image: var(--icon-app-dark); + background-image: var(--icon-guests-dark); } /*# sourceMappingURL=icons.css.map */ diff --git a/apps/files_sharing/css/icons.scss b/apps/files_sharing/css/icons.scss index 529d8bd5100a6..8b06d73102b34 100644 --- a/apps/files_sharing/css/icons.scss +++ b/apps/files_sharing/css/icons.scss @@ -24,11 +24,11 @@ // This is the icons used in the sharing ui (multiselect) .icon-room { - @include icon-color('app', 'spreed', variables.$color-black); + background-image: var(--icon-talk-dark); } .icon-circle { - @include icon-color('circles', 'circles', variables.$color-black, 3, false); + background-image: var(--icon-circles-dark); } .icon-guests { - @include icon-color('app', 'guests', variables.$color-black); + background-image: var(--icon-guests-dark); } \ No newline at end of file diff --git a/apps/user_status/css/user-status-menu.css b/apps/user_status/css/user-status-menu.css index 6bc3104dd7a4b..9e8437665467e 100644 --- a/apps/user_status/css/user-status-menu.css +++ b/apps/user_status/css/user-status-menu.css @@ -78,7 +78,7 @@ */ .icon-user-status { /* $dir is the app name, so we add this to the icon var to avoid conflicts between apps */ - background-image: var(--icon-app-dark); + background-image: url("../img/app.svg"); } .icon-user-status-online { diff --git a/apps/user_status/css/user-status-menu.scss b/apps/user_status/css/user-status-menu.scss index 1a2066436f0b7..e6c0e3d2427bb 100644 --- a/apps/user_status/css/user-status-menu.scss +++ b/apps/user_status/css/user-status-menu.scss @@ -23,7 +23,7 @@ @import 'functions'; .icon-user-status { - @include icon-color('app', 'user_status', variables.$color-black, 1); + background-image: url("../img/app.svg"); } .icon-user-status-online { From 90a288c6eaa3eb2f5cdfb5d66469e3ed75473555 Mon Sep 17 00:00:00 2001 From: Simon L Date: Thu, 24 Nov 2022 11:43:06 +0100 Subject: [PATCH 2/2] address review Signed-off-by: Simon L Signed-off-by: nextcloud-command --- apps/files_sharing/css/icons.css | 5 +---- apps/files_sharing/css/icons.css.map | 2 +- apps/files_sharing/css/icons.scss | 2 +- apps/user_status/css/user-status-menu.css | 1 - apps/user_status/css/user-status-menu.css.map | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/apps/files_sharing/css/icons.css b/apps/files_sharing/css/icons.css index c914d8e512f72..3c5fbf8539d90 100644 --- a/apps/files_sharing/css/icons.css +++ b/apps/files_sharing/css/icons.css @@ -77,18 +77,15 @@ * @returns A background image with the url to the set to the requested icon. */ .icon-room { - /* $dir is the app name, so we add this to the icon var to avoid conflicts between apps */ background-image: var(--icon-talk-dark); } .icon-circle { - /* $dir is the app name, so we add this to the icon var to avoid conflicts between apps */ background-image: var(--icon-circles-dark); } .icon-guests { - /* $dir is the app name, so we add this to the icon var to avoid conflicts between apps */ - background-image: var(--icon-guests-dark); + background-image: var(--icon-user-dark); } /*# sourceMappingURL=icons.css.map */ diff --git a/apps/files_sharing/css/icons.css.map b/apps/files_sharing/css/icons.css.map index a2766ac03f7b0..09610c8b8fef2 100644 --- a/apps/files_sharing/css/icons.css.map +++ b/apps/files_sharing/css/icons.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../../../core/css/variables.scss","icons.scss","../../../core/css/functions.scss"],"names":[],"mappings":";AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAsBA;AAAA;AAAA;AA4BA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ADzBA;ACsCC;EAEA;;;ADrCD;ACmCC;EAEA;;;ADlCD;ACgCC;EAEA","file":"icons.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../../../core/css/variables.scss","icons.scss","../../../core/css/functions.scss"],"names":[],"mappings":";AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAsBA;AAAA;AAAA;AA4BA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ADzBA;EACC;;;AAED;EACC;;;AAED;EACC","file":"icons.css"} \ No newline at end of file diff --git a/apps/files_sharing/css/icons.scss b/apps/files_sharing/css/icons.scss index 8b06d73102b34..21bd1bde01961 100644 --- a/apps/files_sharing/css/icons.scss +++ b/apps/files_sharing/css/icons.scss @@ -30,5 +30,5 @@ background-image: var(--icon-circles-dark); } .icon-guests { - background-image: var(--icon-guests-dark); + background-image: var(--icon-user-dark); } \ No newline at end of file diff --git a/apps/user_status/css/user-status-menu.css b/apps/user_status/css/user-status-menu.css index 9e8437665467e..124c753128b38 100644 --- a/apps/user_status/css/user-status-menu.css +++ b/apps/user_status/css/user-status-menu.css @@ -77,7 +77,6 @@ * @returns A background image with the url to the set to the requested icon. */ .icon-user-status { - /* $dir is the app name, so we add this to the icon var to avoid conflicts between apps */ background-image: url("../img/app.svg"); } diff --git a/apps/user_status/css/user-status-menu.css.map b/apps/user_status/css/user-status-menu.css.map index 59bcbff61441f..61ee5d7e261b4 100644 --- a/apps/user_status/css/user-status-menu.css.map +++ b/apps/user_status/css/user-status-menu.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../../../core/css/variables.scss","user-status-menu.scss","../../../core/css/functions.scss"],"names":[],"mappings":";AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAsBA;AAAA;AAAA;AA4BA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AD1BA;ACuCC;EAEA;;;ADrCD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;EACA","file":"user-status-menu.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../../../core/css/variables.scss","user-status-menu.scss","../../../core/css/functions.scss"],"names":[],"mappings":";AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAsBA;AAAA;AAAA;AA4BA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AD1BA;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;EACA","file":"user-status-menu.css"} \ No newline at end of file