diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss index 1f18cc068c2ec..20b84d2a0d38f 100644 --- a/apps/theming/css/theming.scss +++ b/apps/theming/css/theming.scss @@ -20,8 +20,8 @@ filter: invert(1); filter: progid:DXImageTransform.Microsoft.BasicImage(invert='1'); } - #contactsmenu .icon-contacts svg path { - fill: #000; + #contactsmenu .icon-contacts { + background-image: url('../../../core/img/places/contacts-dark.svg'); } #settings .icon-settings-white { background-image: url('../../../core/img/actions/settings-dark.svg'); diff --git a/core/css/icons.scss b/core/css/icons.scss index e694d807ba58d..b2702a2995046 100644 --- a/core/css/icons.scss +++ b/core/css/icons.scss @@ -18,20 +18,6 @@ background-position: center; min-width: 16px; min-height: 16px; - display: inline-flex; - align-self: center; - position: relative; -} - -[class^='icon-'] svg, -[class*=' icon-'] svg { - height: 16px; - width: 16px; - vertical-align: -3px; // counter default DOM offset -} - -.icon-white svg path { - fill: $color-primary-text; } .icon-breadcrumb { @@ -459,6 +445,14 @@ img, object, video, button, textarea, input, select { background-image: url('../img/places/calendar-dark.svg?v=1'); } +.icon-contacts { + background-image: url('../img/places/contacts.svg?v=1'); +} + +.icon-contacts-dark { + background-image: url('../img/places/contacts-dark.svg?v=1'); +} + .icon-files { background-image: url('../img/places/files.svg?v=1'); } diff --git a/core/img/places/contacts-dark.svg b/core/img/places/contacts-dark.svg new file mode 100644 index 0000000000000..56ff262e91f0e --- /dev/null +++ b/core/img/places/contacts-dark.svg @@ -0,0 +1 @@ + diff --git a/core/img/places/contacts.svg b/core/img/places/contacts.svg index 56ff262e91f0e..4e6206db09c17 100644 --- a/core/img/places/contacts.svg +++ b/core/img/places/contacts.svg @@ -1 +1 @@ - + diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 8dfd86731cec3..6b9db9389ba07 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -107,9 +107,7 @@ class="app-icon"/>
- +
diff --git a/settings/js/federationsettingsview.js b/settings/js/federationsettingsview.js index d58098257bd8b..1a0a3dcb4d184 100644 --- a/settings/js/federationsettingsview.js +++ b/settings/js/federationsettingsview.js @@ -181,14 +181,14 @@ _setFieldScopeIcon: function(field, scope) { var $icon = this.$('#' + field + 'form > h2 > span'); $icon.removeClass('icon-password'); - $icon.removeClass('icon-contacts'); + $icon.removeClass('icon-contacts-dark'); $icon.removeClass('icon-link'); switch (scope) { case 'private': $icon.addClass('icon-password'); break; case 'contacts': - $icon.addClass('icon-contacts'); + $icon.addClass('icon-contacts-dark'); break; case 'public': $icon.addClass('icon-link');