From d9474528d8045da9decaf1ad0361f6dd90194672 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 26 Oct 2017 01:20:44 +0300 Subject: www: drop social bitmaps --- juick-www/src/main/static/facebook.png | Bin 203 -> 0 bytes juick-www/src/main/static/icon-fb.png | Bin 203 -> 0 bytes juick-www/src/main/static/icon-gplus.png | Bin 501 -> 0 bytes juick-www/src/main/static/icon-lj.png | Bin 1183 -> 0 bytes juick-www/src/main/static/icon-twitter.png | Bin 458 -> 0 bytes juick-www/src/main/static/icon-vk.png | Bin 306 -> 0 bytes juick-www/src/main/static/scripts.js | 21 +++++++------ juick-www/src/main/static/sharesocial.png | Bin 4474 -> 0 bytes juick-www/src/main/static/style.css | 34 --------------------- juick-www/src/main/static/toolbar-icons.png | Bin 737 -> 0 bytes juick-www/src/main/static/vk.png | Bin 306 -> 0 bytes .../main/webapp/WEB-INF/views/partial/footer.html | 6 ++-- .../main/webapp/WEB-INF/views/post_success.html | 6 ++-- 13 files changed, 17 insertions(+), 50 deletions(-) delete mode 100644 juick-www/src/main/static/facebook.png delete mode 100644 juick-www/src/main/static/icon-fb.png delete mode 100644 juick-www/src/main/static/icon-gplus.png delete mode 100644 juick-www/src/main/static/icon-lj.png delete mode 100644 juick-www/src/main/static/icon-twitter.png delete mode 100644 juick-www/src/main/static/icon-vk.png delete mode 100644 juick-www/src/main/static/sharesocial.png delete mode 100644 juick-www/src/main/static/toolbar-icons.png delete mode 100644 juick-www/src/main/static/vk.png (limited to 'juick-www/src/main') diff --git a/juick-www/src/main/static/facebook.png b/juick-www/src/main/static/facebook.png deleted file mode 100644 index 5d111590..00000000 Binary files a/juick-www/src/main/static/facebook.png and /dev/null differ diff --git a/juick-www/src/main/static/icon-fb.png b/juick-www/src/main/static/icon-fb.png deleted file mode 100644 index 5d111590..00000000 Binary files a/juick-www/src/main/static/icon-fb.png and /dev/null differ diff --git a/juick-www/src/main/static/icon-gplus.png b/juick-www/src/main/static/icon-gplus.png deleted file mode 100644 index d83d2520..00000000 Binary files a/juick-www/src/main/static/icon-gplus.png and /dev/null differ diff --git a/juick-www/src/main/static/icon-lj.png b/juick-www/src/main/static/icon-lj.png deleted file mode 100644 index 9cde1e02..00000000 Binary files a/juick-www/src/main/static/icon-lj.png and /dev/null differ diff --git a/juick-www/src/main/static/icon-twitter.png b/juick-www/src/main/static/icon-twitter.png deleted file mode 100644 index 259078f7..00000000 Binary files a/juick-www/src/main/static/icon-twitter.png and /dev/null differ diff --git a/juick-www/src/main/static/icon-vk.png b/juick-www/src/main/static/icon-vk.png deleted file mode 100644 index 80b6920b..00000000 Binary files a/juick-www/src/main/static/icon-vk.png and /dev/null differ diff --git a/juick-www/src/main/static/scripts.js b/juick-www/src/main/static/scripts.js index b275e446..1fec803e 100644 --- a/juick-www/src/main/static/scripts.js +++ b/juick-www/src/main/static/scripts.js @@ -46,6 +46,9 @@ function autosize(el) { el.attachEvent('onkeyup', () => resize(el)); } } +function svgIconHtml(name) { + return `
`; +} /* eslint-disable only-ascii/only-ascii */ const translations = { @@ -69,7 +72,7 @@ const translations = { 'loginDialog.registeredAlready': 'Registered already?', 'loginDialog.username': 'Username', 'loginDialog.password': 'Password', - 'loginDialog.vk': 'vk.com', + 'loginDialog.vk': 'Login with VK', 'error.error': 'Error' }, 'ru': { @@ -92,7 +95,7 @@ const translations = { 'loginDialog.registeredAlready': 'Уже зарегистрированы?', 'loginDialog.username': 'Имя пользователя', 'loginDialog.password': 'Пароль', - 'loginDialog.vk': 'ВКонтакте', + 'loginDialog.vk': 'Войти через ВКонтакте', 'error.error': 'Ошибка' } }; @@ -451,10 +454,9 @@ function showMessageLinksDialog(mid, rid) { ${i18n('shareDialog.messageNumber')}:
${mlink}
${i18n('shareDialog.share')}: `; @@ -541,10 +543,9 @@ function checkUsername() { function openDialogLogin() { let html = `
-

${i18n('loginDialog.pleaseIntroduceYourself')}: - Facebook - ${i18n('loginDialog.vk')} -

+

${i18n('loginDialog.pleaseIntroduceYourself')}:

+ ${svgIconHtml('sc-facebook')}Login with Facebook + ${svgIconHtml('sc-vk')}${i18n('loginDialog.vk')}

${i18n('loginDialog.registeredAlready')}


diff --git a/juick-www/src/main/static/sharesocial.png b/juick-www/src/main/static/sharesocial.png deleted file mode 100644 index 1031b343..00000000 Binary files a/juick-www/src/main/static/sharesocial.png and /dev/null differ diff --git a/juick-www/src/main/static/style.css b/juick-www/src/main/static/style.css index 90f0f586..161f7444 100644 --- a/juick-www/src/main/static/style.css +++ b/juick-www/src/main/static/style.css @@ -714,21 +714,12 @@ q { #signfb, #signvk { display: block; - height: 32px; line-height: 32px; margin: 10px 0; - overflow: hidden; text-decoration: none; - text-indent: 37px; width: 100%; } -#signfb { - background: url("facebook.png") no-repeat #3A569C; - color: #FFF; -} #signvk { - background: url("vk.png") no-repeat #6d8fb3; - color: #FFF; margin-bottom: 30px; } .dialoglogin form { @@ -764,10 +755,7 @@ q { margin: 5px 10px 0 0; } .dialogshare a { - background-image: url("sharesocial.png"); display: block; - height: 32px; - width: 32px; } .dialogtxt { background: #EEEEE5; @@ -795,28 +783,12 @@ q { right: 20px; } .sharenew { - color: #FFF; display: inline-block; line-height: 32px; min-height: 32px; min-width: 200px; padding: 0 12px 0 37px; } -.ico32-twi { - background: #55acee url("icon-twitter.png") no-repeat; -} -.ico32-vk { - background: #6d8fb3 url("icon-vk.png") no-repeat; -} -.ico32-fb { - background: #3b579d url("icon-fb.png") no-repeat; -} -.ico32-lj { - background: #888888 url("icon-lj.png") no-repeat; -} -.ico32-gp { - background: #dc4a38 url("icon-gplus.png") no-repeat; -} .icon { margin-top: -2px; vertical-align: middle; @@ -842,12 +814,6 @@ q { #footer-social a { border: 0; display: inline-block; - height: 32px; - margin: 0 15px 0 0; - overflow: hidden; - text-indent: 100%; - white-space: nowrap; - width: 32px; } #footer-left { margin-left: 286px; diff --git a/juick-www/src/main/static/toolbar-icons.png b/juick-www/src/main/static/toolbar-icons.png deleted file mode 100644 index cd4efd45..00000000 Binary files a/juick-www/src/main/static/toolbar-icons.png and /dev/null differ diff --git a/juick-www/src/main/static/vk.png b/juick-www/src/main/static/vk.png deleted file mode 100644 index 80b6920b..00000000 Binary files a/juick-www/src/main/static/vk.png and /dev/null differ diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html b/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html index 784011a9..1f9e30cf 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html +++ b/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html @@ -5,9 +5,9 @@ {{ i18n("messages","link.adv") }}