bach 10 months ago
parent
commit
54c36dad11
3 changed files with 39 additions and 15 deletions
  1. 27 10
      assets/css/app.scss
  2. 8 1
      assets/css/base/_fonts.scss
  3. 4 4
      src/pages/Bibliographie.vue

+ 27 - 10
assets/css/app.scss

@@ -266,13 +266,16 @@ section[role="main-content"]{
                   margin-bottom: $base-line * 0.5;
                 }
                 p{
-                  font-size: 1em;
-                  @include fontserif;
-                  font-weight: 300;
-                  margin-top:0;
-                  font-size: 1em;
-                  line-height: $base-line * 0.5;
-                  margin-bottom: $base-line / 2;
+                  @include labeurfont;
+                  line-height: $base-line * 0.75;
+                  font-weight: 200;
+                  // font-size: 1em;
+                  // @include fontserif;
+                  // font-weight: 300;
+                  // margin-top:0;
+                  // font-size: 1em;
+                  // line-height: $base-line * 0.5;
+                  // margin-bottom: $base-line / 2;
                 }
 
                 margin-bottom: $base-line;
@@ -649,6 +652,10 @@ section[role="main-content"]{
         // font-size: 1em;
         // line-height: $base-line *0.5;
         // margin-bottom: $base-line / 2;
+        &>*{
+          line-height: $base-line * 0.7;
+
+        }
       }
       nav.entities-hide-show{
         position: absolute;
@@ -1127,6 +1134,7 @@ section[role="main-content"]{
         h2.toc-title{
           font-size: 1.1em;
           color: $bleuroilight;
+          line-height: $base-line * 0.7;
           &:hover, &.loaded{
             color: $bleuroi;
           }
@@ -1292,7 +1300,7 @@ section[role="main-content"]{
     }
     .biblio-item{
       h2{
-        color: $bleuroi;
+        @include title1blue;
       }
       p{
         span.label{
@@ -1312,7 +1320,12 @@ section[role="main-content"]{
           color: $bleuroi;
         }
         p{
-          margin:0;
+          @include labeurfont;
+          margin:0 0 $base-line * 0.5 0;
+        }
+        >em{
+          @include labeurfont;
+          margin:0 0 $base-line * 0.5 0;
         }
 
         span.date{
@@ -1344,7 +1357,8 @@ section[role="main-content"]{
             padding-left: 1em;
             overflow-y: hidden;
             li{
-              margin-bottom: $base-line / 2;
+              @include labeurfont;
+              margin-bottom: 0;
             }
           }
           
@@ -1395,6 +1409,9 @@ section[role="main-content"]{
       aside.links{
         position: absolute;
         bottom: 0;
+        p{
+          line-height: $base-line * 0.65;
+        }
       }
     }
   }

+ 8 - 1
assets/css/base/_fonts.scss

@@ -34,7 +34,7 @@ footer[role="tools"] .row>nav{
   color: $bleuroi;
   font-weight: 400;
   margin:0;
-  line-height: $base-line;
+  line-height: $base-line * 1.5;
 }
 
 @mixin title1black {
@@ -123,3 +123,10 @@ footer[role="tools"] .row>nav{
   font-size: 0.756em;
   line-height: 1.1em;
 }
+
+@mixin labeurfont {
+  @include fontserif;
+  font-size: 1.134em;
+  font-weight: 400;
+  line-height: $base-line;
+}

+ 4 - 4
src/pages/Bibliographie.vue

@@ -44,8 +44,8 @@
             </router-link>
             <span v-else>/!\ No authors /!\</span>
           </h2>
-          <p class="date">{{ item.dates }}</p>
-          <em class="titles">{{ item.titles }}</em>
+          <p v-if="item.dates" class="date">{{ item.dates }}</p>
+          <em v-if="item.titles" class="titles">{{ item.titles }}</em>
           <aside v-if="item.manifestations && item.manifestations.length">
             <h5
               @click.prevent="onToggleManifs"
@@ -87,7 +87,7 @@
     <!-- or expression / manifestation item -->
     <template v-if="uuid">
       <div class="biblio-item">
-        <h2>{{ item.type }}</h2>
+        <h2 v-if="item.type">{{ item.type }}</h2>
         <h2 v-html="item.tei" />
         <p class="author"><span class="label">Auteur :</span> {{ item.authors }}</p>
         <p v-if="item.dates" class="date"><span class="label">Dates :</span> {{ item.dates }}</p>
@@ -144,7 +144,7 @@
         </li>
       </ul>
     </template>
-    <template v-else #nav>
+    <template v-if="item.url && item.uuid && item.path" #nav>
       <aside class="links">
         <p>
           Permalien:<br><a :href="`${item.url}`">{{ item.url }}</a>