@simple-reporting/base 1.0.40 → 1.0.41

package/dev/package.json

@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^7.2.0",
-    "@simple-reporting/base": "^1.0.40",
+    "@simple-reporting/base": "^1.0.41",
     "chalk": "^5.6.2",
     "exceljs": "^4.4.0",
     "file-saver": "^2.0.5",

package/dev/src/assets/scss/app.scss

@@ -1,6 +1,5 @@
 @use 'srl';
 @use 'web';
-@use "./components/note/accordion";
 
 html {
   -webkit-text-size-adjust: 100%;

package/dev/src/assets/scss/components/{note/accordion.scss → accordion.scss}

@@ -90,6 +90,26 @@ $transition-duration: .3s;
       margin-inline: 0;
     }
 
+    &.srl-title-h2 {
+      [class*="-number"],
+      [class*="-text"]
+      {
+        @include srl.typography-title-h3();
+      }
+    }
+    &.srl-title-h3 {
+      [class*="-number"],
+      [class*="-text"] {
+        @include srl.typography-title-h4();
+      }
+    }
+    &.srl-title-h4 {
+      [class*="-number"],
+      [class*="-text"] {
+        @include srl.typography-title-h5();
+      }
+    }
+
     [class*="-number"],
     [class*="-text"]
     {

package/dev/src/assets/scss/pdf.scss

@@ -65,6 +65,17 @@ img {
   }
 }
 
+/*
+  Subscripts and superscripts
+*/
+.subscript,
+sub,
+.superscript,
+sup {
+  line-height: initial;
+}
+
+
 /*
   Page breaks for PDF
 */

package/dev/src/assets/scss/placeholders/grid.scss

@@ -11,6 +11,12 @@
     display: flex;
     flex-direction: column;
     align-items: flex-end;
+  } @else if system.$build == "word" {
+    display: block;
+    margin-left: 0;
+    margin-right: 0;
+    padding-left: 0;
+    padding-right: 0;
   } @else {
     margin-left: auto;
     margin-right: auto;

package/dev/src/assets/scss/web.scss

@@ -1,5 +1,5 @@
 @use "srl";
-@use "./components/note/accordion";
+@use "./components/accordion";
 
 @include srl.system-add-root-style('srl-header-height', srl.system-size-unit(68));
 @include srl.system-add-root-style('srl-header-height', srl.system-size-unit(101), 'tablet-ls', 'up');

package/dev/src/assets/scss/xbrl.scss

@@ -1 +1,12 @@
-@use "srl";
+@use "srl";
+
+.srl-chapter {
+  & + * {
+    @include srl.spacer-margin-top(3200);
+  }
+}
+.srl-article {
+  & + * {
+    @include srl.spacer-margin-top(3200);
+  }
+}

package/dev/src/components/PageMain.vue

@@ -15,10 +15,12 @@ const props = defineProps<{
 <style lang="scss" scoped>
 @use 'srl';
 #srl-page-main {
-  padding-top: srl.system-root-style(srl-header-height);
+  padding-top: calc( srl.system-root-style(srl-header-height) + srl.spacer-get(800) );
   min-height: 100dvh;
-  .srl-page__wrap:not([class*='home']) & {
-    padding-top: calc( srl.system-root-style(srl-header-height) + srl.spacer-get(800) );
+  &:has(.srl-article-root [class*='hero']:first-child),
+  &:has(.srl-article-root [class*='background']:first-child)
+  {
+    padding-top: srl.system-root-style(srl-header-height);
   }
 }
 </style>

package/dev/srl.config.json

@@ -852,6 +852,10 @@
         "name": "primary-1000",
         "color": "#F05000"
       },
+      {
+        "name": "on-primary-1000",
+        "color": "#ffffff"
+      },
       {
         "name": "secondary-200",
         "color": "#ccd1e6"
@@ -872,7 +876,10 @@
         "name": "secondary-1000",
         "color": "#001987"
       },
-
+      {
+        "name": "on-secondary-1000",
+        "color": "#ffffff"
+      },
       {
         "name": "tertiary-200",
         "color": "#ccd1e7"
@@ -893,6 +900,10 @@
         "name": "tertiary-1000",
         "color": "#001987"
       },
+      {
+        "name": "on-tertiary-1000",
+        "color": "#ffffff"
+      },
       {
         "name": "yellow-200",
         "color": "#fff7dc"

package/livingdocs/010.Titles/010.title-h1/scss/general.scss

@@ -1,5 +1,4 @@
 @use 'srl';
-@use "@/assets/scss/margins";
 @use "spacing-variations";
 
 .srl-title-h1 {
@@ -18,4 +17,4 @@
   }
 }
 
-@include margins.srl-component-margin(spacing-variations.$margins);
+@include srl.spacer-component-margin(spacing-variations.$margins);

package/livingdocs/010.Titles/020.title-h2/scss/general.scss

@@ -1,5 +1,4 @@
 @use 'srl';
-@use "@/assets/scss/margins";
 @use "spacing-variations";
 
 .srl-title-h2 {
@@ -28,8 +27,9 @@
   }
 }
 
