[Libreoffice-commits] online.git: 2 commits - cypress_test/README loleaflet/css

[Tor Lillqvist (via logerrit)]

 cypress_test/README            |    4 +++-
 loleaflet/css/loleaflet.css    |    2 +-
 loleaflet/css/mobilewizard.css |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 15157f9e679c2f2cdf11aacbda6aea96b299bc32
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Mar 20 10:20:23 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Mar 20 10:20:23 2020 +0200

    Mention --enable-cypress
    
    Change-Id: Ic29138650f70c0eaa0d7a60b1b6dd4f4929b6b96

diff --git a/cypress_test/README b/cypress_test/README
index 11a05cd32..d57fc0fc8 100644
--- a/cypress_test/README
+++ b/cypress_test/README
@@ -2,9 +2,11 @@ Cypress based test framework for LibreOffice Online
 ====================================================
 
 
-
 Installation
 ------------------
+
+You need to have run configure with the --enable-cypress option.
+
 In a normal desktop environment you only need to install npm
 packages for running cypress tests. This is done by the build
 system, so running 'make check' will do the basic installation.
commit 6240c5381bc791e921d6c4156c200197cba8d4c8
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu Mar 19 17:37:04 2020 +0100
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Mar 19 22:55:52 2020 +0200

    Restore cypress test framework's mobile tests.
    
    Broken since: b62dcc025555076a7522809b9f12f873c278205d
    
    The issue here cypress sets the window size and not the device size
    when tries to emulate mobile view.
    https://github.com/cypress-io/cypress/issues/970
    
    For now, let's keep window size media rules too.
    
    [tml: Window size changes depending on orientation. Device size does
    not. We need to change each rule that used only max-device-width into
    one using two subrules using max-width combined with comma (i.e. the
    OR operator), one for portrait using 767px as the limit, one for
    landscape using 1023px as the limit.]
    
    We do this in other places of the css code anyway. In a long term, it
    would be good to find a better way to emulate mobile view by cypress
    or to detect mobile from JS code, so we can enable mobile mode easily
    for cypress tests.
    
    Change-Id: Ic7974f44fcbf6ed2883e93acd28153709514c216

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 334b721ee..2016bc131 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -178,7 +178,7 @@ body {
 #toolbar-hamburger {
 	width: 0;
 }
- at media (max-device-width: 767px) {
+ at media (max-width: 767px) and (orientation: portrait), (max-width: 1023px) and (orientation: landscape) {
 	#toolbar-hamburger {
 		width: 36px;
 	}
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index eb4d613fa..0dde3030a 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -1,4 +1,4 @@
- at media (max-device-width: 767px)  {
+ at media (max-width: 767px) and (orientation: portrait), (max-width: 1023px) and (orientation: landscape) {
 	.menuwizard .menu-entry-icon{
 		padding-left: 4%;
 	}