From 097737a3f36b0f583beacf1f562228040043dba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 30 May 2018 11:50:59 +0200
Subject: [PATCH] MOBILE-2338 rte: Add list styles

---
 src/addon/mod/data/pages/edit/edit.ts         |  1 +
 src/app/app.scss                              | 21 +++++++++++++-----
 .../rich-text-editor/rich-text-editor.scss    | 22 +++++++++++++++++++
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/addon/mod/data/pages/edit/edit.ts b/src/addon/mod/data/pages/edit/edit.ts
index a4daffa6f..55830538f 100644
--- a/src/addon/mod/data/pages/edit/edit.ts
+++ b/src/addon/mod/data/pages/edit/edit.ts
@@ -154,6 +154,7 @@ export class AddonModDataEditPage {
 
             return this.dataProvider.getFields(this.data.id);
         }).then((fieldsData) => {
+            this.fieldsArray = fieldsData;
             this.fields = this.utils.arrayToObject(fieldsData, 'id');
 
             return this.dataHelper.getEntry(this.data, this.entryId, this.offlineActions);
diff --git a/src/app/app.scss b/src/app/app.scss
index b8ea96c8f..b7a30bbb2 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -300,14 +300,25 @@ core-format-text, *[core-format-text] {
   }
 
   // Fix lists styles in core-format-text.
-  ul, ol {
-    -webkit-padding-start: 40px;
-  }
   ul {
-    list-style: disc;
+    list-style-type: disc;
   }
   ol {
-    list-style: decimal;
+    list-style-type: decimal;
+  }
+  ul, ol {
+    -webkit-padding-start: 15px;
+    list-style-position: inside;
+    ul {
+      list-style-type: circle;
+    }
+    ol {
+      list-style-type: lower-latin;
+    }
+    ul, ol {
+      list-style-position: inside;
+      margin-left: 15px;
+    }
   }
 
   .badge {
diff --git a/src/components/rich-text-editor/rich-text-editor.scss b/src/components/rich-text-editor/rich-text-editor.scss
index 366bfef2d..bcd6e6391 100644
--- a/src/components/rich-text-editor/rich-text-editor.scss
+++ b/src/components/rich-text-editor/rich-text-editor.scss
@@ -38,6 +38,28 @@ core-rich-text-editor {
             color: $gray-light;
             font-weight: bold;
         }
+
+        ul {
+            list-style-type: disc;
+        }
+        ol {
+            list-style-type: decimal;
+        }
+        ul, ol {
+            -webkit-padding-start: 15px;
+            list-style-position: inside;
+
+            ul {
+                list-style-type: circle;
+            }
+            ol {
+                list-style-type: lower-latin;
+            }
+            ul, ol {
+                list-style-position: inside;
+                margin-left: 15px;
+            }
+        }
     }
 
     .core-textarea textarea {