From a13a0faebe8f27a378e7ff8ba6bba39f0d3aa9b2 Mon Sep 17 00:00:00 2001
From: Konstantinos Platis <kplatis@protonmail.com>
Date: Mon, 12 Apr 2021 14:59:59 +0200
Subject: [PATCH 1/2] Remove ul implementation with pseudo selectors instead of
 html bullets

---
 css/layout.css   |  3 ---
 css/theme.css    | 36 +++++++-----------------------------
 sass/layout.scss | 10 ----------
 sass/theme.scss  | 48 +++++++++---------------------------------------
 4 files changed, 16 insertions(+), 81 deletions(-)

diff --git a/css/layout.css b/css/layout.css
index d7b3e7f..99edcd0 100755
--- a/css/layout.css
+++ b/css/layout.css
@@ -41,9 +41,6 @@ strong {
   .sidebar-left nav ul > li {
     width: auto; }
 
-.region-content [class*="field--type-text"] ul li, .region-content .full-html-markup ul li {
-  text-indent: -0.8em; }
-
 .region-contentfooter .view-header h2 {
   text-align: center;
   margin-bottom: 20px; }
diff --git a/css/theme.css b/css/theme.css
index 1f46d8a..b59840a 100644
--- a/css/theme.css
+++ b/css/theme.css
@@ -1,4 +1,3 @@
-@charset "UTF-8";
 main .field--type-text-with-summary h1,
 main .text-component-text.basic_html h1,
 main .text-component-text.restricted_html h1,
@@ -1039,18 +1038,9 @@ main .text-component-text.basic_html ul,
 main .text-component-text.restricted_html ul,
 main .text-component-text.cern_full_html ul,
 main .full-html-markup ul {
-  list-style: none;
   padding: 0;
   margin: 0 0 15px 20px;
   line-height: 25px; }
-  main .field--type-text-with-summary ul li::before,
-  main .text-component-text.basic_html ul li::before,
-  main .text-component-text.restricted_html ul li::before,
-  main .text-component-text.cern_full_html ul li::before,
-  main .full-html-markup ul li::before {
-    content: "• ";
-    margin: 0 5px 0 0;
-    line-height: 25px; }
   main .field--type-text-with-summary ul ul,
   main .text-component-text.basic_html ul ul,
   main .text-component-text.restricted_html ul ul,
@@ -1077,13 +1067,19 @@ main .full-html-markup ul {
     main .full-html-markup ul.nav li::before,
     main .full-html-markup ul.dropdown-menu li::before {
       display: none; }
+  main .field--type-text-with-summary ul li :not(li):not(ul),
+  main .text-component-text.basic_html ul li :not(li):not(ul),
+  main .text-component-text.restricted_html ul li :not(li):not(ul),
+  main .text-component-text.cern_full_html ul li :not(li):not(ul),
+  main .full-html-markup ul li :not(li):not(ul) {
+    display: revert; }
 main .field--type-text-with-summary ol,
 main .text-component-text.basic_html ol,
 main .text-component-text.restricted_html ol,
 main .text-component-text.cern_full_html ol,
 main .full-html-markup ol {
   padding: 0;
-  margin-left: 40px;
+  margin-left: 20px;
   line-height: 25px; }
   main .field--type-text-with-summary ol li,
   main .text-component-text.basic_html ol li,
@@ -1091,12 +1087,6 @@ main .full-html-markup ol {
   main .text-component-text.cern_full_html ol li,
   main .full-html-markup ol li {
     line-height: 25px; }
-main .field--type-text-with-summary li p,
-main .text-component-text.basic_html li p,
-main .text-component-text.restricted_html li p,
-main .text-component-text.cern_full_html li p,
-main .full-html-markup li p {
-  margin: 0; }
 main .field--type-text-with-summary hr,
 main .text-component-text.basic_html hr,
 main .text-component-text.restricted_html hr,
@@ -1124,18 +1114,6 @@ main .text-component-text.restricted_html img,
 main .text-component-text.cern_full_html img,
 main .full-html-markup img {
   max-width: 100%; }
-main [class*="field--type-text"] ul {
-  list-style: none;
-  padding: 0;
-  margin: 0 0 15px 20px;
-  line-height: 25px; }
-  main [class*="field--type-text"] ul li::before {
-    content: "• ";
-    margin: 0 5px 0 0;
-    line-height: 25px; }
-  main [class*="field--type-text"] ul li ol {
-    list-style-position: inside;
-    display: block !important; }
 
 table caption {
   display: block;
diff --git a/sass/layout.scss b/sass/layout.scss
index 4b50a33..52abbd0 100755
--- a/sass/layout.scss
+++ b/sass/layout.scss
@@ -67,16 +67,6 @@ strong {
 
 }
 
-.region-content{
-  [class*="field--type-text"], .full-html-markup{
-    ul{
-      li{
-        text-indent: -0.8em;
-      }
-    }
-  }
-}
-
 
 //content footer region
 .region-contentfooter{
diff --git a/sass/theme.scss b/sass/theme.scss
index 7d4b406..9d779cb 100755
--- a/sass/theme.scss
+++ b/sass/theme.scss
@@ -1011,19 +1011,10 @@ main {
     }
 
     ul {
-      list-style: none;
       padding: 0;
       margin: 0 0 15px 20px;
       line-height: 25px;
 
-      li {
-        &::before {
-          content: "• ";
-          margin: 0 5px 0 0;
-          line-height: 25px;
-        }
-      }
-
       ul {
         margin-bottom: 0;
       }
@@ -1038,11 +1029,19 @@ main {
           }
         }
       }
+
+      li {
+        :not(li){
+          &:not(ul){
+            display: revert;
+          }
+        }
+      }
     }
 
     ol {
       padding: 0;
-      margin-left: 40px;
+      margin-left: 20px;
       line-height: 25px;
 
       li {
@@ -1050,12 +1049,6 @@ main {
       }
     }
 
-    li{
-      p{
-        margin: 0
-      }
-    }
-
     hr {
       border-top: 2px solid;
       border-top-color: #cacaca;
@@ -1076,29 +1069,6 @@ main {
     }
   }
 
-  [class*="field--type-text"] {
-
-    ul {
-      list-style: none;
-      padding: 0;
-      margin: 0 0 15px 20px;
-      line-height: 25px;
-
-      li {
-        &::before {
-          content: "• ";
-          margin: 0 5px 0 0;
-          line-height: 25px;
-        }
-
-        ol{
-          list-style-position: inside;
-          display: block !important;
-        }
-      }
-
-    }
-  }
 }
 
 // table caption
-- 
GitLab


From 1b3e42ba1396a6fa1768ceac4a1a113ccc3e98ac Mon Sep 17 00:00:00 2001
From: Konstantinos Platis <kplatis@protonmail.com>
Date: Mon, 12 Apr 2021 15:03:08 +0200
Subject: [PATCH 2/2] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5589bcf..95ed8a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [2.6.7]
 
-- Fix ordered list nested into a bullet point list not appearing indented and spacing issues in lists
+- Fix spacing issues in lists
+- Remove ul implementation with pseudo selectors instead of html bullets
 
 ## [2.6.6] - 10/02/2021
 
-- 
GitLab