-@include margins.srl-component-margin(spacing-variations.$margins);
+@include srl.spacer-component-margin(spacing-variations.$margins);
 
 .srl-title-h2__number-text-container {
   display: flex;
+  @include srl.spacer-gap(200);
 }

package/livingdocs/010.Titles/020.title-h2/scss/xbrl.scss

@@ -1 +1,2 @@
-@use 'general';
+@use 'general';
+@use 'web';

package/livingdocs/010.Titles/030.title-h3/scss/general.scss

@@ -1,5 +1,4 @@
 @use 'srl';
-@use "@/assets/scss/margins";
 @use "spacing-variations";
 
 .srl-title-h3 {
@@ -8,6 +7,7 @@
 
 .srl-title-h3__number-text-container {
   display: flex;
+  @include srl.spacer-gap(200);
 }
 
-@include margins.srl-component-margin(spacing-variations.$margins);
+@include srl.spacer-component-margin(spacing-variations.$margins);

package/livingdocs/010.Titles/030.title-h3/scss/xbrl.scss

@@ -1 +1,2 @@
-@use 'general';
+@use 'general';
+@use 'web';

package/livingdocs/010.Titles/040.title-h4/scss/general.scss

@@ -1,5 +1,4 @@
 @use 'srl';
-@use "@/assets/scss/margins";
 @use "spacing-variations";
 
 .srl-title-h4 {
@@ -8,6 +7,7 @@
 
 .srl-title-h4__number-text-container {
   display: flex;
+  @include srl.spacer-gap(200);
 }
 
-@include margins.srl-component-margin(spacing-variations.$margins);
+@include srl.spacer-component-margin(spacing-variations.$margins);

package/livingdocs/010.Titles/040.title-h4/scss/xbrl.scss

@@ -1 +1,2 @@
-@use 'general';
+@use 'general';
+@use 'web';

package/livingdocs/010.Titles/050.title-h5/scss/general.scss

@@ -1,9 +1,8 @@
 @use 'srl';
-@use "@/assets/scss/margins";
 @use "spacing-variations";
 
 .srl-title-h5 {
   @include srl.typography-title-h5();
 }
 
-@include margins.srl-component-margin(spacing-variations.$margins);
+@include srl.spacer-component-margin(spacing-variations.$margins);

package/livingdocs/010.Titles/060.title-h6/scss/general.scss

@@ -1,9 +1,9 @@
 @use 'srl';
-@use "@/assets/scss/margins";
 @use "spacing-variations";
 
 .srl-title-h6 {
+  color: srl.colors-grey-600();
   @include srl.typography-title-h6();
 }
 
-@include margins.srl-component-margin(spacing-variations.$margins);
+@include srl.spacer-component-margin(spacing-variations.$margins);

package/livingdocs/020.Text/010.lead/scss/general.scss

@@ -1,9 +1,8 @@
 @use 'srl';
-@use "@/assets/scss/margins";
 @use "spacing-variations";
 
 .srl-lead {
   @include srl.typography-lead();
 }
 
-@include margins.srl-component-margin(spacing-variations.$margins);
+@include srl.spacer-component-margin(spacing-variations.$margins);

package/livingdocs/020.Text/020.paragraph/scss/_spacing-variations.scss

@@ -1,6 +1,6 @@
 $margins: (
   ('.srl-paragraph', '*'): 200,
-  ('.srl-paragraph', '.srl-link__link'): 100,
+  ('.srl-paragraph', '.srl-link__link'): 50,
   ('.srl-paragraph', '.srl-paragraph'): 200,
   ('.srl-paragraph', '.srl-paragraph-strong'): 200,
   ('.srl-paragraph', '.srl-list-group'): 200,

package/livingdocs/020.Text/020.paragraph/scss/general.scss

@@ -1,13 +1,12 @@
 @use 'srl';
-@use "@/assets/scss/margins";
 @use "spacing-variations";
 
 .srl-paragraph {
   @include srl.typography-paragraph();
 
-  .srl-link & {
+  .srl-aside-content-container__aside & {
     @include srl.typography-link();
   }
 }
 
-@include margins.srl-component-margin(spacing-variations.$margins);
+@include srl.spacer-component-margin(spacing-variations.$margins);

package/livingdocs/020.Text/040.link/scss/_spacing-variations.scss

@@ -0,0 +1,22 @@
+$margins: (
+  ('.srl-link', '*'): 200,
+  ('.srl-link', '.srl-link__link'): 100,
+  ('.srl-link', '.srl-paragraph'): 400,
+  ('.srl-aside-content-container__aside .srl-link', '.srl-paragraph'): 200,
+  ('.srl-link', '.srl-paragraph-strong'): 200,
+  ('.srl-link', '.srl-list-group'): 200,
+  ('.srl-link', '.srl-footnote'): 200,
+  ('.srl-link', '.srl-table'): 400,
+  ('.srl-link', '.srl-signature'): 400,
+  ('.srl-link', '.srl-button-container'): 400,
+  ('.srl-link', '.srl-columns'): 400,
+  ('.srl-link', '.srl-quote'): 800,
+  ('.srl-link', '.srl-image'): 800,
+  ('.srl-link', '.srl-video'): 800,
+  ('.srl-link', '.srl-title-h2'): 800,
+  ('.srl-link', '.srl-title-h3'): 800,
+  ('.srl-link', '.srl-title-h4'): 400,
+  ('.srl-link', '.srl-title-h5'): 200,
+  ('.srl-link', '.srl-title-h6'): 200,
+  ('.srl-link', '.srl-background-container'): 1600,
+)

package/livingdocs/020.Text/040.link/scss/general.scss

@@ -1,13 +1,25 @@
 @use 'srl';
 @use "sass:map";
+@use "spacing-variations";
 
 $font-weight-bold: map.get(srl.$meta, font, weight, bold);
 
-.srl-link {
-  @include srl.typography-link();
+.srl-link__content {
+  @extend %srl-decoration-line;
+
+  .srl-aside-content-container__aside & {
+    @extend %srl-decoration-line-reset;
+  }
 }
 
+@include srl.spacer-component-margin(spacing-variations.$margins);
+
 .srl-link__link {
   font-weight: $font-weight-bold;
   display: block;
+
+  .srl-aside-content-container__aside & {
+    @include srl.typography-link();
+    font-weight: $font-weight-bold;
+  }
 }

package/livingdocs/020.Text/050.quote/scss/general.scss

@@ -5,9 +5,11 @@
 }
 
 .srl-quote__name {
+  display: block;
   @include srl.typography-quote-name();
 }
 
 .srl-quote__position {
+  display: block;
   @include srl.typography-quote-position();
 }

package/livingdocs/020.Text/060.quote-with-portrait/scss/general.scss

@@ -1,6 +1,5 @@
 @use 'srl';
 @use "sass:map";
-@use "@/assets/scss/margins";
 @use "spacing-variations";
 
 $quote-open: map.get(srl.$meta, quote, quote-open);
@@ -11,7 +10,7 @@ $quote-close: map.get(srl.$meta, quote, quote-close);
   row-gap: srl.spacer-get(400);
 }
 
-@include margins.srl-component-margin(spacing-variations.$margins);
+@include srl.spacer-component-margin(spacing-variations.$margins);
 
 .srl-quote__img {
   border-radius: 50%;

package/livingdocs/020.Text/080.footnote-item/scss/general.scss

@@ -1,6 +1,5 @@
 @use 'srl';
 @use 'sass:map';
-@use "@/assets/scss/margins";
 @use "spacing-variations";
 
 $number-width: srl.system-size-unit(map.get(srl.$meta, footnote, number-width));
@@ -15,7 +14,7 @@ $number-width: srl.system-size-unit(map.get(srl.$meta, footnote, number-width));
   @include srl.typography-footnote-text();
 }
 
-@include margins.srl-component-margin(spacing-variations.$margins);
+@include srl.spacer-component-margin(spacing-variations.$margins);
 
 .srl-footnote__key,
 .srl-footnote__number {

package/livingdocs/030.Lists/010.unordered-list/scss/general.scss

@@ -1,5 +1,4 @@
 @use 'srl';
-@use "@/assets/scss/margins";
 @use "spacing-variations";
 
-@include margins.srl-component-margin(spacing-variations.$margins);
+@include srl.spacer-component-margin(spacing-variations.$margins);

package/livingdocs/030.Lists/040.list-item-unordered-list/scss/general.scss

@@ -1,9 +1,8 @@
 @use 'srl';
 @use "sass:map";
-@use "@/assets/scss/margins";
 @use "spacing-variations";
 
-@include margins.srl-component-margin(spacing-variations.$margins);
+@include srl.spacer-component-margin(spacing-variations.$margins);
 
 .srl-list-group__item-inner {
   @include srl.typography-list();

package/livingdocs/040.Media/010.table/scss/general.scss

@@ -1,6 +1,5 @@
 @use 'srl';
 @use 'sass:map';
-@use "@/assets/scss/margins";
 @use "spacing-variations";
 
 $table-border-regular: map.get(srl.$meta, table, border, regular);
@@ -15,7 +14,7 @@ $table-border-bold: map.get(srl.$meta, table, border, bold);
   display: block;
 }
 
-@include margins.srl-component-margin(spacing-variations.$margins);
+@include srl.spacer-component-margin(spacing-variations.$margins);
 
 .srl-table__container {
   overflow: auto;
@@ -24,6 +23,13 @@ $table-border-bold: map.get(srl.$meta, table, border, bold);
 
   & > div {
     @extend %srl-grid-base;
+
+    .srl-nested-container & {
+      width: 100%;
+      display: block;
+      padding: 0;
+      margin: 0;
+    }
   }
 }
 

package/livingdocs/040.Media/010.table/scss/word.scss

@@ -2,6 +2,24 @@
 
 .srl-table {
   page-break-inside: avoid;
+  width: 100%;
+  min-width: 100%;
+
+  div {
+    width: 100%;
+    min-width: 100%;
+  }
+}
+
+.srl-table__container {
+  & > div {
+    @extend %srl-grid-reset;
+  }
+}
+
+table {
+  width: 100%;
+  min-width: 100%;
 }
 
 th,

package/livingdocs/040.Media/020.image/scss/general.scss

@@ -1,5 +1,4 @@
 @use 'srl';
-@use "@/assets/scss/margins";
 @use "spacing-variations";
 
 .srl-grid--media {
@@ -8,7 +7,7 @@
   }
 }
 
-@include margins.srl-component-margin(spacing-variations.$margins);
+@include srl.spacer-component-margin(spacing-variations.$margins);
 
 .srl-image__caption {
   @include srl.spacer-margin-top(100);

package/livingdocs/040.Media/020.image/scss/pdf.scss

@@ -13,6 +13,7 @@ $page-margin-left: srl.system-size-unit(map.get(srl.$meta, pdf, margin, left));
 }
 
 .srl-image__image-container {
+  .srl-nested-container &,
   .srl-full-width & {
     width: 100%;
   }

package/livingdocs/040.Media/030.video/scss/general.scss

@@ -1,6 +1,5 @@
 @use 'srl';
 @use "srl/fa";
-@use "@/assets/scss/margins";
 @use "spacing-variations";
 
 .srl-grid--media {
@@ -13,7 +12,7 @@
   display: block;
 }
 
-@include margins.srl-component-margin(spacing-variations.$margins);
+@include srl.spacer-component-margin(spacing-variations.$margins);
 
 .srl-video__thumbnail {
   @extend %srl-regular-width;

package/livingdocs/060.Buttons/010.button-container/button-container.html

@@ -1,4 +1,9 @@
-<div class="srl-grid srl-button-container">
+<div
+  class="srl-grid srl-button-container"
+  data-remove-from-pdf="complete"
+  data-remove-from-word="complete"
+  data-remove-from-xhtml="complete"
+>
   <div class="srl-grid__inner srl-button-container__inner" doc-container="button-container">
 
   </div>

package/livingdocs/060.Buttons/020.button/button.html

@@ -1,4 +1,10 @@
-<a doc-link="href" class="srl-button">
+<a
+  doc-link="href"
+  class="srl-button"
+  data-remove-from-pdf="complete"
+  data-remove-from-word="complete"
+  data-remove-from-xhtml="complete"
+>
   <i class="srl-button__icon" aria-hidden="true"></i>
   <span class="srl-button__text" doc-editable="button-text">Button</span>
 </a>

package/livingdocs/070.Container/010.aside-content-container/aside-content-container.html

@@ -1,4 +1,4 @@
-<div class="srl-grid srl-aside-content-container">
+<div class="srl-grid srl-aside-content-container srl-nested-container">
   <div
     class="srl-grid__aside srl-aside-content-container__aside"
     doc-container="aside"

package/livingdocs/070.Container/010.aside-content-container/ld-conf.json

@@ -1,6 +1,6 @@
 {
   "name": "aside-content-container",
-  "label": "Aside / Content container",
+  "label": "Aside content container",
   "properties": ["sticky", "pdf-spacer"],
   "directives": {
     "aside": {

package/livingdocs/070.Container/010.aside-content-container/scss/general.scss

@@ -1 +1,5 @@
 @use 'srl';
+
+.srl-aside-content-container__aside {
+  @extend %srl-decoration-line;
+}

package/livingdocs/070.Container/010.aside-content-container/scss/pdf.scss

@@ -5,14 +5,4 @@
   justify-content: space-between;
   flex-direction: row;
   align-items: flex-start;
-}
-
-.srl-aside-content-container__aside {
-  &:before {
-    content: "";
-    display: block;
-    background: srl.colors-grey-200();
-    height: srl.system-size-unit(1pt);
-    width: srl.system-size-unit(80pt);
-  }
 }

package/livingdocs/070.Container/010.aside-content-container/scss/web.scss

@@ -2,4 +2,12 @@
 
 .srl-aside-content-container {
   gap: srl.spacer-get(200);
+}
+
+.srl-aside-content-container__aside {
+  order: 2;
+
+  @include srl.grid-media-up(tablet-ls) {
+    order: unset;
+  }
 }

package/livingdocs/070.Container/020.columns-container/columns-container.html

@@ -1,5 +1,5 @@
 <div class="srl-grid srl-columns srl-nested-container">
-  <div class="srl-grid__inner srl-flex srl-flex-gap">
+  <div class="srl-grid__inner srl-columns__inner srl-flex srl-flex-gap">
     <div
       class="srl-columns__column srl-columns__column--1"
       doc-container="column-1"

package/livingdocs/070.Container/020.columns-container/ld-conf.json

@@ -1,6 +1,6 @@
 {
   "name": "columns-container",
-  "label": "Columns container",
+  "label": "Layout column container",
   "properties": ["width-reduced", "vertical-alignment", "pdf-spacer"],
   "directives": {
     "show-column-3": {

package/livingdocs/070.Container/020.columns-container/scss/pdf.scss

@@ -1,5 +1,4 @@
 @use "srl";
-@use "@/assets/scss/margins";
 
 @include srl.system-add-root-style(srl-model-flex-direction, row);
 

package/livingdocs/070.Container/030.background-container/scss/general.scss

@@ -1,9 +1,8 @@
 @use "srl";
-@use "@/assets/scss/margins";
 @use "spacing-variations";
 
 .srl-background-container {
   padding-block: srl.spacer-get(800);
 }
 
-@include margins.srl-component-margin(spacing-variations.$margins);
+@include srl.spacer-component-margin(spacing-variations.$margins);

package/livingdocs/080.CV/010.cv/scss/editor.scss

@@ -7,4 +7,4 @@
 
 .srl-cv__button-container {
   @include srl.spacer-margin-block(400);
-}
+}

package/livingdocs/080.CV/010.cv/scss/general.scss

@@ -1,9 +1,8 @@
 @use 'srl';
 @use "sass:map";
-@use "@/assets/scss/margins";
 @use "spacing-variations";
 
-@include margins.srl-component-margin(spacing-variations.$margins);
+@include srl.spacer-component-margin(spacing-variations.$margins);
 
 .srl-cv__inner {
   display: flex;

package/livingdocs/080.CV/010.cv/scss/xbrl.scss

@@ -1 +1,2 @@
-@use 'general';
+@use 'general';
+@use 'web';