diff options
-rw-r--r-- | css/unified-search.css | 21 | ||||
-rw-r--r-- | css/unified-search.scss | 23 | ||||
-rw-r--r-- | img/icon-contacts-white.svg | 1 | ||||
-rw-r--r-- | img/icon-mail-white.svg | 1 | ||||
-rw-r--r-- | img/icon-password-white.svg | 1 | ||||
-rw-r--r-- | img/icon-public-white.svg | 1 | ||||
-rw-r--r-- | img/icon-text-white.svg | 1 | ||||
-rw-r--r-- | lib/Search/ConversationSearch.php | 10 |
8 files changed, 31 insertions, 28 deletions
diff --git a/css/unified-search.css b/css/unified-search.css new file mode 100644 index 000000000..6134b6e33 --- /dev/null +++ b/css/unified-search.css @@ -0,0 +1,21 @@ +.unified-search .conversation-icon { + background-color: var(--color-background-darker); + background-size: 22px !important; +} + +/* We always want to use the white icons, this is why we don't use var(--color-white) here.*/ +.unified-search .conversation-icon.icon-public-white { + background-image: url(../img/icon-public-white.svg); +} +.unified-search .conversation-icon.icon-contacts-white { + background-image: url(../img/icon-contacts-white.svg); +} +.unified-search .conversation-icon.icon-password-white { + background-image: url(../img/icon-password-white.svg); +} +.unified-search .conversation-icon.icon-text-white { + background-image: url(../img/icon-text-white.svg); +} +.unified-search .conversation-icon.icon-mail-white { + background-image: url(../img/icon-mail-white.svg); +} diff --git a/css/unified-search.scss b/css/unified-search.scss deleted file mode 100644 index 7dc9bec3c..000000000 --- a/css/unified-search.scss +++ /dev/null @@ -1,23 +0,0 @@ -.unified-search { - .conversation-icon { - background-color: var(--color-background-darker); - background-size: 22px !important; - - // We always want to use the white icons, this is why we don't use var(--color-white) here. - &.icon-public { - background-image: url(icon-color-path('public', 'actions', 'fff', 1, true)); - } - &.icon-contacts { - background-image: url(icon-color-path('contacts', 'places', 'fff', 1, true)); - } - &.icon-password { - background-image: url(icon-color-path('password', 'actions', 'fff', 1, true)); - } - &.icon-file { - background-image: url(icon-color-path('text', 'filetypes', 'fff', 1, true)); - } - &.icon-mail { - background-image: url(icon-color-path('mail', 'actions', 'fff', 1, true)); - } - } -} diff --git a/img/icon-contacts-white.svg b/img/icon-contacts-white.svg new file mode 100644 index 000000000..92eec5e07 --- /dev/null +++ b/img/icon-contacts-white.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" height="16" width="16" version="1.1"><path fill="#fff" d="m9 1c-1.746 0-3 1.43-3 2.8 0 1.4 0.1 2.4 0.8 3.5 0.224 0.29 0.485 0.35 0.7 0.6 0.135 0.5 0.24 1 0.1 1.5-0.436 0.153-0.85 0.332-1.27 0.5-0.51-0.273-1.1-0.5-1.61-0.7-0.07-0.28-0.02-0.487 0.05-0.75 0.12-0.125 0.23-0.18 0.36-0.3 0.37-0.45 0.39-1.21 0.39-1.75 0-0.8-0.72-1.4-1.5-1.4-0.87 0-1.5 0.72-1.5 1.4h-0.02c0 0.7 0.05 1.2 0.4 1.75 0.1 0.15 0.242 0.175 0.35 0.3 0.0674 0.25 0.121 0.5 0.05 0.75-0.64 0.223-1.244 0.5-1.8 0.8-0.42 0.3-0.233 0.182-0.5 1.15-0.124 0.5 1.3 0.73 2.32 0.81-0.05 0.275-0.12 0.64-0.32 1.34-0.32 1.25 4.353 1.7 6 1.7 2.43 0 6.313-0.456 5.98-1.7-0.52-1.94-0.208-1.71-0.98-2.3-1.09-0.654-2.452-1.167-3.6-1.6-0.15-0.557-0.04-0.97 0.1-1.5 0.235-0.25 0.5-0.36 0.72-0.6 0.69-0.884 0.78-2.424 0.78-3.5 0-1.586-1.43-2.8-3-2.8z"/></svg> diff --git a/img/icon-mail-white.svg b/img/icon-mail-white.svg new file mode 100644 index 000000000..e16b74905 --- /dev/null +++ b/img/icon-mail-white.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="16" width="16" viewBox="0 0 16 16"><path fill="#fff" d="m0.89 3c-0.4924 0-0.89 0.4-0.89 0.89v8.2202c0 0.493 0.4 0.89 0.89 0.89h14.22c0.492 0 0.89-0.4 0.89-0.89v-8.2202c0-0.4924-0.4-0.89-0.89-0.89zm0.75 1.0278 6.0827 6.0817h0.52773l6.1102-6.0817 0.611 0.6109-3.6384 3.6934 2.75 2.8047-0.61102 0.61092-2.8052-2.8047-2.0275 2.0549h-1.2776l-2.0271-2.0553-2.8053 2.8323-0.6111-0.639 2.7774-2.8046-3.666-3.6932z"/></svg> diff --git a/img/icon-password-white.svg b/img/icon-password-white.svg new file mode 100644 index 000000000..d0ffdcc26 --- /dev/null +++ b/img/icon-password-white.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" width="16" height="16"><path fill="#fff" d="m8 1c-2.319 0-3.967 1.8644-4 4v2.5h-1.5v7.5h11v-7.5h-1.5v-2.5c0-2.27-1.8-3.9735-4-4zm0 2c1.25 0 2 0.963 2 2v2.5h-4v-2.5c0-1.174 0.747-2 2-2z"/></svg> diff --git a/img/icon-public-white.svg b/img/icon-public-white.svg new file mode 100644 index 000000000..d85defb6a --- /dev/null +++ b/img/icon-public-white.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" height="16" width="16"><path fill="#fff" d="m9.2363 2.166-3.1816 3.1836c-0.7071 0.7072-1.0378 1.6182-0.9883 2.457 0.05 0.8389 0.4333 1.5841 0.9883 2.1387l1.4121-1.416c-0.5672-0.5672-0.5444-1.2192 0.002-1.7656l3.1812-3.1817c0.52536-0.52536 1.2507-0.52318 1.772-0.002 0.48245 0.5556 0.52732 1.2382-0.004 1.7695l-0.82 0.8203c0.555 0.785 0.645 1.3663 0.593 2.2344l1.641-1.6406c1.2374-1.2374 1.2371-3.3645 0-4.6016-1.236-1.2361-3.342-1.2113-4.5957 0.004zm0.7071 3.8848-1.4141 1.418c0 0 0.003-00 0.004 0 0.55 0.55 0.50736 1.2582-0.004 1.7695l-3.1816 3.1817c-0.696 0.59192-1.2985 0.47105-1.7696 0-0.62636-0.62636-0.5-1.2681 0-1.768l0.85-0.8473c-0.556-0.7835-0.6484-1.365-0.5976-2.2324l-1.666 1.666c-1.2393 1.2393-1.2357 3.36 0 4.5957 1.2353 1.2353 3.362 1.2356 4.5976 0l3.1817-3.182c0.7086-0.7083 1.0396-1.6184 0.9906-2.4586-0.048-0.8401-0.432-1.5864-0.9887-2.1407z"/></svg> diff --git a/img/icon-text-white.svg b/img/icon-text-white.svg new file mode 100644 index 000000000..df7cea957 --- /dev/null +++ b/img/icon-text-white.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16"><path fill="#fff" d="m2.5 1c-0.28 0-0.5 0.22-0.5 0.5v13c0 0.28 0.22 0.5 0.5 0.5h11c0.28 0 0.5-0.22 0.5-0.5v-10.5l-3-3h-8.5zm1.5 2h6v1h-6v-1zm0 3h5v1h-5v-1zm0 3h8v1h-8v-1zm0 3h4v1h-4v-1z"/></svg> diff --git a/lib/Search/ConversationSearch.php b/lib/Search/ConversationSearch.php index b570f8ae9..c2c7c4a40 100644 --- a/lib/Search/ConversationSearch.php +++ b/lib/Search/ConversationSearch.php @@ -126,15 +126,15 @@ class ConversationSearch implements IProvider { } } } elseif ($room->getObjectType() === 'file') { - $iconClass = 'conversation-icon icon-file'; + $iconClass = 'conversation-icon icon-file-white'; } elseif ($room->getObjectType() === 'share:password') { - $iconClass = 'conversation-icon icon-password'; + $iconClass = 'conversation-icon icon-password-white'; } elseif ($room->getObjectType() === 'emails') { - $iconClass = 'conversation-icon icon-mail'; + $iconClass = 'conversation-icon icon-mail-white'; } elseif ($room->getType() === Room::TYPE_PUBLIC) { - $iconClass = 'conversation-icon icon-public'; + $iconClass = 'conversation-icon icon-public-white'; } else { - $iconClass = 'conversation-icon icon-contacts'; + $iconClass = 'conversation-icon icon-contacts-white'; } $entry = new SearchResultEntry( |