metanorma-bipm 1.1.7 → 1.1.11

Sign up to get free protection for your applications and to get access to all the features.
@@ -549,9 +549,15 @@ ul li:before {
549
549
  ul li p {
550
550
  display: inline; }
551
551
 
552
- ul li:first-child {
552
+ ul > li:first-child {
553
553
  margin-top: 1em; }
554
554
 
555
+ ul ul > li:first-child {
556
+ margin-top: 0; }
557
+
558
+ ol ul > li:first-child {
559
+ margin-top: 0; }
560
+
555
561
  #toc-list ul {
556
562
  margin-bottom: 0.25em; }
557
563
 
@@ -239,10 +239,17 @@ ul li p {
239
239
  display: inline;
240
240
  }
241
241
 
242
- ul li:first-child {
242
+ ul > li:first-child {
243
243
  margin-top: 1em;
244
244
  }
245
245
 
246
+ ul ul > li:first-child {
247
+ margin-top: 0;
248
+ }
249
+ ol ul > li:first-child {
250
+ margin-top: 0;
251
+ }
252
+
246
253
  #toc-list ul {
247
254
  margin-bottom: 0.25em;
248
255
  }
@@ -6,7 +6,6 @@ require_relative "base_convert"
6
6
  module IsoDoc
7
7
  module BIPM
8
8
  class HtmlConvert < IsoDoc::Generic::HtmlConvert
9
-
10
9
  def middle(isoxml, out)
11
10
  super
12
11
  doccontrol isoxml, out
@@ -25,15 +24,16 @@ module IsoDoc
25
24
  def counter_reset(node)
26
25
  s = node["start"]
27
26
  return nil unless s && !s.empty? && !s.to_i.zero?
27
+
28
28
  "counter-reset: #{node['type']} #{s.to_i - 1};"
29
29
  end
30
30
 
31
31
  def ol_attrs(node)
32
32
  klass, style = if node["type"] == "roman" &&
33
- !node.at("./ancestor::xmlns:ol[@type = 'roman']") ||
33
+ !node.at("./ancestor::xmlns:ol[@type = 'roman']") ||
34
34
  node["type"] == "alphabet" &&
35
- !node.at("./ancestor::xmlns:ol[@type = 'alphabet']")
36
- [node["type"], counter_reset(node)]
35
+ !node.at("./ancestor::xmlns:ol[@type = 'alphabet']")
36
+ [node["type"], counter_reset(node)]
37
37
  end
38
38
  super.merge(attr_code(type: ol_style((node["type"] || "arabic").to_sym),
39
39
  start: node["start"]), style: style, class: klass)
@@ -44,4 +44,3 @@ module IsoDoc
44
44
  end
45
45
  end
46
46
  end
47
-