Commit feb12494 authored by Fabien Amarger's avatar Fabien Amarger
Browse files

Merge branch 'master' of framagit.org:Murloc6/Spirhal

Conflicts:
	src/spirhal/components/PubliList/PubliList.component.html
parents cfcba614 ecd645c0
<h1 align="center">Bienvenu sur SpirHAL 👋</h1>
<img src="https://framagit.org/Murloc6/Spirhal/raw/master/src/assets/SPIRHAL.png" alt="SpirHAL Logo"/>
<p>
<img src="https://img.shields.io/badge/version-3.0.2-blue.svg?cacheSeconds=2592000" />
<img src="https://img.shields.io/badge/version-3.0.4-blue.svg?cacheSeconds=2592000" />
<a href="https://framagit.org/Murloc6/Spirhal/commits/master">
<img alt="status" src="https://framagit.org/Murloc6/Spirhal/badges/master/pipeline.svg">
<a>
......
{
"name": "spirhal",
"version": "3.0.2",
"version": "3.0.4",
"license": "CC BY-NC-SA 4.0",
"scripts": {
"ng": "ng",
......
......@@ -89,6 +89,9 @@
.pictoWithMissing {
color: #f0ad4e;
}
.nbDoubles .pictoWithMissing{
color: white;
}
.nbMissings .pictoWithMissing {
color: white;
......
......@@ -42,7 +42,11 @@
<span *ngIf="type=='ART' || ((type=='DEFAULT' || type=='DOUV') && publi.journalTitle_s)">
<span *ngIf="publi.journalTitle_s"><i class="italic">{{publi.journalTitle_s}}</i>, </span>
<span *ngIf="publi.volume_s"><i class="italic">{{publi.volume_s}}</i></span><span *ngIf="publi.issue_s">({{publi.issue_s}}) </span><span *ngIf="publi.page_s">, p. {{publi.page_s}}</span>.
<span *ngIf="publi.volume_s">
<i class="italic">{{publi.volume_s}}</i>
</span>
<span *ngIf="publi.issue_s">({{publi.issue_s}}) </span>
<span *ngIf="publi.page_s">, <span *ngIf="!publi.otherType_s || publi.otherType_s != 1">p. </span>{{publi.page_s}}</span>.
</span>
<span *ngIf="type=='THESE'|| type=='HDR'">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment