From 74af635dac43f0da2b226b75012c80759e2ff9b4 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Tue, 7 Feb 2017 12:44:00 +0100 Subject: [PATCH] WIP of modern login page: - Position social media icons --- api/js/login.js | 3 +-- pixelegg/css/mobile.css | 8 ++++++-- pixelegg/css/pixelegg.css | 8 ++++++-- pixelegg/less/layout_loginPage.less | 8 ++++++-- pixelegg/login.tpl | 1 + pixelegg/login_mobile.tpl | 1 + pixelegg/mobile/fw_mobile.css | 8 ++++++-- 7 files changed, 27 insertions(+), 10 deletions(-) diff --git a/api/js/login.js b/api/js/login.js index 32d1069fea..b5bf04e0c8 100644 --- a/api/js/login.js +++ b/api/js/login.js @@ -20,13 +20,12 @@ egw_LAB.wait(function() function do_social(_data) { - var isPixelegg = jQuery('link[href*="pixelegg.css"]')[0]; var social = jQuery(document.createElement('div')) .attr({ id: "socialMedia", class: "socialMedia" }) - .appendTo(jQuery( isPixelegg? 'form' : '#socialBox')); + .appendTo(jQuery('#socialBox')); for(var i=0; i < _data.length; ++i) { diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index 1d4889adbc..10f51f14ed 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -1650,12 +1650,16 @@ body { * @package pixelegg * @version $Id$ */ -#socialMedia { - position: relative; +#socialBox { + float: left; + margin-top: 20px; } #socialMedia a { margin-left: 10px; } +#socialMedia a img { + width: 24px; +} /* ################################################################################## * login page */ diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index f3db968ecd..6696129db6 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -1639,12 +1639,16 @@ body { * @package pixelegg * @version $Id$ */ -#socialMedia { - position: relative; +#socialBox { + float: left; + margin-top: 20px; } #socialMedia a { margin-left: 10px; } +#socialMedia a img { + width: 24px; +} /* ################################################################################## * login page */ diff --git a/pixelegg/less/layout_loginPage.less b/pixelegg/less/layout_loginPage.less index a19f87144a..ea80b2cec3 100644 --- a/pixelegg/less/layout_loginPage.less +++ b/pixelegg/less/layout_loginPage.less @@ -17,12 +17,16 @@ @import "def_colors.less"; //############################################################################################################## -#socialMedia { - position: relative; +#socialBox { + float: left; + margin-top: 20px; } #socialMedia a { margin-left: 10px; } +#socialMedia a img{ + width: 24px; +} /* ################################################################################## * login page diff --git a/pixelegg/login.tpl b/pixelegg/login.tpl index 04f59ae760..fed24ba8d4 100644 --- a/pixelegg/login.tpl +++ b/pixelegg/login.tpl @@ -89,6 +89,7 @@