From 05d8537078ae008c244804ec21cf5eab78b796ac Mon Sep 17 00:00:00 2001 From: Pierre Gordon Date: Sat, 20 Jan 2018 02:34:18 -0500 Subject: [PATCH] Use generic icons for clients Signed off by: Pierre Gordon --- core/css/icons.scss | 36 ++++++----------------------------- core/img/clients/android.svg | 1 - core/img/clients/apple.svg | 1 - core/img/clients/chrome.svg | 1 - core/img/clients/desktop.svg | 1 + core/img/clients/edge.svg | 1 - core/img/clients/firefox.svg | 1 - core/img/clients/ie.svg | 1 - core/img/clients/ipad.svg | 1 - core/img/clients/iphone.svg | 1 - core/img/clients/phone.svg | 1 + core/img/clients/safari.svg | 1 - core/img/clients/tablet.svg | 1 + settings/css/settings.scss | 2 +- settings/js/authtoken_view.js | 22 ++++++++++----------- 15 files changed, 21 insertions(+), 51 deletions(-) delete mode 100644 core/img/clients/android.svg delete mode 100644 core/img/clients/apple.svg delete mode 100644 core/img/clients/chrome.svg create mode 100644 core/img/clients/desktop.svg delete mode 100644 core/img/clients/edge.svg delete mode 100644 core/img/clients/firefox.svg delete mode 100644 core/img/clients/ie.svg delete mode 100644 core/img/clients/ipad.svg delete mode 100644 core/img/clients/iphone.svg create mode 100644 core/img/clients/phone.svg delete mode 100644 core/img/clients/safari.svg create mode 100644 core/img/clients/tablet.svg diff --git a/core/css/icons.scss b/core/css/icons.scss index 4604c79e67..3c3dff56c1 100644 --- a/core/css/icons.scss +++ b/core/css/icons.scss @@ -518,40 +518,16 @@ img, object, video, button, textarea, input, select, div[contenteditable=true] { /* CLIENTS ------------------------------------------------------------------- */ -.icon-client-android { - background-image: url('../img/clients/android.svg?v=1'); +.icon-desktop { + background-image: url('../img/clients/desktop.svg?v=1'); } -.icon-client-apple { - background-image: url('../img/clients/apple.svg?v=1'); +.icon-phone { + background-image: url('../img/clients/phone.svg?v=1'); } -.icon-client-chrome { - background-image: url('../img/clients/chrome.svg?v=1'); -} - -.icon-client-edge { - background-image: url('../img/clients/edge.svg?v=1'); -} - -.icon-client-firefox { - background-image: url('../img/clients/firefox.svg?v=1'); -} - -.icon-client-ie { - background-image: url('../img/clients/ie.svg?v=1'); -} - -.icon-client-ipad { - background-image: url('../img/clients/ipad.svg?v=1'); -} - -.icon-client-iphone { - background-image: url('../img/clients/iphone.svg?v=1'); -} - -.icon-client-safari { - background-image: url('../img/clients/safari.svg?v=1'); +.icon-tablet { + background-image: url('../img/clients/tablet.svg?v=1'); } /* APP CATEGORIES ------------------------------------------------------------------- */ diff --git a/core/img/clients/android.svg b/core/img/clients/android.svg deleted file mode 100644 index 1dab3c9ad9..0000000000 --- a/core/img/clients/android.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/core/img/clients/apple.svg b/core/img/clients/apple.svg deleted file mode 100644 index 9311dedac7..0000000000 --- a/core/img/clients/apple.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/core/img/clients/chrome.svg b/core/img/clients/chrome.svg deleted file mode 100644 index bfec6ae7dc..0000000000 --- a/core/img/clients/chrome.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/core/img/clients/desktop.svg b/core/img/clients/desktop.svg new file mode 100644 index 0000000000..df4f5b6884 --- /dev/null +++ b/core/img/clients/desktop.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/clients/edge.svg b/core/img/clients/edge.svg deleted file mode 100644 index 4533d8f582..0000000000 --- a/core/img/clients/edge.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/core/img/clients/firefox.svg b/core/img/clients/firefox.svg deleted file mode 100644 index 6c2cb6cce0..0000000000 --- a/core/img/clients/firefox.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/core/img/clients/ie.svg b/core/img/clients/ie.svg deleted file mode 100644 index 620ec8d7e8..0000000000 --- a/core/img/clients/ie.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/core/img/clients/ipad.svg b/core/img/clients/ipad.svg deleted file mode 100644 index 85b3bf3c0e..0000000000 --- a/core/img/clients/ipad.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/core/img/clients/iphone.svg b/core/img/clients/iphone.svg deleted file mode 100644 index 704022cb8e..0000000000 --- a/core/img/clients/iphone.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/core/img/clients/phone.svg b/core/img/clients/phone.svg new file mode 100644 index 0000000000..a45c5c4c72 --- /dev/null +++ b/core/img/clients/phone.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/clients/safari.svg b/core/img/clients/safari.svg deleted file mode 100644 index 629cebb959..0000000000 --- a/core/img/clients/safari.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/core/img/clients/tablet.svg b/core/img/clients/tablet.svg new file mode 100644 index 0000000000..a4d41be305 --- /dev/null +++ b/core/img/clients/tablet.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/css/settings.scss b/settings/css/settings.scss index 6f7bcafbcb..1562dfbc37 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -343,7 +343,7 @@ table.nostyle { div { opacity: 0.57; width: inherit; - padding-top: 4px; + padding-top: 5px; } } border-top: 1px solid #DDD; diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js index 4229929b4f..b8645e4cc8 100644 --- a/settings/js/authtoken_view.js +++ b/settings/js/authtoken_view.js @@ -150,17 +150,17 @@ }; var iconMap = { - ie: 'icon-client-ie', - edge: 'icon-client-edge', - firefox: 'icon-client-firefox', - chrome: 'icon-client-chrome', - safari: 'icon-client-safari', - androidChrome: 'icon-client-chrome', - iphone: 'icon-client-iphone', - ipad: 'icon-client-ipad', - iosClient: 'icon-client-apple', - androidClient: 'icon-client-android', - davDroid: 'icon-client-android', + ie: 'icon-desktop', + edge: 'icon-desktop', + firefox: 'icon-desktop', + chrome: 'icon-desktop', + safari: 'icon-desktop', + androidChrome: 'icon-phone', + iphone: 'icon-phone', + ipad: 'icon-tablet', + iosClient: 'icon-phone', + androidClient: 'icon-phone', + davDroid: 'icon-phone', webPirate: 'icon-link', sailfishBrowser: 'icon-link' };