Additional style fixes.

- fix font size - fix font scaling - fix image caption position - added Full Width alternate style
DunaMariusCosmin · Oct 19, 2020 · 6a8437f · 6a8437f
1 parent 03e885e
commit 6a8437f
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 197 deletions.
diff --git a/jats.framework b/jats.framework
@@ -64,6 +64,17 @@
 											<Boolean>true</Boolean>
 										</field>
 									</cssFile>
+									<cssFile>
+										<field name="href">
+											<String>${framework}/lib/author-css/alternate-full-width-layout.css</String>
+										</field>
+										<field name="title">
+											<String>Full Width</String>
+										</field>
+										<field name="alternate">
+											<Boolean>true</Boolean>
+										</field>
+									</cssFile>
 								</cssFile-array>
 							</field>
 							<field name="mergeCSSsFromDocument">

diff --git a/lib/author-css/alternate-full-width-layout.css b/lib/author-css/alternate-full-width-layout.css
@@ -0,0 +1,27 @@
+/**
+ * Resets the page constraints, making the contents use the entire viewport width.
+ */
+@namespace oxy "http://www.oxygenxml.com/extensions/author";
+
+oxy|document {
+      background-color:inherit;
+      background-image:none;
+      max-width: none;
+}
+:root {
+      background-color:inherit;
+      background-image:none;
+      border:none;  
+      width:inherit;
+      min-height:0;
+
+      /* Not the same as in -topic-basic.css */
+      margin:0.5em;
+      padding:0em;
+}
+
+@media oxygen AND (platform: "webapp") {
+  *[class~="topic/tgroup"] {
+    overflow: visible;
+  }
+}
diff --git a/lib/author-css/authoring-extension.css b/lib/author-css/authoring-extension.css
@@ -145,51 +145,6 @@ xref:before,
 oasis|tgroup:before > oasis|colspec {
   font-family: Georgia, Caladea, Cambria, serif !important;
 }
-front,
-front-matter,
-contrib-group,
-permissions,
-email,
-license,
-abstract,
-kwd-group,
-conference,
-conf-date,
-conf-name,
-conf-acronym,
-conf-num,
-conf-loc,
-conf-sponsor,
-conf-theme,
-sub,
-fn,
-fig,
-table-wrap,
-statement,
-ext-link:after,
-supplementary-material,
-caption,
-ref-list:before,
-see-entry:before,
-see-also-entry:before see-entry:before,
-see-also-entry:before,
-*:before,
-publisher-loc:before,
-publisher-loc:after,
-graphic:after,
-inline-graphic:after,
-index-term:before,
-index-term:after,
-see:before,
-see:after,
-see-also:before,
-see-also:after,
-index-term-range-end:after,
-inline-graphic:before,
-nlm-citation *:before,
-element-citation *:before {
-  font-size: 19px!important;
-}
 table > caption,
 table > info > title,
 table > title,
