[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - 2 commits - loleaflet/css

[Mike Kaganski (via logerrit)]

 loleaflet/css/loleaflet.css |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit ccc030ad648468f41bc792c678a127e2a62defa5
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Jul 3 08:40:55 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Jul 6 06:38:41 2020 +0200

    Make the button animate on release, too
    
    Change-Id: I188ee6b9af97e3018c06bca684cacce6fee1774c
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97795
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit ce2b95c99a4b8a21caa23276bf1de1184fb2bdd3)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97916
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index f8db7ae1a..2885dba2d 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -193,6 +193,8 @@ body {
 	border-radius: 50%;
 	box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
 	z-index: 1001;
+	transform: scale(1);
+	transition: transform 0.5s;
 }
 
 #mobile-edit-button.impress {
@@ -206,14 +208,14 @@ body {
 	width: 24px;
 	height: 24px;
 	background: url('images/baseline-edit-24px.svg') no-repeat center !important;
+	transform: rotate(0deg);
+	transition: transform 0.5s;
 }
 #mobile-edit-button:active{
 	transform: scale(1.2);
-	transition: transform 0.5s;
 }
 #mobile-edit-button:active > #mobile-edit-button-image {
 	transform: rotate(45deg);
-	transition: transform 0.5s;
 }
 
 .loleaflet-font {
commit 77eeff3b2a545d6fffd22ff938a3097deb0ffb1b
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Jul 2 22:45:48 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Jul 6 06:38:28 2020 +0200

    Use child combinator instead of separate :active pseudo-classes
    
    This avoids the image not rotating when touching the edge of the button,
    when the image is not active.
    
    Ref.: https://developer.mozilla.org/en-US/docs/Web/CSS/Child_combinator
    
    Change-Id: I4a6d966743d6d07106dd0666f840d8d73ccdc8cc
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97791
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 3ce83a527bbee5d7d89491e6370619ef09893f0d)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97915
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 03b13cd69..f8db7ae1a 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -211,7 +211,7 @@ body {
 	transform: scale(1.2);
 	transition: transform 0.5s;
 }
-#mobile-edit-button-image:active {
+#mobile-edit-button:active > #mobile-edit-button-image {
 	transform: rotate(45deg);
 	transition: transform 0.5s;
 }