From 5d619ab381c19868b3e5d69fb2215de870fabd7e Mon Sep 17 00:00:00 2001 From: abhijith Date: Thu, 24 May 2018 09:30:21 +0530 Subject: [PATCH 1/5] Minor alignment changes in webkit greeter theme --- .../src/css/style.css | 30 ++++++++++--------- .../src/index.html | 4 +-- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/packages/lightdm-webkit-greeter-hamara/src/css/style.css b/packages/lightdm-webkit-greeter-hamara/src/css/style.css index 71f2b4e6..980c662d 100644 --- a/packages/lightdm-webkit-greeter-hamara/src/css/style.css +++ b/packages/lightdm-webkit-greeter-hamara/src/css/style.css @@ -59,6 +59,7 @@ input:focus { box-shadow: 0 0 5px 2px #7DBEF1; } + a { text-decoration: none; } @@ -74,7 +75,8 @@ a { } .center { - text-align: center; + text-align: center; + margin: 0, auto; } .button { @@ -154,9 +156,7 @@ a { .user { display: inline-block; - margin-left: 20px; - margin-right: 20px; - margin-bottom: 20px; + margin: 0, auto; position: relative; cursor: pointer; font-family: 'Source Sans Pro'; @@ -172,7 +172,7 @@ a { border-radius: 80px; border: 2px solid #000; background: -webkit-radial-gradient(circle, #FFF , #7b7b81 ); - + margin:7px; } .user_image_wrapper:hover { @@ -195,7 +195,8 @@ a { } .footer { - height: 10%; + height: 10%; + margin:0, auto; } @@ -203,6 +204,7 @@ a { width:60; height:60; -webkit-user-drag: none; + margin: 0, auto; } ul { @@ -266,8 +268,8 @@ dropdown { background-color: #F7931E; color: white; text-decoration: none; + text-align:left; display: block; - text-align: center; height: 40px; width: 110px; -webkit-user-drag: none; @@ -287,15 +289,15 @@ dropdown { } .icon_sleep { - margin-top: 20px; + margin-top: 2px; } .icon_restart { - margin-top: 1px; + margin-top: 2px; } .icon_shutdown { - margin-top: 1px; + margin-top: 2px; } .icon_sleep:before{ @@ -311,16 +313,16 @@ dropdown { content: '\e900'; position: relative; top: 5px; - padding-left: 5px; + padding-left: 2px; font-size: 25px; } .icon_shutdown:before{ font-family: 'shutdownbtn'; content: '\e900'; - padding-left: 5px; + padding-left: 2px; position: relative; - top: 4px; + top: 5px; font-size: 25px; } @@ -373,4 +375,4 @@ dropdown { .popup{ width: 70%; } -} \ No newline at end of file +} diff --git a/packages/lightdm-webkit-greeter-hamara/src/index.html b/packages/lightdm-webkit-greeter-hamara/src/index.html index 244531be..4f13d6dc 100644 --- a/packages/lightdm-webkit-greeter-hamara/src/index.html +++ b/packages/lightdm-webkit-greeter-hamara/src/index.html @@ -24,8 +24,8 @@
  • - Sleep         - Restart       + Sleep + Restart Shutdown
    • -- 2.17.1 From 6b77c87518862075169c73025adbcf1e604deef4 Mon Sep 17 00:00:00 2001 From: abhijith Date: Fri, 25 May 2018 08:21:24 +0530 Subject: [PATCH 2/5] More alignment changes --- .../lightdm-webkit-greeter-hamara/src/css/style.css | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/lightdm-webkit-greeter-hamara/src/css/style.css b/packages/lightdm-webkit-greeter-hamara/src/css/style.css index 980c662d..aa6a2c47 100644 --- a/packages/lightdm-webkit-greeter-hamara/src/css/style.css +++ b/packages/lightdm-webkit-greeter-hamara/src/css/style.css @@ -259,7 +259,8 @@ dropdown { z-index: -1; transform: translateY(-2em); transition: all 0.3s ease-in-out 0s, visibility 0s linear 0.3s, z-index 0s linear 0.01s; - margin-left: -40px; + margin-left: -46px; + margin-top: 3px; } .dropdown-content a { @@ -271,7 +272,7 @@ dropdown { text-align:left; display: block; height: 40px; - width: 110px; + width: 117px; -webkit-user-drag: none; } @@ -306,6 +307,7 @@ dropdown { position: relative; top: 5px; font-size: 25px; + padding-left:5px; } .icon_restart:before{ @@ -313,14 +315,14 @@ dropdown { content: '\e900'; position: relative; top: 5px; - padding-left: 2px; + padding-left: 5px; font-size: 25px; } .icon_shutdown:before{ font-family: 'shutdownbtn'; content: '\e900'; - padding-left: 2px; + padding-left: 5px; position: relative; top: 5px; font-size: 25px; -- 2.17.1 From 0643f1d5d74f1ce94570b1cb452326049c02571f Mon Sep 17 00:00:00 2001 From: Vik Tara Date: Fri, 25 May 2018 23:16:18 +0530 Subject: [PATCH 3/5] make drop down menu icons grey and menu remove the text --- packages/lightdm-webkit-greeter-hamara/src/css/style.css | 6 +++--- packages/lightdm-webkit-greeter-hamara/src/index.html | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/lightdm-webkit-greeter-hamara/src/css/style.css b/packages/lightdm-webkit-greeter-hamara/src/css/style.css index aa6a2c47..40b7bd5e 100644 --- a/packages/lightdm-webkit-greeter-hamara/src/css/style.css +++ b/packages/lightdm-webkit-greeter-hamara/src/css/style.css @@ -266,10 +266,10 @@ dropdown { .dropdown-content a { font-family: 'source sans pro'; font-size: 1rem; - background-color: #F7931E; - color: white; + background-color: #FFFFF; + color: grey; text-decoration: none; - text-align:left; + text-align:center; display: block; height: 40px; width: 117px; diff --git a/packages/lightdm-webkit-greeter-hamara/src/index.html b/packages/lightdm-webkit-greeter-hamara/src/index.html index 4f13d6dc..7d6f502d 100644 --- a/packages/lightdm-webkit-greeter-hamara/src/index.html +++ b/packages/lightdm-webkit-greeter-hamara/src/index.html @@ -24,9 +24,9 @@
  • - Sleep - Restart - Shutdown + + +
  • Login
    • -- 2.17.1 From 494080f094186367acb62b7373256592cec490db Mon Sep 17 00:00:00 2001 From: abhijith Date: Sat, 26 May 2018 09:12:28 +0530 Subject: [PATCH 4/5] Only icons appear in the dropdown. They are horizontally aligned. --- .../src/css/style.css | 22 ++++++++++++------- .../src/index.html | 6 ++--- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/packages/lightdm-webkit-greeter-hamara/src/css/style.css b/packages/lightdm-webkit-greeter-hamara/src/css/style.css index 40b7bd5e..4b10680c 100644 --- a/packages/lightdm-webkit-greeter-hamara/src/css/style.css +++ b/packages/lightdm-webkit-greeter-hamara/src/css/style.css @@ -259,8 +259,8 @@ dropdown { z-index: -1; transform: translateY(-2em); transition: all 0.3s ease-in-out 0s, visibility 0s linear 0.3s, z-index 0s linear 0.01s; - margin-left: -46px; - margin-top: 3px; + margin-left: -73px; + margin-top: 7px; } .dropdown-content a { @@ -270,9 +270,9 @@ dropdown { color: grey; text-decoration: none; text-align:center; - display: block; - height: 40px; - width: 117px; + display: inline; + height: 60px; + width: 60px; -webkit-user-drag: none; } @@ -291,14 +291,17 @@ dropdown { .icon_sleep { margin-top: 2px; + padding:7px; } .icon_restart { margin-top: 2px; + padding:7px; } .icon_shutdown { margin-top: 2px; + padding:7px; } .icon_sleep:before{ @@ -307,7 +310,8 @@ dropdown { position: relative; top: 5px; font-size: 25px; - padding-left:5px; + padding:7px; + border-radius:1px; } .icon_restart:before{ @@ -315,17 +319,19 @@ dropdown { content: '\e900'; position: relative; top: 5px; - padding-left: 5px; + padding: 7px; font-size: 25px; + border-radius:1px; } .icon_shutdown:before{ font-family: 'shutdownbtn'; content: '\e900'; - padding-left: 5px; + padding: 7px; position: relative; top: 5px; font-size: 25px; + border-radius:1px; } .overlay { diff --git a/packages/lightdm-webkit-greeter-hamara/src/index.html b/packages/lightdm-webkit-greeter-hamara/src/index.html index 7d6f502d..221dadc3 100644 --- a/packages/lightdm-webkit-greeter-hamara/src/index.html +++ b/packages/lightdm-webkit-greeter-hamara/src/index.html @@ -24,9 +24,9 @@
  • - - - + + +
  • Login
    • -- 2.17.1 From c0ae071198238e6646ab9650b564d35ba3df13ec Mon Sep 17 00:00:00 2001 From: abhijith Date: Sun, 27 May 2018 13:57:46 +0530 Subject: [PATCH 5/5] Session chooser for lightdm --- .../src/css/style.css | 78 ++++++++++--------- .../src/index.html | 10 ++- .../src/js/script.js | 38 +++++++-- 3 files changed, 81 insertions(+), 45 deletions(-) diff --git a/packages/lightdm-webkit-greeter-hamara/src/css/style.css b/packages/lightdm-webkit-greeter-hamara/src/css/style.css index 4b10680c..8bb17384 100644 --- a/packages/lightdm-webkit-greeter-hamara/src/css/style.css +++ b/packages/lightdm-webkit-greeter-hamara/src/css/style.css @@ -237,6 +237,7 @@ li a{ text-decoration: none; -webkit-user-drag: none; margin-top: 5px; + margin-bottom:10px; } /* use hover button for poweroff*/ @@ -250,6 +251,7 @@ li a{ dropdown { display: inline-block; + margin-top:10px; } .dropdown-content { @@ -259,14 +261,13 @@ dropdown { z-index: -1; transform: translateY(-2em); transition: all 0.3s ease-in-out 0s, visibility 0s linear 0.3s, z-index 0s linear 0.01s; - margin-left: -73px; - margin-top: 7px; + margin-left: -83px; } .dropdown-content a { font-family: 'source sans pro'; font-size: 1rem; - background-color: #FFFFF; + background-color: inherit; color: grey; text-decoration: none; text-align:center; @@ -276,11 +277,6 @@ dropdown { -webkit-user-drag: none; } -.dropdown-content a:hover { - background-color: #F15A24; - -} - .dropdown:hover .dropdown-content { visibility: visible; opacity: 1; @@ -289,49 +285,39 @@ dropdown { transition-delay: 0s, 0s, 0.3s; } -.icon_sleep { - margin-top: 2px; - padding:7px; -} - -.icon_restart { - margin-top: 2px; - padding:7px; -} - -.icon_shutdown { - margin-top: 2px; - padding:7px; -} - .icon_sleep:before{ font-family: "sleepbtn" ; content: '\e900'; position: relative; - top: 5px; - font-size: 25px; - padding:7px; - border-radius:1px; + font-size: 40px; + padding:10px; } .icon_restart:before{ font-family: 'restartbtn'; content: '\e900'; position: relative; - top: 5px; - padding: 7px; - font-size: 25px; - border-radius:1px; + padding: 10px; + font-size: 40px; } .icon_shutdown:before{ font-family: 'shutdownbtn'; content: '\e900'; - padding: 7px; + padding: 10px; position: relative; - top: 5px; - font-size: 25px; - border-radius:1px; + font-size: 40px; +} +.icon_sleep:hover{ + color: #E53A40; +} + +.icon_restart:hover{ + color: #E53A40; +} + +.icon_shutdown:hover{ + color: #E53A40; } .overlay { @@ -384,3 +370,25 @@ dropdown { width: 70%; } } +.select-style { + border: 1px solid #ccc; + width: 240px; + border-radius: 3px; + overflow: hidden; + background: #fafafa url("data:image/png;base64,R0lGODlhDwAUAIABAAAAAP///yH5BAEAAAEALAAAAAAPABQAAAIXjI+py+0Po5wH2HsXzmw//lHiSJZmUAAAOw==") no-repeat 90% 50%; + margin: 0 auto; +} + +.select-style select { + padding: 5px 8px; + width: 240px; + border: none; + box-shadow: none; + background: transparent; + background-image: none; + -webkit-appearance: none; +} + +.select-style select:focus { + outline: none; +} diff --git a/packages/lightdm-webkit-greeter-hamara/src/index.html b/packages/lightdm-webkit-greeter-hamara/src/index.html index 221dadc3..83e2d2f7 100644 --- a/packages/lightdm-webkit-greeter-hamara/src/index.html +++ b/packages/lightdm-webkit-greeter-hamara/src/index.html @@ -16,9 +16,12 @@ -
    diff --git a/packages/lightdm-webkit-greeter-hamara/src/js/script.js b/packages/lightdm-webkit-greeter-hamara/src/js/script.js index fd2fabb8..d5e79e80 100644 --- a/packages/lightdm-webkit-greeter-hamara/src/js/script.js +++ b/packages/lightdm-webkit-greeter-hamara/src/js/script.js @@ -1,5 +1,6 @@ selected_user= null; valid_image=/.*\.(png|svg|jpg|jpeg|bmp)$/i; +var selectedsession = lightdm.default_session; function show_prompt(text) { var password_container= document.getElementById("password_container"); @@ -48,7 +49,7 @@ function show_error(text) { function authentication_complete() { if (lightdm.is_authenticated) - lightdm.login (lightdm.authentication_user, lightdm.default_session); + lightdm.login (lightdm.authentication_user, selectedsession); else { show_error("Authentication Failed"); start_authentication(selected_user); @@ -118,6 +119,27 @@ function isVisible(element) { function initialize() { show_message(""); initialize_users(); + if (lightdm.sessions.length < 2){ + document.getElementById("selectstylediv").style.display = 'none'; + selectedsession = lightdm.default_session; + } + else{ + for (i in lightdm.sessions){ + session = lightdm.sessions[i]; + var sessiondropdown = document.getElementById("sessionlist"); + var sessionoption = document.createElement('option'); + if (session.key == selectedsession){ + sessionoption.value = session.key; + sessionoption.innerHTML = session.key; + sessiondropdown.appendChild(sessionoption); + } + else{ + sessionoption.value = session.key; + sessionoption.innerHTML = session.key; + sessiondropdown.appendChild(sessionoption); + } + } + } } function initialize_users() { @@ -134,12 +156,12 @@ function initialize_users() { name.innerHTML= user.display_name; if (user.image) { - image.src = user.image + image.src = user.image; image.onerror = function(e) { - e.currentTarget.src= "img/avatar.png" - } + e.currentTarget.src= "img/avatar.png"; + }; } else { - image.src = "img/avatar.png" + image.src = "img/avatar.png"; } userNode.id= user.name; @@ -166,4 +188,8 @@ function shutdown_clicked(event){ if (lightdm.can_shutdown) { lightdm.shutdown(); } -} \ No newline at end of file +} + +function selectSession(event){ + selectedsession = document.getElementById("sessionlist").value; +} -- 2.17.1