fix(front): i#3919 spacing text editor

kaleidos-ventures · Sep 15, 2023 · b08880d · b08880d
1 parent bcf1cf8
commit b08880d
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 14 deletions.
diff --git a/...script/apps/taiga/src/app/shared/discard-changes-modal/discard-changes-modal.component.ts b/...script/apps/taiga/src/app/shared/discard-changes-modal/discard-changes-modal.component.ts
@@ -15,7 +15,7 @@ import {
 } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
-import { TuiLinkModule } from '@taiga-ui/core';
+import { TuiLinkModule, TuiButtonModule } from '@taiga-ui/core';
 import { RestoreFocusDirective } from '../directives/restore-focus/restore-focus.directive';
 import { ModalComponent } from '@taiga/ui/modal/components';
 import { TranslocoDirective } from '@ngneat/transloco';
@@ -29,6 +29,7 @@ import { TranslocoDirective } from '@ngneat/transloco';
     RestoreFocusDirective,
     ModalComponent,
     TranslocoDirective,
+    TuiButtonModule,
   ],
   templateUrl: './discard-changes-modal.component.html',
   styleUrls: ['./discard-changes-modal.component.css'],

diff --git a/javascript/apps/taiga/src/app/styles/tools/editor-results.css b/javascript/apps/taiga/src/app/styles/tools/editor-results.css
@@ -22,12 +22,18 @@ Copyright (c) 2023-present Kaleidos INC
 
   & ul {
     list-style-type: square;
-    margin-block-end: var(--spacing-8);
+    margin-block-end: 0;
+    margin-block-start: var(--spacing-12);
+  }
+
+  & li {
+    margin-block-end: 0;
+    margin-block-start: var(--spacing-4);
   }
 
   & p {
-    margin-block-end: 0.5rem;
-    margin-block-start: 0;
+    margin-block-end: 0;
+    margin-block-start: var(--spacing-12);
   }
 
   & hr {
@@ -40,14 +46,29 @@ Copyright (c) 2023-present Kaleidos INC
     text-decoration: underline;
   }
 
+  & p:first-child,
+  & h1:first-child,
+  & h2:first-child,
+  & h3:first-child,
+  & h4:first-child,
+  & h5:first-child,
+  & h6:first-child {
+    margin-block-start: 0;
+  }
+
   & h1,
   & h2,
   & h3,
   & h4,
   & h5,
   & h6 {
     font-family: "Ubuntu", sans-serif;
-    margin-block-start: 0;
+    margin-block-end: 0;
+    margin-block-start: var(--spacing-24);
+  }
+
+  h6 {
+    margin-block-start: var(--spacing-16);
   }
 
   & pre,
@@ -63,11 +84,11 @@ Copyright (c) 2023-present Kaleidos INC
   & ol {
     display: block;
     list-style-type: decimal;
-    margin-block-end: 1em;
-    margin-block-start: 1em;
+    margin-block-end: 0;
+    margin-block-start: var(--spacing-12);
     margin-inline-end: 0;
     margin-inline-start: 0;
-    padding-inline-start: 40px;
+    padding-inline-start: 1.4rem;
   }
 }
 

diff --git a/javascript/apps/taiga/src/assets/editor/iframe.css b/javascript/apps/taiga/src/assets/editor/iframe.css
@@ -74,23 +74,23 @@ a {
 }
 
 ul {
-  margin-block: 0 2.5rem;
-  margin-block-end: 0.5rem;
+  margin-block-end: 0;
+  margin-block-start: 0.75rem;
   padding-inline-start: 1.4rem;
 }
 
 ol {
   display: block;
   list-style-type: decimal;
-  margin-block-end: 1em;
-  margin-block-start: 1em;
+  margin-block-end: 0;
+  margin-block-start: 0.75rem;
   margin-inline-end: 0;
   margin-inline-start: 0;
-  padding-inline-start: 40px;
+  padding-inline-start: 1.4rem;
 }
 
 li {
-  margin-block-end: 0.4rem;
+  margin-block-start: 0.25rem;
 }
 
 hr {