Commit 0a2234a4 authored by Mab's avatar Mab

Merge branch 'ccomptes/hotfix/recommendation_number' into ccomptes/develop

parents 8c85e745 df4b0a41
/*Definition of the various section*/
section.titlepage {
page: titlepage;
}
/*********************************************************************************************************************/
/* Format
/*********************************************************************************************************************/
/*Set format and margin*/
@page {
size: A4;
margin: 30mm 25mm;
}
@page :right {
......@@ -36,6 +34,20 @@ section.titlepage {
}
}
body {
counter-reset: recommandationSectionCnt recommandationCnt h1;
}
/*********************************************************************************************************************/
/* Title page
/*********************************************************************************************************************/
section.titlepage {
page: titlepage;
}
/*Title Page Content*/
@page titlepage {
......@@ -133,12 +145,6 @@ section.titlepage {
color: black;
}
div {}
.class {}
#id {}
/*********************************************************************************************************************/
/* TABLE OF CONTENT
......@@ -264,50 +270,14 @@ ol li a, p {
}
/*********************************************************************************************************************/
/* Recommandation page
/* Footnote
/*********************************************************************************************************************/
#recommendationSection {
page: RecommandationPage;
}
#recommendationSection h1 {
font-weight: bold;
font-size: 32px;
text-align: center;
}
/*Page structure*/
@page RecommandationPage {
@bottom-right-corner {
content: none;
}
@top-right {
content: none;
}
@bottom-left-corner {
content: none;
}
@top-left {
content: none;
}
}
#recommendationSection h1::first-letter {
text-transform: uppercase;
sup[data-ref]{
color: black;
text-decoration: none;
}
/*********************************************************************************************************************/
/* Footnote
/*********************************************************************************************************************/
.footnote-area {
font-size: 11px
}
......@@ -338,10 +308,6 @@ ol li a, p {
padding-right: 8px;
}
body {
counter-reset: h1;
}
h1,
h2,
h3,
......@@ -430,16 +396,20 @@ apostil {
page-break-before: avoid;
}
/*********************************************************************************************************************/
/* Recommandation
/*********************************************************************************************************************/
/* In text recommandation */
recommandation {
display: block;
text-indent: 20px;
margin-bottom: 15px;
}
body {
counter-reset: recommandationCnt;
}
recommandation {
counter-increment: recommandationCnt;
}
......@@ -450,87 +420,58 @@ recommandation::before {
font-weight: bold;
}
/*recommandation section*/
/* Recommandation section */
body {
counter-reset: recommandationSectionCnt;
counter-reset: noteCnt;
#recommendationSection {
page: RecommandationPage;
}
@page RecommandationPage {
@bottom-right-corner {
content: none;
}
/*********************************************************************************************************************/
/* Recommandation
/*********************************************************************************************************************/
#recommendationSection a {
text-decoration: none;
counter-increment: recommendationSectionCnt;
}
.recommendationItem::before {
content: "Projet de recommandation "counter(recommendationSectionCnt) ":\A";
white-space: pre;
font-weight: bold;
}
@top-right {
content: none;
}
riop.observation {
color: #307D85;
font-size: 17px;
font-weight: bold;
counter-increment: observation;
border-bottom: 1px solid #307D85;
width: 100%;
display: block;
page-break-after: avoid;
}
@bottom-left-corner {
content: none;
}
riop.observation:before {
content: "Obs. "counter(observation) ". ";
@top-left {
content: none;
}
}
riop.titre-graphique,
riop.titre-tableau,
riop.titre-schema,
riop.titre-carte {
font-size: 15px;
#recommendationSection h1 {
font-weight: bold;
page-break-after: avoid;
font-size: 32px;
text-align: center;
display: block;
}
riop.titre-graphique {
counter-increment: graphique;
}
riop.titre-tableau {
counter-increment: tableau;
#recommendationSection h1::first-letter {
text-transform: uppercase;
}
riop.titre-schema {
counter-increment: schema;
#recommendationSection a {
text-decoration: none;
counter-increment: recommendationSectionCnt;
}
riop.titre-carte {
counter-increment: carte;
.recommendationItem::before {
content: "Projet de recommandation "counter(recommendationSectionCnt) ":\A";
white-space: pre;
font-weight: bold;
}
riop.titre-graphique:before {
content: "Graphique "counter(graphique) " : ";
}
riop.titre-tableau:before {
content: "Tableau "counter(tableau) " : ";
}
/*********************************************************************************************************************/
/* Table
/*********************************************************************************************************************/
riop.titre-schema:before {
content: "Schèma "counter(schema) " : ";
}
riop.titre-carte:before {
content: "Carte "counter(carte) " : ";
}
figure {
page-break-before: avoid;
......@@ -563,17 +504,16 @@ img {
display: block;
}
/*********************************************************************************************************************/
/* Table
/*********************************************************************************************************************/
table {
margin: 16px 0;
break-inside: avoid;
border-collapse: collapse;
}
/*********************************************************************************************************************/
/* Table
/*********************************************************************************************************************/
table td,
table th {
border: 1px solid black;
......@@ -623,3 +563,67 @@ track-change[status=delete] {
track-change[status=add] {
color: blue;
}
/*********************************************************************************************************************/
/* Unused by css for now - TODO reuse all css below with new structure
/*********************************************************************************************************************/
riop.observation {
color: #307D85;
font-size: 17px;
font-weight: bold;
counter-increment: observation;
border-bottom: 1px solid #307D85;
width: 100%;
display: block;
page-break-after: avoid;
}
riop.observation:before {
content: "Obs. "counter(observation) ". ";
}
riop.titre-graphique,
riop.titre-tableau,
riop.titre-schema,
riop.titre-carte {
font-size: 15px;
font-weight: bold;
page-break-after: avoid;
text-align: center;
display: block;
}
riop.titre-graphique {
counter-increment: graphique;
}
riop.titre-tableau {
counter-increment: tableau;
}
riop.titre-schema {
counter-increment: schema;
}
riop.titre-carte {
counter-increment: carte;
}
riop.titre-graphique:before {
content: "Graphique "counter(graphique) " : ";
}
riop.titre-tableau:before {
content: "Tableau "counter(tableau) " : ";
}
riop.titre-schema:before {
content: "Schèma "counter(schema) " : ";
}
riop.titre-carte:before {
content: "Carte "counter(carte) " : ";
}
\ No newline at end of file
/*Definition of the various section*/
section.titlepage {
page: titlepage;
}
/*********************************************************************************************************************/
/* Format
/*********************************************************************************************************************/
/*Set format and margin*/
@page {
size: A4;
margin: 30mm 25mm;
}
@page :right {
......@@ -36,6 +34,20 @@ section.titlepage {
}
}
body {
counter-reset: recommandationSectionCnt recommandationCnt h1;
}
/*********************************************************************************************************************/
/* Title page
/*********************************************************************************************************************/
section.titlepage {
page: titlepage;
}
/*Title Page Content*/
@page titlepage {
......@@ -133,12 +145,6 @@ section.titlepage {
color: black;
}
div {}
.class {}
#id {}
/*********************************************************************************************************************/
/* TABLE OF CONTENT
......@@ -264,52 +270,14 @@ ol li a, p {
}
/*********************************************************************************************************************/
/* Recommandation page
/* Footnote
/*********************************************************************************************************************/
#recommendationSection {
page: RecommandationPage;
}
#recommendationSection h1 {
font-weight: bold;
font-size: 32px;
text-align: center;
}
recommendationItem
/*Page structure*/
@page RecommandationPage {
@bottom-right-corner {
content: none;
}
@top-right {
content: none;
}
@bottom-left-corner {
content: none;
}
@top-left {
content: none;
}
}
#recommendationSection h1::first-letter {
text-transform: uppercase;
sup[data-ref]{
color: black;
text-decoration: none;
}
/*********************************************************************************************************************/
/* Footnote
/*********************************************************************************************************************/
.footnote-area {
font-size: 11px
}
......@@ -340,10 +308,6 @@ recommendationItem
padding-right: 8px;
}
body {
counter-reset: h1;
}
h1,
h2,
h3,
......@@ -423,6 +387,7 @@ p {
apostil {
display: block;
text-align: right;
color: #307D85;
text-transform: uppercase;
......@@ -431,16 +396,20 @@ apostil {
page-break-before: avoid;
}
/*********************************************************************************************************************/
/* Recommandation
/*********************************************************************************************************************/
/* In text recommandation */
recommandation {
display: block;
text-indent: 20px;
margin-bottom: 15px;
}
body {
counter-reset: recommandationCnt;
}
recommandation {
counter-increment: recommandationCnt;
}
......@@ -451,87 +420,58 @@ recommandation::before {
font-weight: bold;
}
/*recommandation section*/
/* Recommandation section */
body {
counter-reset: recommandationSectionCnt;
counter-reset: noteCnt;
#recommendationSection {
page: RecommandationPage;
}
@page RecommandationPage {
@bottom-right-corner {
content: none;
}
/*********************************************************************************************************************/
/* Recommandation
/*********************************************************************************************************************/
#recommendationSection a {
text-decoration: none;
counter-increment: recommendationSectionCnt;
}
.recommendationItem::before {
content: "Recommandation "counter(recommendationSectionCnt) ":\A";
white-space: pre;
font-weight: bold;
}
@top-right {
content: none;
}
riop.observation {
color: #307D85;
font-size: 17px;
font-weight: bold;
counter-increment: observation;
border-bottom: 1px solid #307D85;
width: 100%;
display: block;
page-break-after: avoid;
}
@bottom-left-corner {
content: none;
}
riop.observation:before {
content: "Obs. "counter(observation) ". ";
@top-left {
content: none;
}
}
riop.titre-graphique,
riop.titre-tableau,
riop.titre-schema,
riop.titre-carte {
font-size: 15px;
#recommendationSection h1 {
font-weight: bold;
page-break-after: avoid;
font-size: 32px;
text-align: center;
display: block;
}
riop.titre-graphique {
counter-increment: graphique;
}
riop.titre-tableau {
counter-increment: tableau;
#recommendationSection h1::first-letter {
text-transform: uppercase;
}
riop.titre-schema {
counter-increment: schema;
#recommendationSection a {
text-decoration: none;
counter-increment: recommendationSectionCnt;
}
riop.titre-carte {
counter-increment: carte;
.recommendationItem::before {
content: "Recommandation "counter(recommendationSectionCnt) ":\A";
white-space: pre;
font-weight: bold;
}
riop.titre-graphique:before {
content: "Graphique "counter(graphique) " : ";
}
riop.titre-tableau:before {
content: "Tableau "counter(tableau) " : ";
}
/*********************************************************************************************************************/
/* Table
/*********************************************************************************************************************/
riop.titre-schema:before {
content: "Schèma "counter(schema) " : ";
}
riop.titre-carte:before {
content: "Carte "counter(carte) " : ";
}
figure {
page-break-before: avoid;
......@@ -564,17 +504,16 @@ img {
display: block;
}
/*********************************************************************************************************************/
/* Table
/*********************************************************************************************************************/
table {
margin: 16px 0;
break-inside: avoid;
border-collapse: collapse;
}
/*********************************************************************************************************************/
/* Table
/*********************************************************************************************************************/
table td,
table th {
border: 1px solid black;
......@@ -624,3 +563,67 @@ track-change[status=delete] {
track-change[status=add] {
color: blue;
}
/*********************************************************************************************************************/
/* Unused by css for now - TODO reuse all css below with new structure
/*********************************************************************************************************************/
riop.observation {
color: #307D85;
font-size: 17px;
font-weight: bold;
counter-increment: observation;
border-bottom: 1px solid #307D85;
width: 100%;
display: block;
page-break-after: avoid;
}
riop.observation:before {
content: "Obs. "counter(observation) ". ";
}
riop.titre-graphique,
riop.titre-tableau,
riop.titre-schema,
riop.titre-carte {
font-size: 15px;
font-weight: bold;
page-break-after: avoid;
text-align: center;
display: block;
}
riop.titre-graphique {
counter-increment: graphique;
}
riop.titre-tableau {
counter-increment: tableau;
}
riop.titre-schema {
counter-increment: schema;
}
riop.titre-carte {
counter-increment: carte;
}
riop.titre-graphique:before {
content: "Graphique "counter(graphique) " : ";
}
riop.titre-tableau:before {
content: "Tableau "counter(tableau) " : ";
}
riop.titre-schema:before {
content: "Schèma "counter(schema) " : ";
}
riop.titre-carte:before {
content: "Carte "counter(carte) " : ";
}
\ No newline at end of file
/*Definition of the various section*/
section.titlepage {
page: titlepage;
}
/*********************************************************************************************************************/
/* Format
/*********************************************************************************************************************/
/*Set format and margin*/
@page {
size: A4;
margin: 30mm 25mm;
}
@page :right {
......@@ -36,6 +34,20 @@ section.titlepage {
}
}
body {
counter-reset: recommandationSectionCnt recommandationCnt h1;
}
/*********************************************************************************************************************/
/* Title page
/*********************************************************************************************************************/
section.titlepage {
page: titlepage;
}
/*Title Page Content*/
@page titlepage {
......@@ -133,12 +145,6 @@ section.titlepage {
color: black;
}
div {}
.class {}
#id {}
/*********************************************************************************************************************/