metanorma-iso 1.3.20 → 1.3.25

Sign up to get free protection for your applications and to get access to all the features.
Files changed (60) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/macos.yml +10 -10
  3. data/.github/workflows/ubuntu.yml +11 -11
  4. data/.github/workflows/windows.yml +11 -12
  5. data/Gemfile +2 -0
  6. data/README.adoc +3 -2
  7. data/lib/asciidoctor/iso/base.rb +17 -1
  8. data/lib/asciidoctor/iso/biblio.rng +131 -46
  9. data/lib/asciidoctor/iso/cleanup.rb +19 -2
  10. data/lib/asciidoctor/iso/front.rb +116 -17
  11. data/lib/asciidoctor/iso/isodoc.rng +32 -4
  12. data/lib/asciidoctor/iso/isostandard-amd.rng +98 -0
  13. data/lib/asciidoctor/iso/isostandard.rng +10 -0
  14. data/lib/asciidoctor/iso/macros.rb +21 -0
  15. data/lib/asciidoctor/iso/section.rb +18 -32
  16. data/lib/asciidoctor/iso/term_lookup_cleanup.rb +90 -0
  17. data/lib/asciidoctor/iso/validate.rb +41 -21
  18. data/lib/asciidoctor/iso/validate_section.rb +2 -2
  19. data/lib/asciidoctor/iso/validate_style.rb +1 -1
  20. data/lib/isodoc/iso/base_convert.rb +57 -41
  21. data/lib/isodoc/iso/html/header.html +5 -5
  22. data/lib/isodoc/iso/html/html_iso_titlepage.html +18 -18
  23. data/lib/isodoc/iso/html/isodoc.scss +28 -28
  24. data/lib/isodoc/iso/html/scripts.html +23 -21
  25. data/lib/isodoc/iso/html/style-human.scss +259 -423
  26. data/lib/isodoc/iso/html/style-iso.scss +151 -382
  27. data/lib/isodoc/iso/html/word_iso_titlepage.html +23 -2
  28. data/lib/isodoc/iso/html/wordstyle.scss +66 -39
  29. data/lib/isodoc/iso/html_convert.rb +7 -9
  30. data/lib/isodoc/iso/iso.international-standard.xsl +4386 -0
  31. data/lib/isodoc/iso/metadata.rb +48 -22
  32. data/lib/isodoc/iso/pdf_convert.rb +32 -0
  33. data/lib/metanorma-iso.rb +1 -0
  34. data/lib/metanorma/iso/processor.rb +13 -1
  35. data/lib/metanorma/iso/version.rb +1 -1
  36. data/spec/asciidoctor-iso/amd_spec.rb +318 -0
  37. data/spec/asciidoctor-iso/base_spec.rb +37 -17
  38. data/spec/asciidoctor-iso/blocks_spec.rb +21 -9
  39. data/spec/asciidoctor-iso/cleanup_spec.rb +203 -175
  40. data/spec/asciidoctor-iso/inline_spec.rb +2 -1
  41. data/spec/asciidoctor-iso/macros_spec.rb +273 -0
  42. data/spec/asciidoctor-iso/refs_spec.rb +7 -4
  43. data/spec/asciidoctor-iso/section_spec.rb +8 -8
  44. data/spec/asciidoctor-iso/validate_spec.rb +1 -1
  45. data/spec/assets/iso.xml +64 -1
  46. data/spec/isodoc/blocks_spec.rb +115 -0
  47. data/spec/isodoc/i18n_spec.rb +12 -20
  48. data/spec/isodoc/inline_spec.rb +2 -2
  49. data/spec/isodoc/iso_spec.rb +1 -1
  50. data/spec/isodoc/metadata_spec.rb +13 -4
  51. data/spec/isodoc/postproc_spec.rb +13 -112
  52. data/spec/isodoc/ref_spec.rb +4 -4
  53. data/spec/isodoc/section_spec.rb +8 -12
  54. data/spec/isodoc/table_spec.rb +24 -24
  55. data/spec/isodoc/terms_spec.rb +2 -2
  56. data/spec/isodoc/xref_spec.rb +19 -19
  57. data/spec/metanorma/processor_spec.rb +2 -2
  58. data/spec/spec_helper.rb +13 -1
  59. metadata +9 -3
  60. data/asciidoctor-iso.gemspec.old +0 -50
@@ -7,104 +7,15 @@
7
7
  License: none (public domain)
8
8
  */
