From 826734da1a68d4fef1ea1bc2f2acb0c2555a2cd9 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Fri, 10 Jul 2020 15:37:32 +0200 Subject: [PATCH] transversal links : index -> text -> index -> text etc --- assets/css/app.scss | 11 ++- build/webpack.config.base.js | 1 + src/components/Content/EdText.vue | 94 +++++++++++++++++-- .../Content/IndexItemOcurrences.vue | 10 +- src/pages/Edition.vue | 4 +- 5 files changed, 102 insertions(+), 18 deletions(-) diff --git a/assets/css/app.scss b/assets/css/app.scss index 396cc72..1fa23e2 100644 --- a/assets/css/app.scss +++ b/assets/css/app.scss @@ -325,12 +325,12 @@ section[role="main-content"]{ } #text{ - .content{ - color: $bleuroi; + .tei{ h1{ font-size: 1.512em; } p{ + margin-top: 0; font-size: 1.134em; line-height: 1.5; span.persName, @@ -338,6 +338,13 @@ section[role="main-content"]{ span.objectName{ font-weight: 600; } + a{ + color: $rouge; + font-weight: 600; + &.active-link{ + text-decoration: underline; + } + } } } } diff --git a/build/webpack.config.base.js b/build/webpack.config.base.js index aec76be..ad6a4db 100644 --- a/build/webpack.config.base.js +++ b/build/webpack.config.base.js @@ -11,6 +11,7 @@ module.exports = { resolve: { extensions: ['.js', '.vue', '.json'], alias: { + 'vue': 'vue/dist/vue.js', 'assets': utils.resolve('assets'), 'pages': utils.resolve('src/pages'), 'static': utils.resolve('static'), diff --git a/src/components/Content/EdText.vue b/src/components/Content/EdText.vue index bfdf4cf..916cdf8 100644 --- a/src/components/Content/EdText.vue +++ b/src/components/Content/EdText.vue @@ -1,19 +1,93 @@ - - diff --git a/src/components/Content/IndexItemOcurrences.vue b/src/components/Content/IndexItemOcurrences.vue index 8654f2b..8f18898 100644 --- a/src/components/Content/IndexItemOcurrences.vue +++ b/src/components/Content/IndexItemOcurrences.vue @@ -18,12 +18,12 @@