Commit 3e869226 authored by Eva Huet's avatar Eva Huet
Browse files

ajustements planches

parent 7a222ede

resources/styles/landingpage.css

+72 −17
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ body.dark .landingPage .left-contents h1:not(div.boxed-text *) { 


.landingPage section.front ol,

.landingPage section.front ol {

    padding-left: 25px;

    padding-left: 5px;

}



.landingPage .front > .button-tabs {
@@ -373,7 +373,6 @@ body.dark .landingPage .tab-btn:hover { 
.landingPage section.body p:not(div.boxed-text *, .caption, .credits, .stage, details *, .front-matter *) {

    font-size: 1.0625rem;

    line-height: 1.7;

    margin-top: var(--spacing-md);

    color: var(--text-primary);

    text-align: justify;

    hyphens: auto;
@@ -557,7 +556,10 @@ body.dark .landingPage .caption { 
    padding-top: var(--spacing-xl);

}



.landingPage div[id='figures'] figure + figure {

.landingPage div[id='figures'] figure + figure,

.landingPage div[id='figures'] div.planche + figure,

.landingPage div[id='figures'] figure + div.planche,

.landingPage div[id='figures'] div.planche + div.planche {

    border-top: 4px solid #e2e8f0;

    border-radius: 0px;

    margin-top: var(--spacing-md);
@@ -568,11 +570,24 @@ body.dark .landingPage .caption { 
    padding-top: var(--spacing-xl);

    display: flex;

    flex-direction: column;

    align-items: center;

    justify-content: center;

    min-height: 70px;

}



.landingPage div.planche-figures {

    margin: var(--spacing-md) 0;

    padding: var(--spacing-md);

    background-color: white;

    border-radius: 12px;

    border: 1px solid #e2e8f0;

    display: flex;

    flex-direction: column;

    min-height: 70px;

}



.landingPage div[id='figures'] div.planche figure {

    padding-top: 2rem;

    padding-bottom: 0;

}

.landingPage img {

    width: 100%;

    padding-bottom: 5px;
@@ -693,6 +708,7 @@ body.dark .landingPage th { 
    cursor: pointer;

    margin-bottom: 5px;

    line-height: 1.5;

    font-weight: bold;

}



.landingPage .expand {
@@ -711,17 +727,23 @@ body.dark .landingPage th { 


.landingPage figure .credits,

.landingPage figure .caption {

    margin-top: 8px;

    margin-top: 7px;

    margin-right: 5px;

    margin-bottom: 5px;

    margin-bottom: 3px;

    margin-left: 8px;

    align-self: flex-start;

    line-height: 1.5;

    line-height: 1.4;

    color: var(--text-primary);

    text-align: justify;

    hyphens: auto;

    word-wrap: break-word;

}

.landingPage figure[role='group'] figure .credits,

.landingPage figure[role='group'] figure .caption {

    font-size: 75%;

    text-align: right;

    line-height: 1rem;

}



.landingPage label {

    margin-bottom: 15px;
@@ -731,14 +753,17 @@ body.dark .landingPage th { 
.landingPage .credits-right-panel {

    text-align: left;

    align-self: flex-start;

    line-height: 1.4;

    margin-top: 10px;

    line-height: 1.35;

    margin-top: 4.5px;

    font-size: 0.85rem;

}



.landingPage div[id*="figures"] figure figcaption {

    text-align: left;

.landingPage div.planche-figures figure p.caption-right-panel,

.landingPage div.planche-figures figure p.credits-right-panel {

    text-align: right;

    align-self: flex-start;

    font-size: 75%;

    line-height: 0.8rem

}



.landingPage .label-right-panel {
@@ -754,6 +779,24 @@ body.dark .landingPage th { 
    margin-top: 5px;

}



.landingPage div.planche {

    margin-left: var(--spacing-md);

    margin-bottom: var(--spacing-xl);

}



.landingPage .left-contents figure header h1:not(div.boxed-text *) {

    margin-bottom: 0;

    padding-bottom: 0;

}



.landingPage figure > figure + figure {

    margin-top: 0em;

} 



.landingPage section.body figure[role="group"] figure + p:not(div.boxed-text *, .caption, .credits, .stage, details *, .front-matter *) {

    margin-top : -1em;

}



.landingPage section.body {

    counter-reset: section;

}
@@ -860,13 +903,24 @@ body.dark .landingPage th { 


.landingPage .right-contents #refs ul {

    list-style: none;

    margin-left: -1rem;

}



.landingPage .right-contents #refs li {

    margin-left: 1.5em;

    margin-bottom: var(--spacing-md);

    margin-left: 0.1em;

    text-indent: -1em;

    font-size: 0.9375rem;

    margin-bottom: 0.2rem;

    line-height: 1.6;

    padding-left: 2.8em;

    padding-right: var(--spacing-md);

    padding-top: 0.6rem;

    padding-bottom: 0.6rem;

    background-color: #fafaf9;

    border-left: 3px solid transparent;

    border-radius: 8px;

    transition: all var(--transition-base);

    box-sizing: border-box;

}



.landingPage .right-contents #refs h3 {
@@ -979,7 +1033,8 @@ body.dark .landingPage #toc a.active { 
    font-size: .60em;

}



.landingPage span[class*="fn-call"] {

.landingPage span[class*="fn-call"],

.landingPage span[class*="bib-ref-call"] {

    color: var(--primary-color);

    cursor: pointer;

    transition: color var(--transition-fast);
@@ -1035,9 +1090,9 @@ body.dark .landingPage div[id^="footnotes"] li { 
.landingPage div[id^="footnotes"] li.focus,

.landingPage #refs .ref.focus,

.landingPage #refs li.bibl.focus {

    border-left-color: var(--primary-color);

    background-color: rgba(26, 84, 144, 0.05);

    border-left-color: var(--primary-color);

    margin-left: 0.5em;

}



body.dark .landingPage div[id^="footnotes"] li.focus {
@@ -1954,7 +2009,7 @@ body.dark .landingPage .linked_data .data-citation:hover { 
}



.landingPage #refs li.bibl {

    padding: var(--spacing-sm) var(--spacing-md);

    padding: var(--spacing-sm) 1.5rem;

    border-left: 3px solid transparent;

    border-right: 5px solid transparent;

    border-radius: 8px;

resources/styles/xml_2_html.css

+82 −34
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
    --spacing-md: 1.2rem;

    --spacing-lg: 2rem;

    --spacing-xl: 3rem;

    --spacing-xxl: 4rem;



    --font-sans: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,

        "Helvetica Neue", Arial, sans-serif;
@@ -342,7 +343,6 @@ body.dark .tab-btn:hover { 
section.body p:not(div.boxed-text *, .caption, .credits, .stage, details *, .front-matter *) {

    font-size: 1.0625rem;

    line-height: 1.7;

    margin-top: var(--spacing-md);

    color: var(--text-primary);

    text-align: justify;

    hyphens: auto;
@@ -369,7 +369,7 @@ body.dark section.body p:not(div.boxed-text *, .caption, .credits, details *) { 
    font-family: var(--font-serif);

    font-size: 1.875rem;

    font-weight: 700;

    margin-top: 10px;

    margin-top: -40px;

    margin-bottom: 10px;

    color: var(--text-primary);

    letter-spacing: -0.01em;
@@ -424,7 +424,7 @@ section.body h6 { 
}



section.body p.firstPara:not(div.boxed-text *, details *) {

    margin-top: var(--spacing-xl);

    margin-top: var(--spacing-xxl);

}



figure {
@@ -526,7 +526,10 @@ div[id='figures'] figure { 
    padding-top: var(--spacing-xl);

}



div[id='figures'] figure + figure {

div[id='figures'] figure + figure,

div[id='figures'] div.planche + figure,

div[id='figures'] figure + div.planche,

div[id='figures'] div.planche + div.planche {

    border-top: 4px solid #e2e8f0;

    border-radius: 0px;

    margin-top: var(--spacing-md);
@@ -537,11 +540,25 @@ div[id='figures'] figure + figure { 
    padding-top: var(--spacing-xl);

    display: flex;

    flex-direction: column;

    align-items: center;

    justify-content: center;

    min-height: 70px;

}



div.planche-figures {

    margin: var(--spacing-md) 0;

    padding: var(--spacing-md);

    background-color: white;

    border-radius: 12px;

    border: 1px solid #e2e8f0;

    display: flex;

    flex-direction: column;

    min-height: 70px;

}



div[id='figures'] div.planche figure {

    padding-top: 2rem;

    padding-bottom: 0;

}



img {

    width: 100%;

    padding-bottom: 5px;
@@ -662,6 +679,7 @@ table.lg td { 
    cursor: pointer;

    margin-bottom: 5px;

    line-height: 1.5;

    font-weight: bold;

}



.expand {
@@ -680,18 +698,29 @@ span[class='expand empty'] { 


figure .credits,

figure .caption {

    margin-top: 8px;

    margin-top: 7px;

    margin-right: 5px;

    margin-bottom: 5px;

    margin-bottom: 3px;

    margin-left: 8px;

    align-self: flex-start;

    line-height: 1.5;

    line-height: 1.4;

    color: var(--text-primary);

    text-align: justify;

    hyphens: auto;

    word-wrap: break-word;

}



figure[role='group'] figure .credits,

figure[role='group'] figure .caption {

    font-size: 75%;

    text-align: right;

    line-height: 1rem;

}



section.body figure[role='group'] p[id] {

    font-size: 98%;

}



label {

    margin-bottom: 15px;

}
@@ -700,14 +729,17 @@ label { 
.credits-right-panel {

    text-align: left;

    align-self: flex-start;

    line-height: 1.4;

    margin-top: 10px;

    line-height: 1.35;

    margin-top: 4.5px;

    font-size: 0.85rem;

}



div[id*="figures"] figure figcaption {

    text-align: left;

div.planche-figures figure p.caption-right-panel,

div.planche-figures figure p.credits-right-panel {

    text-align: right;

    align-self: flex-start;

    font-size: 65%;

    line-height: 0.8rem

}



.label-right-panel {
@@ -723,6 +755,24 @@ div[id*="figures"] figure figcaption { 
    margin-top: 5px;

}



div.planche {

    margin-left: var(--spacing-md);

    margin-bottom: var(--spacing-xl);

}



.left-contents figure header h1:not(div.boxed-text *) {

    margin-bottom: 0;

    padding-bottom: 0;

}



figure > figure + figure {

    margin-top: 0em;

} 



section.body figure[role="group"] figure + p:not(div.boxed-text *, .caption, .credits, .stage, details *, .front-matter *) {

    margin-top : -1em;

}



section.body {

    counter-reset: section;

}
@@ -830,11 +880,20 @@ bodyInclusion p.firstPara:not(div.boxed-text *) { 
}



.right-contents #refs li {

    margin-left: 1.5em;

    margin-left: 0.1em;

    text-indent: -1.5em;

    margin-bottom: var(--spacing-md);

    font-size: 0.9375rem;

    margin-bottom: 0.2rem;

    line-height: 1.6;

    padding-left: 2.8em;

    padding-right: var(--spacing-md);

    padding-top: 0.6rem;

    padding-bottom: 0.6rem;

    background-color: #fafaf9;

    border-left: 3px solid transparent;

    border-radius: 8px;

    transition: all var(--transition-base);

    box-sizing: border-box;

}



.right-contents #refs h3 {
@@ -860,8 +919,7 @@ body.dark .right-contents #refs h3 { 
    font-size: 90%;

}



section.review p.bibl-cr {

    margin-bottom: 50px;

p.bibl-cr {

    margin-left: 30px;

}
@@ -946,7 +1004,8 @@ sub { 
    font-size: .60em;

}



span[class*="fn-call"] {

span[class*="fn-call"],

span[class*="bib-ref-call"] {

    color: var(--primary-color);

    cursor: pointer;

    transition: color var(--transition-fast);
@@ -999,13 +1058,15 @@ body.dark div[id^="footnotes"] li { 
    background-color: var(--dark-bg-secondary);

}



div[id^="footnotes"] li.focus, #refs .ref.focus {

div[id^="footnotes"] li.focus, 

.right-contents #refs li.focus, 

#refs .ref.focus {

    border-left-color: var(--primary-color);

    background-color: rgba(26, 84, 144, 0.05);

    border-right: 5px solid var(--third-color);

}



body.dark div[id^="footnotes"] li.focus {

body.dark div[id^="footnotes"] li.focus,

body.dark div[id^="refs"] li.focus {

    border-left-color: var(--accent-color);

    background-color: rgba(14, 165, 233, 0.08);

}
@@ -1431,16 +1492,3 @@ pre { 
code {

    font-size: 0.9rem;

}
 


.left-contents figure header h1:not(div.boxed-text *) {

    margin-bottom: 0;

    padding-bottom: 0;

}



figure > figure + figure {

    margin-top: 0em;

} 



section.body figure[role="group"] figure + p:not(div.boxed-text *, .caption, .credits, .stage, details *, .front-matter *) {

    margin-top : -1em;

}

xsl/jats/jats2html.xsl

+29 −7
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ 
            </div>



            <div id="figures" class="content-tab" style="display:none">

                <xsl:for-each select="../body//fig">

                <xsl:for-each select="../body//fig[not(ancestor::fig-group)] | ../body//fig-group">

                        <xsl:apply-templates select="." mode="right-panel"/>

                </xsl:for-each>

            </div>
@@ -1124,8 +1124,12 @@ 
            </xsl:attribute>

            <xsl:apply-templates select=".//title" mode="right-panel"/>

            <xsl:apply-templates select="graphic" mode="right-panel"/>

            <xsl:if test=".//caption/p[@content-type='caption'] or attrib">

                <figcaption>

                    <xsl:apply-templates select=".//p[@content-type='caption']" mode="right-panel"/>

                    <xsl:apply-templates select="attrib" mode="right-panel"/>            

                </figcaption>

            </xsl:if>

        </figure>

    </xsl:template>
@@ -1146,13 +1150,17 @@ 
            </span>

            <xsl:apply-templates select="caption/title"/>

            <xsl:apply-templates select="graphic"/>

            <xsl:if test="caption/p[@content-type='caption'] or attrib">

                <figcaption>

                    <xsl:apply-templates select="caption/p[@content-type='caption']"/>

                    <xsl:apply-templates select="attrib"/>

                </figcaption>

            </xsl:if>

            <xsl:apply-templates select="xref[@specific-use='long-desc']"/>

        </figure>

    </xsl:template>



    <xsl:template match="fig//title" mode="right-panel">

    <xsl:template match="fig//title | fig-group/caption/title" mode="right-panel">

        <label class="label-right-panel">

            <xsl:apply-templates/>

        </label>
@@ -1228,7 +1236,7 @@ 
        </p>

    </xsl:template>



    <xsl:template match="fig/attrib" mode="right-panel">

    <xsl:template match="fig/attrib | fig-group/caption/p[@content-type='credits']" mode="right-panel">

        <p class="credits-right-panel">

            <xsl:apply-templates/>

        </p>
@@ -1292,6 +1300,20 @@ 
        </figure>

    </xsl:template>

    

    <xsl:template match="fig-group" mode="right-panel">

        <div class="planche">

            <xsl:apply-templates select="caption/title" mode="right-panel"/>

            <div class="planche-figures">

                <xsl:apply-templates select="child::fig" mode="right-panel"/>

            </div>

            <xsl:if test="child::caption/p[@content-type='caption' or @content-type='credits']">

                <figcaption>

                    <xsl:apply-templates select="child::caption/p[@content-type='caption' or @content-type='credits']" mode="right-panel"/>

                </figcaption>

            </xsl:if>

        </div>

    </xsl:template>



    <xsl:template match="app[starts-with(@id,'long-desc')]//title[normalize-space() = '']"/>



    <xsl:template match="app[starts-with(@id,'long-desc')]/sec[1]/p[1][preceding-sibling::*[1][self::title[not(node())]]]">

xsl/tei/03-tei2html_core.xsl

+17 −3
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ 


            <div id="figures" class="content-tab" style="display:none">

                <xsl:for-each

                        select="..//tei:figure[not(child::tei:table) and not(child::tei:formula) and not(child::tei:figure)]">

                        select="..//tei:figure[not(child::tei:table) and not(child::tei:formula) and not(parent::tei:figure[not(child::tei:table)])]">

                    <xsl:apply-templates select="." mode="panel"/>

                </xsl:for-each>

            </div>
@@ -1878,7 +1878,21 @@ 
        </xsl:if>

    </xsl:template>

    

    <xsl:template match="tei:figure[not(@rend='inline')]" mode="panel">

    <xsl:template match="tei:figure[not(@rend='inline') and child::tei:figure]" mode="panel">

        <div class="planche" id="{@xml:id}">

            <xsl:apply-templates select="tei:head" mode="panel"/>

            <div class="planche-figures">

                <xsl:apply-templates select="child::tei:figure[not(@rend='inline') and not(child::tei:figure)]" mode="panel"/>

            </div>

            <xsl:if test="child::tei:p[@rend='caption' or @rend='credits']">

                <figcaption>

                    <xsl:apply-templates select="tei:p[@rend='caption' or @rend='credits']" mode="panel"/>

                </figcaption>

            </xsl:if>

        </div>

    </xsl:template>



    <xsl:template match="tei:figure[not(@rend='inline') and not(child::tei:figure)]" mode="panel">

        <figure id="{@xml:id}" class="figure">

            <xsl:apply-templates select="tei:head" mode="panel"/>

            <xsl:apply-templates select="tei:graphic" mode="panel"/>