9
9
 
10
- html, body, div, span, applet, object, iframe,
11
- h1, h2, h3, h4, h5, h6, p, blockquote, pre,
12
- a, abbr, acronym, address, big, cite, code,
13
- del, dfn, em, img, ins, kbd, q, s, samp,
14
- small, strike, strong, sub, sup, tt, var,
15
- b, u, i, center,
16
- ol, ul, li,
17
- fieldset, form, label, legend,
18
- table, caption, tbody, tfoot, thead, tr, th, td,
19
- article, aside, canvas, details, embed,
20
- figure, figcaption, footer, header, hgroup,
21
- menu, nav, output, ruby, section, summary,
22
- time, mark, audio, video {
23
- margin: 0;
24
- padding: 0;
25
- }
26
-
27
- html, body, div, span, applet, object, iframe,
28
- h1, h2, h3, h4, h5, h6, p, blockquote, pre,
29
- a, abbr, acronym, address, big, cite, code,
30
- del, dfn, em, img, ins, kbd, q, s, samp,
31
- small, strike, strong, sub, sup, tt, var,
32
- b, u, i, center,
33
- dl, dt, dd, ol, ul, li,
34
- fieldset, form, label, legend,
35
- table, caption, tbody, tfoot, thead, tr, th, td,
36
- article, aside, canvas, details, embed,
37
- figure, figcaption, footer, header, hgroup,
38
- menu, nav, output, ruby, section, summary,
39
- time, mark, audio, video {
40
- border: 0;
41
- font-size: 100%;
42
- }
43
-
44
- html, body, div, span, applet, object, iframe,
45
- h1, h2, h3, h4, h5, h6, p, blockquote, pre,
46
- a, abbr, acronym, address, big, cite, code,
47
- del, dfn, em, img, ins, kbd, q, s, samp,
48
- small, strike, strong, tt, var,
49
- b, u, i, center,
50
- dl, dd, ol, ul, li,
51
- fieldset, form, label, legend,
52
- table, caption, tbody, tfoot, thead, tr, th, td,
53
- article, aside, canvas, details, embed,
54
- figure, figcaption, footer, header, hgroup,
55
- menu, nav, output, ruby, section, summary,
56
- time, mark, audio, video {
57
- vertical-align: baseline;
58
- }
59
-
60
- html, body, div, span, applet, object, iframe,
61
- p, blockquote,
62
- a, abbr, acronym, address, big, cite,
63
- del, dfn, em, img, ins, q, s,
64
- small, strike, strong, sub, sup, var,
65
- b, u, i, center,
66
- dl, dt, dd, ol, ul, li,
67
- fieldset, form, label, legend,
68
- table, caption, tbody, tfoot, thead, tr, th, td,
69
- article, aside, canvas, details, embed,
70
- figure, figcaption, footer, header, hgroup,
71
- menu, nav, output, ruby, section, summary,
72
- time, mark, audio, video {
73
- font-family: $bodyfont;
74
- }
75
-
76
- code, pre, tt, kbd, samp {
77
- font-family: $monospacefont;
78
- font-variant-ligatures: none;
79
- }
80
-
81
- code *, pre *, tt *, kbd *, samp * {
82
- font-family: $monospacefont !important;
83
- font-variant-ligatures: none;
84
- }
85
-
86
- dl {
87
- display: grid;
88
- grid-template-columns: max-content auto;
89
- }
90
-
91
- dt {
92
- grid-column-start: 1;
93
- }
94
-
95
- dd {
96
- grid-column-start: 2;
97
- }
98
-
99
- dd p, dt p {
100
- margin-top: 0px;
101
- }
10
+ @import 'base_style/all';
102
11
 
