From 257efc35f9f17951fac7b195b2e46f53d5e43b20 Mon Sep 17 00:00:00 2001 From: bach Date: Thu, 20 Jan 2022 17:30:07 +0100 Subject: [PATCH] grille de ligne de base --- assets/css/app.scss | 11 ++++++++--- assets/css/base/_fonts.scss | 3 +++ assets/css/base/_layout.scss | 2 +- assets/css/base/_variables.scss | 1 + static/img/grille-ligne-de-base.png | Bin 0 -> 135 bytes 5 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 static/img/grille-ligne-de-base.png diff --git a/assets/css/app.scss b/assets/css/app.scss index b11d8dc..4392b95 100644 --- a/assets/css/app.scss +++ b/assets/css/app.scss @@ -28,6 +28,8 @@ that is currently Firefox-only */ body{ color: #1a1a1a; + // background-image: url('/static/img/grille-ligne-de-base.png'); + // background-repeat: repeat; } #root{ @@ -469,11 +471,13 @@ section[role="main-content"]{ font-weight: 600; } - h1{ font-size: 1.512em; } + h1{ font-size: 1.512em; + line-height: $base-line; } p{ margin-top: 0; font-size: 1.134em; - line-height: 1.5; + line-height: $base-line; + margin-bottom: $base-line / 2; span.persName, span.placeName, span.objectName{ @@ -584,6 +588,7 @@ section[role="main-content"]{ height:calc(100% - #{$pager_h}); overflow-x: hidden; overflow-y: auto; + line-height: $base-line / 2; >ul{ ul{ li{ @@ -610,7 +615,7 @@ section[role="main-content"]{ li{ // min-height: 1em; // border-left: 1px solid red; - padding:0 0 0.2em 1em; + padding:0 0 0 1em; } } } diff --git a/assets/css/base/_fonts.scss b/assets/css/base/_fonts.scss index dc52437..ebf4c84 100644 --- a/assets/css/base/_fonts.scss +++ b/assets/css/base/_fonts.scss @@ -4,6 +4,7 @@ // @import '../fonts/notosans/notosans-condensed.css'; // @import '../fonts/notosans/notosans-extracondensed.css'; + @mixin fontsans { font-family: "noto_sans"; } @@ -33,6 +34,7 @@ footer[role="tools"] .row>nav{ color: $bleuroi; font-weight: 400; margin:0; + line-height: $base-line; } @mixin title1black { @@ -92,6 +94,7 @@ footer[role="tools"] .row>nav{ color: $bleuroi; font-weight: 400; margin:0; + line-height: $base-line; } @mixin fontcaption { diff --git a/assets/css/base/_layout.scss b/assets/css/base/_layout.scss index 6843c74..d3c63d3 100644 --- a/assets/css/base/_layout.scss +++ b/assets/css/base/_layout.scss @@ -67,7 +67,7 @@ body{ >nav{ box-sizing: border-box; max-height: 100%; - padding-top:1em; + padding-top:$base-line; } >section>.wrapper, >nav{ diff --git a/assets/css/base/_variables.scss b/assets/css/base/_variables.scss index 821cad3..2c6b3e1 100644 --- a/assets/css/base/_variables.scss +++ b/assets/css/base/_variables.scss @@ -1,4 +1,5 @@ $base_font_size:16px; +$base-line:28px; // grid $default_gap: 1em; diff --git a/static/img/grille-ligne-de-base.png b/static/img/grille-ligne-de-base.png new file mode 100644 index 0000000000000000000000000000000000000000..d99af109e1279d919819841c6a3bf3f8258da2f9 GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa&H|6fVg?4uYaq-haq-k!prB-l zYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt&>+E{-7@6O&VZoiCoADALmu b*ucr~BbxEe