From 84ed298cffd19ca36f615cc7b069225bf94d5f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 18 Aug 2020 12:32:19 +0200 Subject: [PATCH 1/2] MOBILE-3512 travis: Change travis condition --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f7dfb6833..7bd3b982b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,7 @@ jobs: script: scripts/aot.sh - stage: build name: "Build Android" - if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND NOT branch = desktop) OR (env(DEPLOY) IN (2,3) AND tag IS NOT blank)) + if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND branch != desktop) OR (env(DEPLOY) IN (2,3) AND tag IS NOT blank)) os: linux dist: trusty group: edge @@ -69,7 +69,7 @@ jobs: script: scripts/aot.sh - stage: build name: "Build iOS" - if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND NOT branch = desktop) OR (env(DEPLOY) IN (2,3) AND tag IS NOT blank)) + if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND branch != desktop) OR (env(DEPLOY) IN (2,3) AND tag IS NOT blank)) os: osx osx_image: xcode11.3 env: From 7d7658d92acedf8396c1fd8d96580079e86109ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 18 Aug 2020 13:27:21 +0200 Subject: [PATCH 2/2] MOBILE-3512 myoverview: Add one column on larger screens --- .../components/myoverview/addon-block-myoverview.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html index 4b7495bfa..1cb51f1e2 100644 --- a/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html +++ b/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html @@ -42,7 +42,7 @@
- +