From 7109604c012768a7bd8f547db0f466d6fda69ca2 Mon Sep 17 00:00:00 2001 From: Pierre Gordon Date: Tue, 9 Jan 2018 05:14:27 -0500 Subject: Add icons to devices/sessions Signed off by: Pierre Gordon --- settings/css/settings.scss | 15 ++++++++++++-- settings/img/clients/android.svg | 1 + settings/img/clients/apple.svg | 1 + settings/img/clients/chrome.svg | 1 + settings/img/clients/edge.svg | 1 + settings/img/clients/firefox.svg | 1 + settings/img/clients/globe.svg | 1 + settings/img/clients/ie.svg | 1 + settings/img/clients/ipad.svg | 1 + settings/img/clients/iphone.svg | 1 + settings/img/clients/safari.svg | 1 + settings/js/authtoken_view.js | 24 +++++++++++++++++++++++ settings/templates/settings/personal/security.php | 1 + 13 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 settings/img/clients/android.svg create mode 100644 settings/img/clients/apple.svg create mode 100644 settings/img/clients/chrome.svg create mode 100644 settings/img/clients/edge.svg create mode 100644 settings/img/clients/firefox.svg create mode 100644 settings/img/clients/globe.svg create mode 100644 settings/img/clients/ie.svg create mode 100644 settings/img/clients/ipad.svg create mode 100644 settings/img/clients/iphone.svg create mode 100644 settings/img/clients/safari.svg diff --git a/settings/css/settings.scss b/settings/css/settings.scss index 268cb0eee5d..1025a862b17 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -329,11 +329,22 @@ table.nostyle { } } .token-list td { - &.more { + &%icon { overflow: visible; position: relative; width: 16px; } + &.more { + @extend %icon; + } + &.client { + @extend %icon; + + img { + opacity: 0.57; + width: inherit; + } + } border-top: 1px solid #DDD; text-overflow: ellipsis; max-width: 200px; @@ -342,7 +353,7 @@ table.nostyle { vertical-align: top; position: relative; } - tr > *:nth-child(2) { + tr > *:nth-child(3) { text-align: right; } .token-list { diff --git a/settings/img/clients/android.svg b/settings/img/clients/android.svg new file mode 100644 index 00000000000..1b03ede23c8 --- /dev/null +++ b/settings/img/clients/android.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/img/clients/apple.svg b/settings/img/clients/apple.svg new file mode 100644 index 00000000000..ffc122c173d --- /dev/null +++ b/settings/img/clients/apple.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/img/clients/chrome.svg b/settings/img/clients/chrome.svg new file mode 100644 index 00000000000..99d1a81550d --- /dev/null +++ b/settings/img/clients/chrome.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/img/clients/edge.svg b/settings/img/clients/edge.svg new file mode 100644 index 00000000000..e053010ca9f --- /dev/null +++ b/settings/img/clients/edge.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/img/clients/firefox.svg b/settings/img/clients/firefox.svg new file mode 100644 index 00000000000..a8e48546227 --- /dev/null +++ b/settings/img/clients/firefox.svg @@ -0,0 +1 @@ + diff --git a/settings/img/clients/globe.svg b/settings/img/clients/globe.svg new file mode 100644 index 00000000000..5c0333eed88 --- /dev/null +++ b/settings/img/clients/globe.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/img/clients/ie.svg b/settings/img/clients/ie.svg new file mode 100644 index 00000000000..95732574560 --- /dev/null +++ b/settings/img/clients/ie.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/img/clients/ipad.svg b/settings/img/clients/ipad.svg new file mode 100644 index 00000000000..d4a0b343cba --- /dev/null +++ b/settings/img/clients/ipad.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/img/clients/iphone.svg b/settings/img/clients/iphone.svg new file mode 100644 index 00000000000..797de4a95ad --- /dev/null +++ b/settings/img/clients/iphone.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/img/clients/safari.svg b/settings/img/clients/safari.svg new file mode 100644 index 00000000000..b747f961689 --- /dev/null +++ b/settings/img/clients/safari.svg @@ -0,0 +1 @@ + diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js index a20434be872..1e2a6643d59 100644 --- a/settings/js/authtoken_view.js +++ b/settings/js/authtoken_view.js @@ -27,6 +27,9 @@ var TEMPLATE_TOKEN = '' + + '' + + '' + + '' + '' + '{{name}}' + '' @@ -146,6 +149,22 @@ sailfishBrowser: 'SailfishBrowser' }; + var iconMap = { + ie: 'ie.svg', + edge: 'edge.svg', + firefox: 'firefox.svg', + chrome: 'chrome.svg', + safari: 'apple.svg', + androidChrome: 'chrome.svg', + iphone: 'iphone.svg', + ipad: 'ipad.svg', + iosClient: 'apple.svg', + androidClient: 'android.svg', + davDroid: 'android.svg', + webPirate: 'globe.svg', + sailfishBrowser: 'globe.svg' + }; + if (matches) { viewData.name = t('settings', 'Sync client - {os}', { os: matches[1], @@ -161,6 +180,11 @@ } else { viewData.name = nameMap[client]; } + + // update title - for easier view + viewData.title = viewData.name; + + viewData.icon = '/settings/img/clients/' + iconMap[client]; } } if (viewData.current) { diff --git a/settings/templates/settings/personal/security.php b/settings/templates/settings/personal/security.php index 3a324bf8d21..cf52315ff04 100644 --- a/settings/templates/settings/personal/security.php +++ b/settings/templates/settings/personal/security.php @@ -37,6 +37,7 @@ script('settings', [ + -- cgit v1.2.3 From 50ac20a42ac0dec15a338fd37d766fd507ee8496 Mon Sep 17 00:00:00 2001 From: Pierre Gordon Date: Tue, 9 Jan 2018 07:57:41 -0500 Subject: Make icons consistent Signed off by: Pierre Gordon --- settings/img/clients/android.svg | 2 +- settings/img/clients/apple.svg | 2 +- settings/img/clients/chrome.svg | 2 +- settings/img/clients/edge.svg | 2 +- settings/img/clients/firefox.svg | 2 +- settings/img/clients/globe.svg | 2 +- settings/img/clients/ie.svg | 2 +- settings/img/clients/ipad.svg | 2 +- settings/img/clients/iphone.svg | 2 +- settings/img/clients/safari.svg | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/settings/img/clients/android.svg b/settings/img/clients/android.svg index 1b03ede23c8..1dab3c9ad93 100644 --- a/settings/img/clients/android.svg +++ b/settings/img/clients/android.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/settings/img/clients/apple.svg b/settings/img/clients/apple.svg index ffc122c173d..9311dedac71 100644 --- a/settings/img/clients/apple.svg +++ b/settings/img/clients/apple.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/settings/img/clients/chrome.svg b/settings/img/clients/chrome.svg index 99d1a81550d..bfec6ae7dc6 100644 --- a/settings/img/clients/chrome.svg +++ b/settings/img/clients/chrome.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/settings/img/clients/edge.svg b/settings/img/clients/edge.svg index e053010ca9f..4533d8f5822 100644 --- a/settings/img/clients/edge.svg +++ b/settings/img/clients/edge.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/settings/img/clients/firefox.svg b/settings/img/clients/firefox.svg index a8e48546227..6c2cb6cce06 100644 --- a/settings/img/clients/firefox.svg +++ b/settings/img/clients/firefox.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/settings/img/clients/globe.svg b/settings/img/clients/globe.svg index 5c0333eed88..99dc6a0750e 100644 --- a/settings/img/clients/globe.svg +++ b/settings/img/clients/globe.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/settings/img/clients/ie.svg b/settings/img/clients/ie.svg index 95732574560..620ec8d7e8d 100644 --- a/settings/img/clients/ie.svg +++ b/settings/img/clients/ie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/settings/img/clients/ipad.svg b/settings/img/clients/ipad.svg index d4a0b343cba..85b3bf3c0e1 100644 --- a/settings/img/clients/ipad.svg +++ b/settings/img/clients/ipad.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/settings/img/clients/iphone.svg b/settings/img/clients/iphone.svg index 797de4a95ad..704022cb8e5 100644 --- a/settings/img/clients/iphone.svg +++ b/settings/img/clients/iphone.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/settings/img/clients/safari.svg b/settings/img/clients/safari.svg index b747f961689..629cebb9596 100644 --- a/settings/img/clients/safari.svg +++ b/settings/img/clients/safari.svg @@ -1 +1 @@ - + \ No newline at end of file -- cgit v1.2.3 From cd9de001f74a1d3fcfd6b7b073ad0ab7060d9f52 Mon Sep 17 00:00:00 2001 From: Pierre Gordon Date: Tue, 9 Jan 2018 08:21:27 -0500 Subject: Centralize icons Signed off by: Pierre Gordon --- core/css/icons.scss | 38 ++++++++++++++++++++++++++++++++++++++ core/img/clients/android.svg | 1 + core/img/clients/apple.svg | 1 + core/img/clients/chrome.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/safari.svg | 1 + settings/css/settings.scss | 2 +- settings/img/clients/android.svg | 1 - settings/img/clients/apple.svg | 1 - settings/img/clients/chrome.svg | 1 - settings/img/clients/edge.svg | 1 - settings/img/clients/firefox.svg | 1 - settings/img/clients/globe.svg | 1 - settings/img/clients/ie.svg | 1 - settings/img/clients/ipad.svg | 1 - settings/img/clients/iphone.svg | 1 - settings/img/clients/safari.svg | 1 - settings/js/authtoken_view.js | 30 +++++++++++++++--------------- 22 files changed, 63 insertions(+), 26 deletions(-) create mode 100644 core/img/clients/android.svg create mode 100644 core/img/clients/apple.svg create mode 100644 core/img/clients/chrome.svg create mode 100644 core/img/clients/edge.svg create mode 100644 core/img/clients/firefox.svg create mode 100644 core/img/clients/ie.svg create mode 100644 core/img/clients/ipad.svg create mode 100644 core/img/clients/iphone.svg create mode 100644 core/img/clients/safari.svg delete mode 100644 settings/img/clients/android.svg delete mode 100644 settings/img/clients/apple.svg delete mode 100644 settings/img/clients/chrome.svg delete mode 100644 settings/img/clients/edge.svg delete mode 100644 settings/img/clients/firefox.svg delete mode 100644 settings/img/clients/globe.svg delete mode 100644 settings/img/clients/ie.svg delete mode 100644 settings/img/clients/ipad.svg delete mode 100644 settings/img/clients/iphone.svg delete mode 100644 settings/img/clients/safari.svg diff --git a/core/css/icons.scss b/core/css/icons.scss index fbf36e2fbbc..4604c79e677 100644 --- a/core/css/icons.scss +++ b/core/css/icons.scss @@ -516,6 +516,44 @@ img, object, video, button, textarea, input, select, div[contenteditable=true] { background-image: url('../img/places/picture.svg?v=1'); } +/* CLIENTS ------------------------------------------------------------------- */ + +.icon-client-android { + background-image: url('../img/clients/android.svg?v=1'); +} + +.icon-client-apple { + background-image: url('../img/clients/apple.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'); +} + /* APP CATEGORIES ------------------------------------------------------------------- */ .icon-category-installed { background-image: url('../img/actions/user.svg?v=1'); diff --git a/core/img/clients/android.svg b/core/img/clients/android.svg new file mode 100644 index 00000000000..1dab3c9ad93 --- /dev/null +++ b/core/img/clients/android.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/clients/apple.svg b/core/img/clients/apple.svg new file mode 100644 index 00000000000..9311dedac71 --- /dev/null +++ b/core/img/clients/apple.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/clients/chrome.svg b/core/img/clients/chrome.svg new file mode 100644 index 00000000000..bfec6ae7dc6 --- /dev/null +++ b/core/img/clients/chrome.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/clients/edge.svg b/core/img/clients/edge.svg new file mode 100644 index 00000000000..4533d8f5822 --- /dev/null +++ b/core/img/clients/edge.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/clients/firefox.svg b/core/img/clients/firefox.svg new file mode 100644 index 00000000000..6c2cb6cce06 --- /dev/null +++ b/core/img/clients/firefox.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/clients/ie.svg b/core/img/clients/ie.svg new file mode 100644 index 00000000000..620ec8d7e8d --- /dev/null +++ b/core/img/clients/ie.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/clients/ipad.svg b/core/img/clients/ipad.svg new file mode 100644 index 00000000000..85b3bf3c0e1 --- /dev/null +++ b/core/img/clients/ipad.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/clients/iphone.svg b/core/img/clients/iphone.svg new file mode 100644 index 00000000000..704022cb8e5 --- /dev/null +++ b/core/img/clients/iphone.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/clients/safari.svg b/core/img/clients/safari.svg new file mode 100644 index 00000000000..629cebb9596 --- /dev/null +++ b/core/img/clients/safari.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/css/settings.scss b/settings/css/settings.scss index 1025a862b17..c5b7bba8112 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -340,7 +340,7 @@ table.nostyle { &.client { @extend %icon; - img { + div { opacity: 0.57; width: inherit; } diff --git a/settings/img/clients/android.svg b/settings/img/clients/android.svg deleted file mode 100644 index 1dab3c9ad93..00000000000 --- a/settings/img/clients/android.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/settings/img/clients/apple.svg b/settings/img/clients/apple.svg deleted file mode 100644 index 9311dedac71..00000000000 --- a/settings/img/clients/apple.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/settings/img/clients/chrome.svg b/settings/img/clients/chrome.svg deleted file mode 100644 index bfec6ae7dc6..00000000000 --- a/settings/img/clients/chrome.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/settings/img/clients/edge.svg b/settings/img/clients/edge.svg deleted file mode 100644 index 4533d8f5822..00000000000 --- a/settings/img/clients/edge.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/settings/img/clients/firefox.svg b/settings/img/clients/firefox.svg deleted file mode 100644 index 6c2cb6cce06..00000000000 --- a/settings/img/clients/firefox.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/settings/img/clients/globe.svg b/settings/img/clients/globe.svg deleted file mode 100644 index 99dc6a0750e..00000000000 --- a/settings/img/clients/globe.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/settings/img/clients/ie.svg b/settings/img/clients/ie.svg deleted file mode 100644 index 620ec8d7e8d..00000000000 --- a/settings/img/clients/ie.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/settings/img/clients/ipad.svg b/settings/img/clients/ipad.svg deleted file mode 100644 index 85b3bf3c0e1..00000000000 --- a/settings/img/clients/ipad.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/settings/img/clients/iphone.svg b/settings/img/clients/iphone.svg deleted file mode 100644 index 704022cb8e5..00000000000 --- a/settings/img/clients/iphone.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/settings/img/clients/safari.svg b/settings/img/clients/safari.svg deleted file mode 100644 index 629cebb9596..00000000000 --- a/settings/img/clients/safari.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js index 1e2a6643d59..4229929b4fb 100644 --- a/settings/js/authtoken_view.js +++ b/settings/js/authtoken_view.js @@ -28,7 +28,7 @@ var TEMPLATE_TOKEN = '' + '' + '
t('Device'));?> t('Last activity'));?>
' - + '' + + '
' + '
' + '{{name}}' @@ -150,19 +150,19 @@ }; var iconMap = { - ie: 'ie.svg', - edge: 'edge.svg', - firefox: 'firefox.svg', - chrome: 'chrome.svg', - safari: 'apple.svg', - androidChrome: 'chrome.svg', - iphone: 'iphone.svg', - ipad: 'ipad.svg', - iosClient: 'apple.svg', - androidClient: 'android.svg', - davDroid: 'android.svg', - webPirate: 'globe.svg', - sailfishBrowser: 'globe.svg' + 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', + webPirate: 'icon-link', + sailfishBrowser: 'icon-link' }; if (matches) { @@ -184,7 +184,7 @@ // update title - for easier view viewData.title = viewData.name; - viewData.icon = '/settings/img/clients/' + iconMap[client]; + viewData.icon = iconMap[client]; } } if (viewData.current) { -- cgit v1.2.3 From d83ab0d94fc879517aad9b9267c35f9ebdc02262 Mon Sep 17 00:00:00 2001 From: Pierre Gordon Date: Wed, 10 Jan 2018 08:08:04 -0500 Subject: Align icons with text Signed off by: Pierre Gordon --- settings/css/settings.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/settings/css/settings.scss b/settings/css/settings.scss index c5b7bba8112..6f7bcafbcb4 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -343,6 +343,7 @@ table.nostyle { div { opacity: 0.57; width: inherit; + padding-top: 4px; } } border-top: 1px solid #DDD; -- cgit v1.2.3 From 05d8537078ae008c244804ec21cf5eab78b796ac Mon Sep 17 00:00:00 2001 From: Pierre Gordon Date: Sat, 20 Jan 2018 02:34:18 -0500 Subject: 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 4604c79e677..3c3dff56c1a 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 1dab3c9ad93..00000000000 --- 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 9311dedac71..00000000000 --- 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 bfec6ae7dc6..00000000000 --- 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 00000000000..df4f5b6884a --- /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 4533d8f5822..00000000000 --- 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 6c2cb6cce06..00000000000 --- 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 620ec8d7e8d..00000000000 --- 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 85b3bf3c0e1..00000000000 --- 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 704022cb8e5..00000000000 --- 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 00000000000..a45c5c4c729 --- /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 629cebb9596..00000000000 --- 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 00000000000..a4d41be3057 --- /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 6f7bcafbcb4..1562dfbc374 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 4229929b4fb..b8645e4cc85 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' }; -- cgit v1.2.3