103
- h1, h2, h3, h4, h5, h6, .h2Annex {
104
- font-family: $headerfont;
12
+ body {
13
+ @include bodyStyle1(16px, 1.4em, -internal-root-color, #ffffff, 300);
14
+ main {
15
+ margin: 0;
16
+ }
105
17
  }
106
18
 
107
-
108
19
  /* HTML5 display-role reset for older browsers */
109
20
  article, aside, details, figcaption, figure,
110
21
  footer, header, hgroup, menu, nav, section {
@@ -121,10 +32,6 @@ q:before, q:after {
121
32
  content: '';
122
33
  content: none;
123
34
  }
124
- table {
125
- border-collapse: collapse;
126
- border-spacing: 0;
127
- }
128
35
 
129
36
  /* New CSS */
130
37
 
@@ -159,7 +66,7 @@ main {
159
66
  margin-left: -3em;
160
67
  /*padding-top: 2em;*/
161
68
  padding-bottom: 2em;
162
-
69
+
163
70
  }
164
71
 
165
72
  .doctitle-en span {
@@ -178,14 +85,6 @@ main {
178
85
  margin-top: 1em;
179
86
  }
180
87
 
181
- /*
182
- span.title {
183
- text-transform: uppercase;
184
- font-size: 1em;
185
- font-weight: 800;
186
- }
187
- */
188
-
189
88
  span.title, span.subtitle, span.part {
190
89
  font-weight: 800;
191
90
  }
@@ -231,6 +130,17 @@ h1, h2, h3, h4, h5, h6 {
231
130
  line-height: 1.2;
232
131
  }
233
132
 
133
+ {% if doctype == "amendment" or doctype == "technical-corrigendum" %}
134
+
135
+ h1, h2, h3, h4, h5, h6 {
136
+ font-weight: normal;
137
+ font-size: initial;
138
+ font-style: italic;
139
+ }
140
+
141
+ {% endif %}
142
+
143
+
234
144
  p {
235
145
  margin-top: 1em;
236
146
  margin-bottom: 1em;
@@ -250,39 +160,27 @@ a {
250
160
  text-decoration-color: black;
251
161
  }
252
162
 
253
- nav a {
254
- text-decoration: none;
255
- color: black;
256
- }
257
-
258
163
  h2 p {
259
164
  display: inline;
260
165
  }
261
166
 
262
-
263
- ul > li {
167
+
168
+ ul > li {
264
169
  list-style: none;
265
- }
266
-
170
+ }
171
+
267
172
  ul > li > p:first-child:before {
268
- content: "\2014";
269
- display: inline-block;
270
- width: 1em;
271
- margin-left: -1.5em;
272
- margin-right: 0.5em;
273
- }
274
-
275
- li p {
276
- /* display: inline-block; */
277
- margin-bottom: 0.6em;
278
- line-height: 1.2;
279
- }
280
-
281
-
282
- #toc li:before {
283
- content: " ";
284
- display: none;
285
- }
173
+ content: "\2014";
174
+ display: inline-block;
175
+ width: 1em;
176
+ margin-left: -1.5em;
177
+ margin-right: 0.5em;
178
+ }
179
+
180
+ li p {
181
+ margin-bottom: 0.6em;
182
+ line-height: 1.2;
183
+ }
286
184
 
287
185
  p.AltTerms {
288
186
  margin-bottom: 0;
@@ -295,49 +193,37 @@ p.Terms {
295
193
  margin-top: 0em;
296
194
  }
297
195
 
298
- /* already added to isodoc/base */
299
- strong, b {
300
- font-weight: bold;
301
- }
302
-
303
196
  /* Navigation*/
304
197
 
305
- @media screen and (min-width: 768px) {
306
- nav {
307
- position: fixed;
308
- top: 0;
309
- bottom: 0;
310
- left: 0;
311
- width: 278px;
312
- font-size: 0.9em;
313
- overflow: auto;
314
- padding: 0 0 0 20px;
315
- background-color:#f7f7f7;
316
- line-height: 1.2em;
317
- }
198
+ #toc {
199
+ @include toc(null, #f7f7f7, black);
200
+ @include sidebarToc();
318
201
 
319
- #toggle {
320
- position: fixed;
321
- height: 100%;
322
- width: 30px;
323
- border-right: solid black 1px;
324
- background-color: #f7f7f7;
325
- color: black!important;
326
- cursor: pointer;
327
- margin-left: -4em;
328
- margin-top: -2em;
202
+ .toc-active,
203
+ li:hover {
204
+ box-shadow: 0px 1px 0px 0px black !important;
205
+ background: none;
329
206
  }
330
207
 
331
- #toggle span {
332
- text-align: center;
333
- width: 100%;
334
- position: absolute;
335
- top: 50%;
336
- transform: translate(0, -50%);
337
-
208
+ li:before {
209
+ content: " ";
210
+ display: none;
338
211
  }
212
+ }
213
+
214
+ nav {
215
+ @include sidebarNav(#f7f7f7, 278px, 20px);
216
+ line-height: 1.2em;
217
+ }
339
218
 
219
+ #toggle {
220
+ @include sidebarNavToggle(black, #f7f7f7);
221
+ border-right: solid black 1px;
222
+ margin-left: -4em;
223
+ margin-top: -2em;
224
+ }
340
225
 
226
+ @media screen and (min-width: 768px) {
341
227
  .container {
342
228
  padding-left: 360px;
343
229
  }
@@ -357,17 +243,6 @@ strong, b {
357
243
  }
358
244
 
359
245
  @media screen and (max-width: 768px) {
360
- #toc {
361
- padding: 0 1.5em 0 1.5em;
362
- overflow: visible;
363
- }
364
-
365
- #toggle {
366
- display: none;
367
- margin-left: -4em;
368
- margin-top: -2em;
369
- }
370
-
371
246
  body {
372
247
  margin-left: 2em;
373
248
  }
@@ -382,61 +257,16 @@ strong, b {
382
257
  width: 100%;
383
258
  }
384
259
  }
385
-
386
- div.figure > img {
387
- margin-left: auto;
388
- margin-right: auto;
389
- display: block;
390
- max-width: 100%;
391
- height: auto;
392
- }
393
-
394
-
395
-
396
- #toc ul {
397
- margin: 0;
398
- padding: 0;
399
- list-style: none;
400
- }
401
-
402
- #toc li a {
403
- padding: 5px 10px;
404
- }
405
260
 
406
- #toc a {
407
- text-decoration: none;
408
- display: block;
409
- }
410
-
411
- #toc a:hover {
412
- box-shadow: none;
413
- color: black;
414
- }
415
-
416
- #toc .h2 {
417
- padding-left: 30px;
418
- }
419
-
420
- #toc .h3 {
421
- padding-left: 50px;
422
- }
423
-
424
- #toc .toc-active a {
425
- color: black;
426
- }
427
-
428
- /*#toc .toc-active, #toc li:hover {
429
- background: #1d1d1d;
430
- box-shadow: inset -5px 0px 10px -5px #1d1d1d!important;
431
- }*/
432
-
433
- #toc .toc-active, #toc li:hover {
434
- box-shadow: 0px 1px 0px 0px black!important;
435
- color: black;
261
+ .figure,
262
+ pre,
263
+ .pseudocode {
264
+ @include pseudocodeBlock(#f7f7f7);
265
+ font-size: 1em;
436
266
  }
437
267
 
438
- #toc li:hover a {
439
- color: black;
268
+ div.figure {
269
+ @include figureBlock();
440
270
  }
441
271
 
442
272
  /*
@@ -444,56 +274,20 @@ height: auto;
444
274
  */
445
275
 
446
276
  .document-type-band {
447
- left:0;
448
- top:180px;
449
- height: 100%;
450
- position: fixed;
451
- display: block;
452
- z-index: 99;
453
- /*box-shadow: -5px 0px 10px #1d1d1d*/
277
+ @include docBand($order: 2, $offset: 180px);
454
278
 
279
+ .document-type {
280
+ top: 20px;
281
+ }
455
282
  }
456
283
 
457
284
  .document-stage-band {
458
- left:0;
459
- top:0;
460
- height: 100%;
461
- position: fixed;
462
- display: block;
463
- z-index: 98;
464
- box-shadow: -5px 0px 10px #1d1d1d
285
+ @include docBand(1, 100%);
465
286
  }
466
287
 
467
- .document-type {
468
- position: relative;
469
- width: 25px;
470
- }
471
-
472
- .document-stage {
473
- position: relative;
474
- width: 25px;
475
- }
476
-
477
- p.document-type, p.document-stage {
478
- color: white;
479
- text-transform: uppercase;
480
- font-size: 0.9em;
481
- font-weight: 400;
482
- letter-spacing: 0.05em;
483
- margin:0;
484
- margin-left: 6px;
485
- writing-mode:vertical-rl;
486
- -webkit-transform:rotate(180deg);
487
- -moz-transform:rotate(180deg);
488
- -o-transform: rotate(180deg);
489
- white-space:nowrap;
490
- display:block;
491
- bottom:0;
492
- }
493
-
494
- p.document-type {
495
- font-weight: 400;
496
- height: 210px;
288
+ p.document-stage {
289
+ @include docBandTitle(210px);
290
+ writing-mode: vertical-rl;
497
291
  }
498
292
 
499
293
  #governance-band p.document-type {
@@ -536,7 +330,7 @@ p.document-stage {
536
330
  font-size: 1em;
537
331
  margin: 0 0 2em 0;
538
332
  text-transform: uppercase;
539
- }
333
+ }
540
334
 
541
335
  #working-draft {
542
336
  border-bottom: solid 3px #fda706;
@@ -581,15 +375,29 @@ p.document-stage {
581
375
 
582
376
  /* 3 Other styles */
583
377
 
378
+ /*
379
+ 3.2 Links
380
+ */
381
+ a {
382
+ color: black;
383
+ text-decoration-color: black;
384
+ }
385
+
584
386
  /*
585
387
  3.3 Lists
586
388
  */
587
-
588
- ul, ol {margin-left: 2em;}
589
-
590
- #toc-list ul {margin-bottom: 0.25em;}
591
-
592
- #toc-list ol li {list-style-type: none;}
389
+
390
+ ul, ol {
391
+ margin-left: 2em;
392
+ }
393
+
394
+ #toc-list ul {
395
+ margin-bottom: 0.25em;
396
+ }
397
+
398
+ #toc-list ol li {
399
+ list-style-type: none;
400
+ }
593
401
 
