diff options
author | Simon L <szaimen@e.mail.de> | 2022-11-24 18:04:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-24 18:04:17 +0100 |
commit | 56daa07b632e8d194fcdb01c2915035fe9ad5e89 (patch) | |
tree | efacf775afdfa61edb551a4f55265ba20297a6d7 | |
parent | 45da5b088772f423968809d5ec6339e73c93858c (diff) | |
parent | 413555c068787df8e6ce358f314a26eafa8ac5f4 (diff) | |
download | nextcloud-server-56daa07b632e8d194fcdb01c2915035fe9ad5e89.tar.gz nextcloud-server-56daa07b632e8d194fcdb01c2915035fe9ad5e89.zip |
Merge pull request #35027 from nextcloud/enh/34970
fix missing share icon
-rw-r--r-- | apps/files_sharing/css/icons.css | 7 | ||||
-rw-r--r-- | apps/files_sharing/css/icons.css.map | 2 | ||||
-rw-r--r-- | apps/files_sharing/css/icons.scss | 6 | ||||
-rw-r--r-- | apps/user_status/css/user-status-menu.css | 3 | ||||
-rw-r--r-- | apps/user_status/css/user-status-menu.css.map | 2 | ||||
-rw-r--r-- | apps/user_status/css/user-status-menu.scss | 2 |
6 files changed, 9 insertions, 13 deletions
diff --git a/apps/files_sharing/css/icons.css b/apps/files_sharing/css/icons.css index ff5c5844df6..3c5fbf8539d 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-app-dark); + 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-app-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 a2766ac03f7..09610c8b8fe 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 529d8bd5100..21bd1bde019 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-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 6bc3104dd7a..124c753128b 100644 --- a/apps/user_status/css/user-status-menu.css +++ b/apps/user_status/css/user-status-menu.css @@ -77,8 +77,7 @@ * @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: var(--icon-app-dark); + background-image: url("../img/app.svg"); } .icon-user-status-online { diff --git a/apps/user_status/css/user-status-menu.css.map b/apps/user_status/css/user-status-menu.css.map index 59bcbff6144..61ee5d7e261 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 diff --git a/apps/user_status/css/user-status-menu.scss b/apps/user_status/css/user-status-menu.scss index 1a2066436f0..e6c0e3d2427 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 { |