This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis-site.git
The following commit(s) were added to refs/heads/main by this push:
new 2254a510 Style and minor edition of developer guide.
2254a510 is described below
commit 2254a510069a4e51b6fd3e16b2da0474ed936675
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Fri May 20 00:17:56 2022 +0200
Style and minor edition of developer guide.
---
.../developer-guide/annexes/design/XMLTools.html | 19 ++++
.../developer-guide/coverage/AffineTransform.html | 4 +-
source/developer-guide/coverage/GridGeometry.html | 18 +++-
source/developer-guide/geometry/Envelope.html | 28 +++---
source/developer-guide/index.html | 2 +-
source/developer-guide/introduction/index.html | 2 +-
.../referencing/CoordinateOperationSteps.html | 6 +-
source/developer-guide/storage/index.html | 45 ---------
.../XML-ISO-19115.html => xml/ISO-19115.html} | 30 +-----
.../{storage/XML-ISO.html => xml/index.html} | 4 +-
source/fr/developer-guide/index.html | 4 +-
static/book/book.css | 103 ++++++---------------
12 files changed, 91 insertions(+), 174 deletions(-)
diff --git a/source/developer-guide/annexes/design/XMLTools.html
b/source/developer-guide/annexes/design/XMLTools.html
index a5b854a8..583f05fd 100644
--- a/source/developer-guide/annexes/design/XMLTools.html
+++ b/source/developer-guide/annexes/design/XMLTools.html
@@ -58,6 +58,25 @@
<i>Features</i> are an example, as their structure is dynamic.
</li>
</ul>
+
+ <h4 id="XML-SIS">Implementation strategy in Apache <abbr>SIS</abbr></h4>
+ <p>
+ <code>org.apache.sis.internal.jaxb.*</code> packages (non-public)
define <abbr>JAXB</abbr> adaptors for all types of <abbr>ISO</abbr> objects.
+ These adaptors are required anyway to allow <abbr>JAXB</abbr> to get
<abbr>SIS</abbr> classes while implementing GeoAPI interfaces.
+ Conveniently, <abbr>SIS</abbr> made both <abbr>JAXB</abbr> adaptors
and objects wrapping the “real” object to be read or written.
+ This double usage avoids having to double the number of classes
(already quite high) present in the internal packages.
+ </p>
+ <h4>Naming conventions in <abbr>XSD</abbr> schemas</h4>
+ <p>
+ For each element of the first group listed above, the <abbr>XSD</abbr>
schemas of the <abbr>OGC</abbr>
+ define a type whose name ends with “<code
class="OGC">_PropertyType</code>”.
+ For the second group, each element has a type whose name ends with
“<code class="OGC">_Type</code>”.
+ The “<code class="OGC">_PropertyType</code>” elements may have a group
of attributes
+ (such as <code>gco:uuidref</code> and <code>xlink:href</code>)
+ which the <abbr>XSD</abbr> schemas collectively name
<code>gco:ObjectIdentification</code>.
+ These attributes do not have dedicated Java methods, but are
accessible indirectly via the
+ <code class="SIS">IdentifiedObject</code> interface described in the
following subsection.
+ </p>
</section>
</body>
</html>
diff --git a/source/developer-guide/coverage/AffineTransform.html
b/source/developer-guide/coverage/AffineTransform.html
index 764e6229..a7377802 100644
--- a/source/developer-guide/coverage/AffineTransform.html
+++ b/source/developer-guide/coverage/AffineTransform.html
@@ -55,7 +55,7 @@
<p>
Affine transforms can be concatenated efficiently.
No matter how many affine transforms are chained, the result can be
represented by a single affine transform.
- Affine transforms are extensively used by Apache <abbr>SIS</abbr> for
“pixel to geographic or projected coordinate” conversions.
+ Affine transforms are extensively used by Apache <abbr>SIS</abbr> for
“grid to <abbr>CRS</abbr>” conversions.
Given an image with pixel coordinates represented by
(<var>x</var>,<var>y</var>) tuples and given the following assumptions:
</p>
<ul>
@@ -120,7 +120,7 @@
</p>
<div class="warning">
- This section is incomplete.
+ This section is incomplete. See Javadoc for more details.
</div>
</section>
</body>
diff --git a/source/developer-guide/coverage/GridGeometry.html
b/source/developer-guide/coverage/GridGeometry.html
index 92f17f86..6bff1785 100644
--- a/source/developer-guide/coverage/GridGeometry.html
+++ b/source/developer-guide/coverage/GridGeometry.html
@@ -38,10 +38,22 @@
<p>
The domain of a coverage is the set of valid input values.
In Apache <abbr>SIS</abbr>, the domain of grid coverages is described
by the <code>GridGeometry</code> class.
+ This class contains the following information:
+ </p>
+ <ul>
+ <li>A grid extent (a.k.a. <dfn>grid envelope</dfn>), often inferred
from the image size in pixels.</li>
+ <li>A <dfn>grid to <abbr>CRS</abbr></dfn> conversion, typically as a
scale followed by a translation.</li>
+ <li>A georeferenced envelope, which can be inferred from the grid
extent and the <dfn>grid to <abbr>CRS</abbr></dfn> conversion.</li>
+ <li>A Coordinate Reference System (<abbr>CRS</abbr>) which is the
target of the <dfn>grid to CRS</dfn> conversion.</li>
+ <li>An <em>estimation</em> of grid resolution along each
<abbr>CRS</abbr> axes.</li>
+ <li>An indication of whether conversion for some axes is linear or
not.</li>
+ </ul>
+ <p>
+ One of the most important property listed above is the <dfn>grid to
<abbr>CRS</abbr></dfn> conversion,
+ which defines how to map pixel coordinates to "real world" coordinates
such as latitudes and longitudes.
+ This relationship is often linear (an affine transform), but not
necessarily;
+ <code>GridGeometry</code> accepts non-linear conversions as well.
</p>
- <div class="warning">
- This section is incomplete. See Javadoc for more details.
- </div>
<xi:include href="AffineTransform.html"/>
</section>
diff --git a/source/developer-guide/geometry/Envelope.html
b/source/developer-guide/geometry/Envelope.html
index df851109..27535920 100644
--- a/source/developer-guide/geometry/Envelope.html
+++ b/source/developer-guide/geometry/Envelope.html
@@ -69,8 +69,8 @@
<p>
Minimums and maximums are the values most often assigned to <code
class="OGC">lowerCorner</code>
and <code class="OGC">upperCorner</code>.
- But the situation becomes complicated when an envelope crosses the
antimeridian (-180° or 180° longitude).
- For example, an envelope 10° in size may begin at 175° longitude and
end at -175°.
+ But the situation becomes complicated when an envelope crosses the
antimeridian (−180° or 180° longitude).
+ For example, an envelope 10° in size may begin at 175° longitude and
end at −175°.
In this case, the longitude value assigned to <code
class="OGC">lowerCorner</code> is greater than that assigned to <code
class="OGC">upperCorner</code>.
Apache <abbr>SIS</abbr> therefore uses a slightly different definition
of these two corners:
</p>
@@ -96,18 +96,18 @@
alt="Envelope example with and without anti-meridian spanning."/>
</p>
<p>
- The notions of inclusion and intersection, however, interpreted
slightly differently in these two cases.
- In the usual case where we do not cross the antimeridian, the green
rectangle covers a region of inclusion.
+ The notions of inclusion and intersection, however, are interpreted
slightly differently in these two cases.
+ In the usual case where the envelope does not cross the antimeridian,
the green rectangle covers a region of inclusion.
The regions excluded from this rectangle continue on to infinity in
all directions.
In other words, the region of inclusion is not repeated every 360°.
But in the case of the red rectangle, the information provided by the
envelope actually covers a region of exclusion
between the two edges of the rectangle. The region of inclusion
extends to infinity to the left and right.
- We could stipulate that all longitudes below -180° or above 180° are
considered excluded,
+ We could stipulate that all longitudes below −180° or above 180° are
considered excluded,
but this would be an arbitrary decision that would not be an exact
counterpart to the usual case (green rectangle).
A developer may wish to use these values, for example, in a mosaic
where the map of the world is repeated several times
horizontally and each repetition is considered distinct.
If developers wish to perform operations as though the regions of
inclusion or exclusion were repeated every 360°,
- they themselves will have to bring the longitudinal values between
-180° and 180° in advance.
+ they themselves will have to bring the longitudinal values between
−180° and 180° in advance.
All the <code class="SIS">add(…)</code>, <code
class="SIS">contains(…)</code>,
<code class="SIS">intersect(…)</code>, etc. functions of all the
envelopes defined in the
<code>org.apache.sis.geometry</code> package perform their
calculations according to this convention.
@@ -125,33 +125,33 @@
the same treatment as does longitude.
For example, this could be a time axis for climatological data (one
“year” represents the average temperature in all the
months of January, followed by the average of all the months of
February, etc.)
- This generalization also applies to longitude axes defined by a
range of 0° to 360° rather than -180° to 180°.
+ This generalization also applies to longitude axes defined by a
range of 0° to 360° rather than −180° to 180°.
</p>
</aside>
<p>
In order for functions such as <code class="SIS">add(…)</code> to work
correctly,
all objects involved must use the same coordinate reference system,
including the same range of values.
- Thus an envelope that expresses longitudes in the range [-180 … +180]°
is not compatible with an envelope that expresses
+ Thus an envelope that expresses longitudes in the range [−180 … +180]°
is not compatible with an envelope that expresses
longitudes in the range [0 … 360]°.
The conversions, if necessary, are up to the user
(the <code>Envelopes</code> class provides convenience methods to do
this).
Moreover, the envelope’s coordinates must be included within the
system of coordinates,
- unless the developer explicitly decides to consider (for example) 300°
longitude as a position distinct from -60°.
+ unless the developer explicitly decides to consider (for example) 300°
longitude as a position distinct from −60°.
The <code>GeneralEnvelope</code> class provides a <code
class="SIS">normalize()</code> method to bring
coordinates within the desired limits, sometimes at the cost of
<var>lower</var> values being higher than
<var>upper</var> values.
</p>
<aside>
- <h5>The special case of [+0 … -0] range</h5>
+ <h5>The special case of [+0 … −0] range</h5>
<p>
Java (or more generally, IEEE Standard 754) defines two zero values:
a positive zero and a negative zero. These two values are considered
equal when we compare them with the <code>==</code> operator in Java.
But in <abbr>SIS</abbr> envelopes, they may actually return opposite
results for axes using <code>RangeMeaning.WRAPAROUND</code>.
- An envelope whose range is [0 … 0], [-0 … -0] or [-0 … +0] would
normally be considered an empty envelope,
- but the [+0 … -0] range would in fact be considered to include the
entire set of values all around the world.
+ An envelope whose range is [0 … 0], [−0 … −0] or [−0 … +0] would
normally be considered an empty envelope,
+ but the [+0 … −0] range would in fact be considered to include the
entire set of values all around the world.
This behaviour conforms to the definition of <code
class="SIS">lowerCorner</code> and <code class="SIS">upperCorner</code>,
- which considers +0 as the starting point, and -0 as the end-point
after cycling through all possible values.
- Such behaviour only occurs for the pair of values +0 and -0, and
only in that order.
+ which considers +0 as the starting point, and −0 as the end-point
after cycling through all possible values.
+ Such behaviour only occurs for the pair of values +0 and −0, and
only in that order.
For all other real values, if the condition <code>lower</code>
<code>==</code> <code>upper</code> is true,
then it is guaranteed that the envelope is empty.
</p>
diff --git a/source/developer-guide/index.html
b/source/developer-guide/index.html
index e911f09f..25574025 100644
--- a/source/developer-guide/index.html
+++ b/source/developer-guide/index.html
@@ -45,7 +45,7 @@
<xi:include href="geometry/index.html"/>
<xi:include href="referencing/index.html"/>
<xi:include href="metadata/index.html"/>
- <xi:include href="storage/index.html"/>
+ <xi:include href="xml/index.html"/>
<xi:include href="utility/index.html"/>
<xi:include href="annexes/index.html"/>
</main>
diff --git a/source/developer-guide/introduction/index.html
b/source/developer-guide/introduction/index.html
index 0563bfbd..4e9473e7 100644
--- a/source/developer-guide/introduction/index.html
+++ b/source/developer-guide/introduction/index.html
@@ -55,7 +55,7 @@
</p><p>
While Apache <abbr>SIS</abbr> is primarily a library for helping
developers to create their own applications,
<abbr>SIS</abbr> provides also an optional JavaFX application for
testing its capability to read, transform and visualize data files.
- Screenshots of this application are used in this document for
illustrative purposes.
+ Screenshots of this application may be used in this document for
illustrative purposes.
</p><p>
<b>Note:</b> this document contains mathematical formulas expressed in
MathML.
For viewing those formulas, a MathML-capable browser (e.g. Firefox) is
required.
diff --git a/source/developer-guide/referencing/CoordinateOperationSteps.html
b/source/developer-guide/referencing/CoordinateOperationSteps.html
index 6aa634b1..6c50d515 100644
--- a/source/developer-guide/referencing/CoordinateOperationSteps.html
+++ b/source/developer-guide/referencing/CoordinateOperationSteps.html
@@ -66,7 +66,7 @@
<ol>
<li><b>Geocentric translation</b> in <em>geographic</em> domain
<ul>
- <li>X-axis translation = -10 m</li>
+ <li>X-axis translation = −10 m</li>
<li>Y-axis translation = 158 m</li>
<li>Z-axis translation = 187 m</li>
</ul>
@@ -86,7 +86,7 @@
</ul>
</li><li><b>Geocentric translation</b>
<ul>
- <li>X-axis translation = -10 m</li>
+ <li>X-axis translation = −10 m</li>
<li>Y-axis translation = 158 m</li>
<li>Z-axis translation = 187 m</li>
</ul>
@@ -115,7 +115,7 @@
</li><li><b>Affine parametric transformation</b>
<ul>
<li>Scale factors ≈ 1.00001088</li>
- <li>X-axis translation ≈ -1.568 E-6</li>
+ <li>X-axis translation ≈ −1.568 E-6</li>
<li>Y-axis translation ≈ 24.772 E-6</li>
<li>Z-axis translation ≈ 29.319 E-6</li>
</ul>
diff --git a/source/developer-guide/storage/index.html
b/source/developer-guide/storage/index.html
deleted file mode 100644
index 5c5cff4c..00000000
--- a/source/developer-guide/storage/index.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:xi="http://www.w3.org/2001/XInclude"; xml:lang="en">
- <head>
- <title>Formats</title>
- <meta charset="UTF-8"/>
- <link rel="stylesheet" type="text/css" href="../book.css"/>
- </head>
- <body>
- <!--
- Content below this point is copied in
"/asf-staging/book/en/developer-guide.html" file
- by the `org.apache.sis.internal.book.Assembler` class in
`sis-build-helper` module.
- -->
- <section>
- <header>
- <h1 id="Formats">Data storage formats</h1>
- </header>
- <p>
- Apache SIS can read and write spatial data and associated metadata in
different formats.
- </p>
-
- <xi:include href="XML-ISO.html"/>
- </section>
- </body>
-</html>
diff --git a/source/developer-guide/storage/XML-ISO-19115.html
b/source/developer-guide/xml/ISO-19115.html
similarity index 84%
rename from source/developer-guide/storage/XML-ISO-19115.html
rename to source/developer-guide/xml/ISO-19115.html
index 7b12e621..742ebf71 100644
--- a/source/developer-guide/storage/XML-ISO-19115.html
+++ b/source/developer-guide/xml/ISO-19115.html
@@ -33,7 +33,7 @@
-->
<section>
<header>
- <h3 id="XML-ISO-19115">Representing metadata according to
<abbr>ISO</abbr> 19115-3</h3>
+ <h2 id="XML-ISO-19115"><abbr>ISO</abbr> 19115-3 metadata</h2>
</header>
<p>
For each metadata class, there is an <abbr>XML</abbr> type with the
same name than in the abstract specification
@@ -109,34 +109,10 @@
In order to reduce the complexity of the libraries, GeoAPI and Apache
<abbr>SIS</abbr>
only expose publicly a single unified view of these two types of
elements.
The public <abbr>API</abbr> basically corresponds to the second group.
- However, when writing an <abbr>XML</abbr> document, elements of the
first group must be temporarily recreated.
- The corresponding classes are defined in internal <abbr>SIS</abbr>
packages.
- These classes may be ignored, unless the developer wishes to implement
his or her own classes whose instances must be written in <abbr>JAXB</abbr>.
</p>
- <aside id="XML-SIS">
- <h3>Implementation strategy in Apache <abbr>SIS</abbr></h3>
- <p>
- <code>org.apache.sis.internal.jaxb.*</code> packages (non-public)
define <abbr>JAXB</abbr> adaptors for all types of <abbr>ISO</abbr> objects.
- These adaptors are required anyway to allow <abbr>JAXB</abbr> to get
<abbr>SIS</abbr> classes while implementing GeoAPI interfaces.
- Conveniently, <abbr>SIS</abbr> made both <abbr>JAXB</abbr> adaptors
and objects wrapping the “real” object to be read or written.
- This double usage avoids having to double the number of classes
(already quite high) present in the internal packages.
- </p>
- <h4>Naming conventions in <abbr>XSD</abbr> schemas</h4>
- <p>
- For each element of the first group listed above, the
<abbr>XSD</abbr> schemas of the <abbr>OGC</abbr>
- define a type whose name ends with “<code
class="OGC">_PropertyType</code>”.
- For the second group, each element has a type whose name ends with
“<code class="OGC">_Type</code>”.
- The “<code class="OGC">_PropertyType</code>” elements may have a
group of attributes
- (such as <code>gco:uuidref</code> and <code>xlink:href</code>)
- which the <abbr>XSD</abbr> schemas collectively name
<code>gco:ObjectIdentification</code>.
- These attributes do not have dedicated Java methods, but are
accessible indirectly via the
- <code class="SIS">IdentifiedObject</code> interface described in the
following subsection.
- </p>
- </aside>
-
- <h4 id="gco-id">Identification of already-defined instances</h4>
+ <h3 id="gco-id">Links to previously-defined instances</h3>
<p>
The parent element may contain an <code class="OGC">id</code> or <code
class="OGC">uuid</code> attribute.
If one of these attributes is present, the parent attribute may be
completely omitted;
@@ -215,7 +191,7 @@ public class MyClass {
- <h4 id="nilReason">Representing missing values</h4>
+ <h3 id="nilReason">Placeholders for missing values</h3>
<p>
When a property is not defined, the corresponding GeoAPI method
usually returns <code>null</code>.
However, things become complicated when the missing property is a
value considered mandatory by <abbr>ISO</abbr> 19115 standard.
diff --git a/source/developer-guide/storage/XML-ISO.html
b/source/developer-guide/xml/index.html
similarity index 96%
rename from source/developer-guide/storage/XML-ISO.html
rename to source/developer-guide/xml/index.html
index 39b50be3..48233dbe 100644
--- a/source/developer-guide/storage/XML-ISO.html
+++ b/source/developer-guide/xml/index.html
@@ -33,7 +33,7 @@
-->
<section>
<header>
- <h2 id="XML-ISO">Representing objects in <abbr>XML</abbr></h2>
+ <h1 id="XML-ISO"><abbr>XML</abbr> representation of <abbr>ISO</abbr>
objects</h1>
</header>
<p>
Different <abbr>OGC</abbr>/<abbr>ISO</abbr> standards do not always
use the same strategy to express objects in <abbr>XML</abbr>.
@@ -85,7 +85,7 @@
<td><code>http://www.w3.org/1999/xlink</code></td>
</tr>
</table>
- <xi:include href="XML-ISO-19115.html"/>
+ <xi:include href="ISO-19115.html"/>
</section>
</body>
</html>
diff --git a/source/fr/developer-guide/index.html
b/source/fr/developer-guide/index.html
index db409317..c66af514 100644
--- a/source/fr/developer-guide/index.html
+++ b/source/fr/developer-guide/index.html
@@ -40,10 +40,10 @@
<p style="margin-top:30pt; font-size:30pt; font-weight:900;
text-align:center">
Introduction à Apache SIS™
</p>
- <div class="warning">
+ <div class="warning" style="position:sticky; top:0; font-size:18px;
padding:32px; border-width:3px">
Cette page est une traduction de la version anglaise du guide.
Cette traduction n’est pas maintenue et peut être obsolète.
- Pour des informations plus à jour, voir la version anglaise.
+ Pour des informations plus à jour, voir la <a
href="../en/developer-guide.html">version anglaise</a>.
</div>
<xi:include href="introduction/index.html"/>
<xi:include href="overview/DataAccess.html"/>
diff --git a/static/book/book.css b/static/book/book.css
index 1d03454c..d2d61bfc 100644
--- a/static/book/book.css
+++ b/static/book/book.css
@@ -26,13 +26,15 @@ nav {
}
main {
- position: fixed;
- left: 450px;
- top: 0;
- right: 0;
- bottom: 0;
- overflow: auto;
- font-size: 18px;
+ position: fixed;
+ left: 450px;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ overflow: auto;
+ padding-left: 42px;
+ padding-right: 30px;
+ font-size: 18px;
/*
* Firefox has a monospace font size different than the proportional font
size.
* By setting a font size in the main block, we force the same size for both
fonts.
@@ -42,16 +44,16 @@ main {
}
nav a {
- display: block;
+ display: block;
text-decoration: none;
- font-family: sans-serif;
- color: #5d6d7e;
- transition: all 50ms ease-in-out;
+ font-family: sans-serif;
+ color: #5d6d7e;
+ transition: all 50ms ease-in-out;
}
nav a:focus,
nav a:hover {
- color: #154360;
+ color: #154360;
text-decoration: underline;
}
@@ -79,32 +81,9 @@ nav li.active > a {
font-weight: bolder;
}
-/*
- * For the main body, we put a margin for almost everything except the
elements to be centered.
- */
-section > header > h1,
-section > header > h2,
-section > header > h3,
-section > h3,
-section > h4,
-section > h5,
-section > p,
-section > nav > p,
-section > pre,
-section > div.example,
-section > details {
- margin-left: 42px;
- margin-right: 30px;
-}
-
-li > p,
-section > ul {
- margin-right: 30px;
-}
-
-section > div.example,
-section > article,
-section > aside {
+div.example,
+article,
+aside {
margin-left: 80px;
margin-right: 68px;
}
@@ -115,11 +94,10 @@ dd > div.example {
margin-right: 60px;
}
-main nav ul.toc,
section > ul,
section > ol,
section > dl {
- margin-left: 42px;
+ margin-left: 30px;
}
/*
@@ -130,61 +108,38 @@ ul.verbose li {
margin-bottom: 9px;
}
-/*
- * Links to previous and next chapters.
- */
-div.chapter-links {
- width: 100%;
- background-color: #CCDFFF;
- border-bottom-color: #0077B3;
- border-bottom-style: solid;
- border-bottom-width: 1px;
- margin-top: 0px;
- padding-top: 6px;
- margin-bottom: 18px;
- padding-bottom: 24px;
- white-space: nowrap;
-}
-
-div.previous-chapter {
- width: 50%;
- float: left;
-}
-
-div.next-chapter {
- width: 50%;
- float: right;
- text-align: right;
-}
-
/*
* Chapters and sections titles (excluding the book titles).
*/
+section > h1,
section > header > h1 {
font-family: sans-serif;
- margin-top: 160px;
+ margin-top: 200px;
border-bottom-style: solid;
border-bottom-width: 3px;
padding-top: 6px;
- padding-bottom: 0px;
+ padding-bottom: 6px;
margin-bottom: 0px;
}
+section > h2,
section > header > h2 {
font-family: sans-serif;
- margin-top: 60px;
+ margin-top: 160px;
border-bottom-style: solid;
border-bottom-width: 2px;
}
-section > h3 {
+section > h3,
+section > header > h3 {
font-family: sans-serif;
- margin-top: 50px;
+ margin-top: 100px;
}
-section > h4 {
+section > h4,
+section > header > h4 {
font-family: sans-serif;
- margin-top: 30px;
+ margin-top: 60px;
}
span.section-number {
