From 440c5c3a021d634991e36554ed62ceb140d4806f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 4 Jul 2018 16:08:49 +0200
Subject: [PATCH 1/2] MOBILE-2464 format-text: Have min content width on images

---
 src/app/app.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/app.scss b/src/app/app.scss
index ee6c7fb2f..d1f0e8b5e 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -268,6 +268,7 @@ core-format-text[ng-reflect-single-line="true"] {
 
 .core-media-adapt-width {
   max-width: 100%;
+  height: auto;
 }
 
 audio.core-media-adapt-width {
@@ -341,7 +342,7 @@ core-format-text {
 
 // Images in ion-card have width 100% and display block. Remove that when the image is in core-format-text.
 ion-card core-format-text img {
-  width: initial;
+  width: min-content;
   display: inline;
 }
 

From 5ef2028acf166a0affa91c780e41d971658aaa32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 5 Jul 2018 12:24:04 +0200
Subject: [PATCH 2/2] MOBILE-2464 imageviewer: Enable scroll to image viewer

---
 src/core/course/components/format/format.scss | 11 +++++++++++
 src/core/viewer/pages/image/image.html        |  6 ++++--
 src/core/viewer/pages/image/image.scss        |  7 +++++++
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 src/core/viewer/pages/image/image.scss

diff --git a/src/core/course/components/format/format.scss b/src/core/course/components/format/format.scss
index ac61d4803..e03567ae6 100644
--- a/src/core/course/components/format/format.scss
+++ b/src/core/course/components/format/format.scss
@@ -27,6 +27,17 @@ core-course-format {
             width: 100%;
         }
     }
+
+    .item-divider  {
+        .label {
+            margin-top: 0;
+            margin-bottom: 0;
+        }
+
+        core-format-text {
+            line-height: 44px;
+        }
+    }
 }
 
 .core-section-select {
diff --git a/src/core/viewer/pages/image/image.html b/src/core/viewer/pages/image/image.html
index d1eb33363..613033daa 100644
--- a/src/core/viewer/pages/image/image.html
+++ b/src/core/viewer/pages/image/image.html
@@ -9,6 +9,8 @@
         </ion-buttons>
     </ion-navbar>
 </ion-header>
-<ion-content padding>
-    <img [src]="image" alt="{{ title }}" core-external-content [component]="component" [componentId]="componentId">
+<ion-content>
+    <ion-scroll zoom="true" maxZoom="2" class="core-zoom-pane" scrollX="true" scrollY="true">
+        <img [src]="image" [alt]="title" core-external-content [component]="component" [componentId]="componentId">
+    </ion-scroll>
 </ion-content>
diff --git a/src/core/viewer/pages/image/image.scss b/src/core/viewer/pages/image/image.scss
new file mode 100644
index 000000000..2be2a02fc
--- /dev/null
+++ b/src/core/viewer/pages/image/image.scss
@@ -0,0 +1,7 @@
+.core-zoom-pane {
+    height: 100%;
+
+    img {
+        max-width: none;
+    }
+}
\ No newline at end of file