diff --git a/src/assets/scss/abstracts/_variables.scss b/src/assets/scss/abstracts/_variables.scss index 0a8ffb5..bc81485 100644 --- a/src/assets/scss/abstracts/_variables.scss +++ b/src/assets/scss/abstracts/_variables.scss @@ -132,7 +132,7 @@ $spinner-width: 50px; // POPOVERS $popover-font-size: $font-size-base; -$popover-bg: $black; +$popover-bg: $white; $popover-max-width: 450px; $popover-border-width: 0; $popover-box-shadow: null; @@ -142,7 +142,7 @@ $popover-body-padding-y: 18px; $popover-body-padding-x: 18px; $popover-arrow-width: 0; -$popover-arrow-height: 1rem; +$popover-arrow-height: 2rem; $popover-arrow-outer-color: null; diff --git a/src/assets/scss/base/_bootstrap-overrides.scss b/src/assets/scss/base/_bootstrap-overrides.scss index 7994610..2f5d0c3 100644 --- a/src/assets/scss/base/_bootstrap-overrides.scss +++ b/src/assets/scss/base/_bootstrap-overrides.scss @@ -31,3 +31,11 @@ a:hover { .popover { font-family: $font-family-text; } + +.btn { + font-family: $font-family-base; +} + +.badge { + font-size: inherit; +} diff --git a/src/components/formItems/MultipleTagsSelect.vue b/src/components/formItems/MultipleTagsSelect.vue index 2795ec1..4164ae7 100644 --- a/src/components/formItems/MultipleTagsSelect.vue +++ b/src/components/formItems/MultipleTagsSelect.vue @@ -85,7 +85,6 @@ export default { } .b-form-tag { - font-size: inherit; font-weight: $font-weight-bold; padding-top: 0; padding-bottom: 0; diff --git a/src/components/nodes/NodeViewBody.vue b/src/components/nodes/NodeViewBody.vue index def4c20..5cd5e0b 100644 --- a/src/components/nodes/NodeViewBody.vue +++ b/src/components/nodes/NodeViewBody.vue @@ -20,7 +20,7 @@ v-for="link in note.links" :key="link.id" :node="link.parents && link.parents.length ? link.parents[0] : link" link - @open-node="onFootnoteLinkClick(link)" + @open-node="onFootnoteLinkClick(link, 'note-' + note.number)" > :last-child { - margin-bottom: 0; +.footnote { + background-color: $black; + color: $white; + font-size: 1.25rem; + + @include media-breakpoint-up(sm) { + font-size: 1.5rem; + } + + h6 { + font-size: inherit; + } + + &-content, + &-child-list { + > :last-child { + margin-bottom: 0; + } + } + + &-child-list { + margin-top: .5rem; } } -.footnote-child-list { - margin-top: .5rem; -} + diff --git a/src/components/nodes/NodeViewFooter.vue b/src/components/nodes/NodeViewFooter.vue index 1eaa8ac..05a29f2 100644 --- a/src/components/nodes/NodeViewFooter.vue +++ b/src/components/nodes/NodeViewFooter.vue @@ -3,38 +3,34 @@ class="node-view-footer" :class="'node-view-footer-' + mode" >
-
+
{{ tag.name }}
-
+
{{ $t('siblings') }} - +
    +
  • + +
  • +
@@ -49,11 +45,16 @@ - diff --git a/src/components/nodes/NodeViewTitle.vue b/src/components/nodes/NodeViewTitle.vue index d4f5b2f..d7d4aaf 100644 --- a/src/components/nodes/NodeViewTitle.vue +++ b/src/components/nodes/NodeViewTitle.vue @@ -10,7 +10,7 @@ class="node-view-title-container" > - {{ toCommaList(node.authors) }}, + {{ toCommaList(node.authors) }}, diff --git a/src/pages/library/LibraryMap.vue b/src/pages/library/LibraryMap.vue index 6f54ccd..31a1361 100644 --- a/src/pages/library/LibraryMap.vue +++ b/src/pages/library/LibraryMap.vue @@ -58,7 +58,7 @@ export default { methods: { onOpen (node) { - if (node.parents) { + if (node.parents && node.parents.length) { this.$emit('open-node', { parentId: node.parents[0].id, childId: node.id }) } else { this.$emit('open-node', { parentId: node.id }) diff --git a/src/pages/library/LibraryTree.vue b/src/pages/library/LibraryTree.vue index 72b09da..7f321b2 100644 --- a/src/pages/library/LibraryTree.vue +++ b/src/pages/library/LibraryTree.vue @@ -109,7 +109,7 @@ export default { trim, onNodeClick (node) { - if (node.parents) { + if (node.parents && node.parents.length) { this.$emit('open-node', { parentId: node.parents[0].id, childId: node.id }) } else { this.$emit('open-node', { parentId: node.id }) diff --git a/src/store/modules/library.js b/src/store/modules/library.js index e914da0..2ad6cd0 100644 --- a/src/store/modules/library.js +++ b/src/store/modules/library.js @@ -222,7 +222,7 @@ export default { if (a.authors[0].last_name > b.authors[0].last_name) return 1 return 0 }).reduce((dict, text) => { - const firstChar = text.authors ? text.authors[0].last_name[0] : 'Pas de noms' + const firstChar = text.authors ? text.authors[0].last_name[0].toUpperCase() : 'Pas de noms' if (!(firstChar in dict)) dict[firstChar] = [] dict[firstChar].push(text) return dict