@@ -230,11 +185,6 @@ caption {
 article table > caption {
   display: table-caption;
 }
-caption p {
-  margin-top: 0!important;
-  margin-bottom: 0!important;
-  margin-left: 50%!important;
-}
 td {
   border-left: thin;
   border-left-color: #eeeeee;
@@ -1031,14 +981,8 @@ col,
 spanspec {
   text-align: attr(align);
 }
-*:root {
-  border-width: 1px;
-  border-color: #c6c6c6;
-  font-feature-settings: "lnum" !important;
-  font-family: Georgia, Caladea, Cambria, serif !important;
-  line-height: 27px!important;
-  padding-right: 20px!important;
-  padding-left: 20px!important;
+:root {
+  line-height: 1.2;
 }
 title {
   margin-top: 0.25em!important;
@@ -1053,7 +997,6 @@ article-title {
   font-weight: bold;
   display: block!important;
   margin-top: 1em!important;
-  font-size: 1em;
   text-align: center;
 }
 ref article-title {
@@ -1070,9 +1013,6 @@ article-meta article-categories {
 article-meta article-categories subj-group {
   display: block;
 }
-ack {
-  font-size: 20px!important;
-}
 back ref-list label {
   list-style-type: check;
 }
@@ -1138,12 +1078,10 @@ code {
   padding-bottom: 0.5em ;
   font-family: monospace !important;
   width: 100% !important;
-  font-size: 90% !important;
   border: none !important;
   white-space: pre ;
 }
 * comment:not(oxy|comment) {
-  font-size: 17px!important;
   color: black;
   text-align: left;
   padding-left: 0.25em!important;
@@ -1211,9 +1149,6 @@ break {
   visibility: hidden;
   display: block!important;
 }
-contrib bio p {
-  font-size: inherit!important;
-}
 glossary def-list def-item def {
   border-top-color: #ababac;
   border-right-color: #ababac;
@@ -1305,10 +1240,7 @@ boxed-text {
   background: white!important;
   border-color: #ababac !important;
   padding-top: 0!important;
-  padding-bottom: 0px!important;
-}
-boxed-text title {
-  font-size: 17px!important;
+  padding-bottom: 0!important;
 }
 graphic[xlink|href]:before {
   -oxy-link: none !important;
@@ -1329,7 +1261,6 @@ table-wrap table {
   margin-bottom: 0 !important;
 }
 table-wrap table-wrap-foot {
-  font-size: 0.8em!important;
   counter-reset: my-tfoot-counter;
   line-height: 1.5em!important;
 }
@@ -1339,9 +1270,6 @@ table-wrap table-wrap-foot fn {
   padding-bottom: 0;
   margin-top: 0!important;
 }
-table-wrap table-wrap-foot fn p {
-  font-size: 0.8em!important;
-}
 table-wrap table-wrap-foot fn p:before {
   counter-increment: my-tfoot-counter;
   content: counter(my-tfoot-counter) ") ";

diff --git a/lib/author-css/authoring-extension.less b/lib/author-css/authoring-extension.less
@@ -9,14 +9,8 @@
 @import "./table.less";
 @import "./xhtml-tables.less";
 
-
-*:root{
-    .border-page();
-    font-feature-settings: "lnum"!important;
-    font-family: Georgia, Caladea, Cambria, serif !important;
-    line-height: 27px!important;
-    padding-right:20px!important;
-    padding-left:20px!important;
+:root {
+    line-height:1.2;
 }
 
 title {
@@ -35,7 +29,6 @@ article-title {
     .title();
     display:block!important;
     margin-top:1em!important;
-    font-size:1em;
     text-align:center;
 }
 ref article-title {
@@ -56,7 +49,6 @@ article-meta
     }
 }
 ack{
-    font-size:20px!important;
 }
 
 back{
@@ -133,13 +125,11 @@ code{
     padding-bottom : 0.5em ;
     font-family : monospace !important;
     width:100% !important;
-    font-size : 90% !important;
     border:none !important;
     white-space : pre ;
 }
 
 * comment:not(oxy|comment){
-    font-size:17px!important;
     color:black;
     text-align:left;
     padding-left:0.25em!important;
@@ -193,7 +183,6 @@ break{
 }
 
 contrib bio p {
-    font-size:inherit!important;
 }
 
 glossary def-list def-item def{ 
@@ -283,9 +272,8 @@ boxed-text{
     background:white!important;
     border-color:rgb(171 , 171 , 172)!important;
     padding-top:0!important;
-    padding-bottom:0px!important;
+    padding-bottom:0!important;
     & title{
-        font-size:17px!important;
     }
 }
 
@@ -310,16 +298,14 @@ table-wrap{
         margin-bottom:0 !important;
     }    
     & table-wrap-foot{
-        font-size:0.8em!important;
         counter-reset: my-tfoot-counter;
-            line-height:1.5em!important;
+        line-height:1.5em!important;
         fn{
             padding-left:1em!important;
             padding-top:0;
             padding-bottom:0;
             margin-top:0!important;
             & p{
-                font-size:0.8em!important;
                 &:before{ 
                     counter-increment: my-tfoot-counter;
                     content: counter(my-tfoot-counter) ") ";

diff --git a/lib/author-css/override-base.css b/lib/author-css/override-base.css
@@ -52,51 +52,6 @@ xref:before,
 oasis|tgroup:before > oasis|colspec {
   font-family: Georgia, Caladea, Cambria, serif !important;
 }
-front,
-front-matter,
-contrib-group,
-permissions,
-email,
-license,
-abstract,
-kwd-group,
-conference,
-conf-date,
-conf-name,
-conf-acronym,
-conf-num,
-conf-loc,
-conf-sponsor,
-conf-theme,
-sub,
-fn,
-fig,
-table-wrap,
-statement,
-ext-link:after,
-supplementary-material,
-caption,
-ref-list:before,
-see-entry:before,
-see-also-entry:before see-entry:before,
-see-also-entry:before,
-*:before,
-publisher-loc:before,
-publisher-loc:after,
-graphic:after,
-inline-graphic:after,
-index-term:before,
-index-term:after,
-see:before,
-see:after,
-see-also:before,
-see-also:after,
-index-term-range-end:after,
-inline-graphic:before,
-nlm-citation *:before,
-element-citation *:before {
-  font-size: 19px!important;
-}
 table > caption,
 table > info > title,
 table > title,

diff --git a/lib/author-css/override-base.less b/lib/author-css/override-base.less
@@ -55,54 +55,6 @@ oasis|tgroup:before > oasis|colspec
 }
 
 
-front,
-front-matter,
-contrib-group,
-permissions,
-email,
-license,
-abstract,
-kwd-group,
-conference,
-conf-date,
-conf-name,
-conf-acronym,
-conf-num,
-conf-loc,
-conf-sponsor,
-conf-theme,sub,
-fn,
-fig,
-table-wrap,
-statement,
-ext-link:after,
-supplementary-material,
-caption,
-ref-list:before ,
-see-entry:before,
-see-also-entry:before
-see-entry:before,
-see-also-entry:before,
-*:before,
-publisher-loc:before,
-publisher-loc:after,
-graphic:after,
-inline-graphic:after,
-index-term:before, 
-index-term:after,
-see:before,
-see:after,
-see-also:before,
-see-also:after,
-index-term-range-end:after,
-inline-graphic:before,
-nlm-citation *:before,
-element-citation *:before,
-//p
-{
-    font-size:19px!important;
-}
-
 table > caption,
 table > info > title,
 table > title,