css

print/print_style.css

@@ -17,13 +17,6 @@
 @font-face {
     font-family: 'Platypi';
     src: url('../fonts/webfonts/Platypi-Italic.woff2');
-<<<<<<< HEAD
-    font-weight: italic;
-}
-
-@media print {
-    @page {
-=======
     font-style: italic;
 }
 notes{
@@ -31,7 +24,6 @@ notes{
 }
 @media print{
     @page{
->>>>>>> 55ed7a48c770886295d8b817569fea3813c769ed
         size: 130mm 180mm;
         marks: crop; /* can also add cross */
         bleed: 3mm;
@@ -45,24 +37,7 @@ notes{
             position: relative;
             text-align: left;
             font-size: 7pt;
-<<<<<<< HEAD
-        }
-
-        @left-top {
-            content: element(sidenote, all-once);
-            padding: 5mm;
-        }
-
-        @note-area {
-            content: element(sidenotes, all-once);
-            float: top right;
-            float-reference: page;
-            width: 42mm;
-            margin-right: -30mm;
         } 
-=======
-        } 
->>>>>>> 55ed7a48c770886295d8b817569fea3813c769ed
     }
 
     @page:left {
@@ -97,18 +72,7 @@ a {
     text-decoration: none;
     color: #000;
 }
-<<<<<<< HEAD
-
-.sidenote {
-    position: note(sidenote);
-    margin-bottom: 10px;
-    text-align: left;
-}
-
 .margin-note{
-=======
-.margin-note{
->>>>>>> 55ed7a48c770886295d8b817569fea3813c769ed
     font-size: 7pt;
     line-height: 3mm;
     text-align: left;
@@ -139,14 +103,8 @@ body .margin-note{
     line-height: 1.1;
     white-space: pre-wrap; 
 }
-<<<<<<< HEAD
-
-#contenteo {
-    font-family: 'Platypi-Regular', 'platypi';
-=======
 body{
     font-family: 'Platypi-Regular','platypi' ;
->>>>>>> 55ed7a48c770886295d8b817569fea3813c769ed
     line-height: 1.3;
     font-size: 9pt;
     letter-spacing: -0.1px;
@@ -214,28 +172,16 @@ section {
     padding: 0;
     margin: 0;
 }
-<<<<<<< HEAD
-
-.toc-title {
-    break-before: none;
-    break-after: none;
-=======
 .toc-title{
     font-size: 24pt;
     font-weight: medium;
     line-height: 8mm;
     display: inline;
->>>>>>> 55ed7a48c770886295d8b817569fea3813c769ed
 }
 
 .toc-title a::after {
     content: target-counter(attr(href url), page);
-<<<<<<< HEAD
-    float: right;
-}
-=======
     font-size: 9pt;
     color: var(--spot-color-1);
     padding: 0 1rem;
 }
->>>>>>> 55ed7a48c770886295d8b817569fea3813c769ed