594
402
  /* https://github.com/metanorma/metanorma-iso/issues/319 : force a) parentheses for ordered lists */
595
403
 
@@ -686,48 +494,43 @@ ol[type="roman_upper"] ol[type="roman_upper"] > li:before {
686
494
  content: counter(roman_upper2, upper-roman)") "
687
495
  }
688
496
 
689
-
690
497
  /*
691
498
  3.4 Rules
692
499
  */
693
500
 
694
501
  .rule {
695
- width: 100%;
696
- height: 1px;
697
- background-color: #0e1a85;
698
- margin: 2em 0;
699
- }
502
+ @include rule(1px, #0e1a85)
503
+ }
700
504
 
701
505
  /*
702
506
  3.5 Bibliograhy
703
507
  */
704
508
 
705
509
  p.Biblio, p.NormRef {
706
- margin-top: 1em;
707
- margin-left: 2em;
510
+ margin-top: 1em;
511
+ margin-left: 2em;
708
512
  }
709
513
 
710
514
  /*
711
515
  3.6 Source Code + figures
712
516
  */
713
517
 
714
- pre {
715
- font-family: $monospacefont;
716
- font-variant-ligatures: none;
518
+ .figure,
519
+ pre,
520
+ .pseudocode {
521
+ @include pseudocodeBlock(#f7f7f7);
522
+ font-size: 1em;
717
523
  }
718
524
 
719
- .figure, pre, .pseudocode {
720
- background-color: #f7f7f7;
721
- line-height: 1.6em;
722
- padding: 1.5em;
723
- margin: 2em 0 1em 0;
724
- overflow: auto;
525
+ pre {
526
+ @include monospaceBlockStyle()
725
527
  }
726
528
 
529
+ @include admonitionBlock();
530
+ @include recommendationBlock();
531
+
727
532
  .figure-title, .FigureTitle, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
728
- font-weight: 700;
729
- font-size: 1em;
730
- text-align: center;
533
+ @include blockTitle()
731
534
  }
732
535
 
733
536
  /*
@@ -735,11 +538,11 @@ text-align: center;
735
538
  */
736
539
 
737
540
  .Note, .note {
738
- background-color: #fff495;
739
- color: #47430c;
740
- padding: 0.5em;
741
- margin: 1.5em 0 1.5em 0;
742
- text-align: left;
541
+ background-color: #fff495;
542
+ color: #47430c;
543
+ padding: 0.5em;
544
+ margin: 1.5em 0 1.5em 0;
545
+ text-align: left;
743
546
  }
744
547
 
745
548
  .Note p, .note p {
@@ -747,11 +550,11 @@ text-align: left;
747
550
  }
748
551
 
749
552
  .Admonition {
750
- background-color: #ffcccc;
751
- color: #47430c;
752
- padding: 0.5em;
753
- margin: 1.5em 0 1.5em 0;
754
- text-align: left;
553
+ background-color: #ffcccc;
554
+ color: #47430c;
555
+ padding: 0.5em;
556
+ margin: 1.5em 0 1.5em 0;
557
+ text-align: left;
755
558
  }
756
559
 
757
560
  .Admonition p {
@@ -764,25 +567,18 @@ text-align: left;
764
567
  */
765
568
 
766
569
  .example {
767
- background-color: #e1eef1;
768
- padding: 0.5em;
769
- margin: 2em 0 1em 0;
770
- text-align: left;
771
- }
772
-
773
- .example p {
774
- margin: 0;
775
- }
776
-
777
- .example .example-title {
778
- font-weight: 700;
779
- text-transform: uppercase;
780
- margin-top:0;
781
- }
570
+ @include exampleBlock(#e1eef1, black, 0.5em);
571
+ color: black;
782
572
 
573
+ padding-left: 0.5em;
574
+ .example-title {
575
+ margin-top: 0;
576
+ }
783
577
 
784
- .example pre, .example .pseudocode {
785
- background: none;
578
+ pre,
579
+ .pseudocode {
580
+ background: none;
581
+ }
786
582
  }
787
583
 
788
584
  /*
@@ -790,38 +586,24 @@ margin-top:0;
790
586
  */
791
587
 
792
588
  table {
793
- border-collapse: collapse;
794
- width: 100%;
795
- font-weight: 300;
796
- margin: 1em 0 2em 0;
797
- margin-left: auto;
798
- margin-right: auto;
799
- padding-right: 2em;
800
- text-align: center;
801
- }
802
-
803
- table, th, td {
804
- border: 1px solid black;
805
- font-size: 0.95em;
589
+ @include table(1px solid black);
590
+ text-align: center;
806
591
  }
807
592
 
808
- td, th {
809
- padding: 1em!important;
810
- }
811
-
812
- td.header {
813
- font-weight: 400;
593
+ td,
594
+ th {
595
+ padding: 1em !important;
814
596
  }
815
597
 
816
598
  p.TableTitle {
817
- text-align: center;
818
- margin-top: 2.5em;
819
- font-weight: 800;
820
- font-size: 1.1em;
599
+ text-align: center;
600
+ margin-top: 2.5em;
601
+ font-weight: 800;
602
+ font-size: 1.1em;
821
603
  }
822
604
 
823
605
  .TableFootnote {
824
- text-align: left!important;
606
+ text-align: left !important;
825
607
  }
826
608
 
827
609
  /*
@@ -829,16 +611,16 @@ font-size: 1.1em;
829
611
  */
830
612
 
831
613
  a.footnote-number, a.TableFootnoteRef, span.TableFootnoteRef {
832
- vertical-align: super;
833
- font-size: 0.8em;
614
+ vertical-align: super;
615
+ font-size: 0.8em;
834
616
  }
835
617
 
836
618
  .footnote {
837
- font-size: 0.9em;
619
+ font-size: 0.9em;
838
620
  }
839
621
 
840
- sup a {
841
- vertical-align: super;
622
+ sup a {
623
+ vertical-align: super;
842
624
  font-size: 0.8em;
843
625
  }
844
626
  #footnote_box {
@@ -854,7 +636,7 @@ sup a {
854
636
 
855
637
  ol.footnotes-list, aside.footnote {
856
638
  margin-left: 1em;
857
-
639
+
858
640
  }
859
641
 
860
642
  ol.footnotes-list li, aside.footnote {
@@ -882,34 +664,24 @@ ol > li > p:before {
882
664
  3.11 Blockquotes
883
665
  */
884
666
 
885
- .blockquote, .Quote {
886
- background-color: #f7f7f7;
887
- font-style: italic;
888
- width: 80%;
889
- padding: 1.5em;
890
- margin-top: 2em;
891
- margin-left: auto;
892
- margin-right: auto;
667
+ .Quote {
668
+ @include blockquoteBlock(#f7f7f7);
893
669
  }
894
670
 
895
-
896
671
  /*
897
672
  3.12 Formulas
898
673
  */
899
674
 
900
675
  .formula {
901
- background-color: #f7f7f7;
902
- padding: 1.5em;
903
- margin-top: 2em;
904
- text-align: center;
905
- margin-left: 20%;
906
- margin-right: 20%;
676
+ @include formulaBlock(#f7f7f7);
677
+ margin-left: 20%;
678
+ margin-right: 20%;
907
679
  }
908
680
 
909
681
  dl.formula_dl {
910
- background-color: #f7f7f7;
911
- margin-left: 20%;
912
- margin-right: 20%;
682
+ background-color: #f7f7f7;
683
+ margin-left: 20%;
684
+ margin-right: 20%;
913
685
  }
914
686
 
915
687
  /*
@@ -931,6 +703,3 @@ font-weight: 600;
931
703
  .Admonition p, .admonition p {
932
704
  margin: 0;
933
705
  }
934
-
935
-
936
-