Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ajustements 1 desktop/mobile #17

Merged
merged 1 commit into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const toggleMobileMenu = function($event) {
const route = useRoute();
watch(route, () => {
isMobileMenuOpen.value = false;
window.scrollTo(0,0);
});

const isHome = computed(() => {
Expand Down
5 changes: 5 additions & 0 deletions src/assets/css/endp_utils.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ body {
font-family: var(--font-primary);
}

button:focus {
outline: none;
box-shadow: none !important;
}

.input:focus {
border: none;
border-bottom: solid 1px var(--light-brown)
Expand Down
12 changes: 12 additions & 0 deletions src/assets/images/b_Copier_over.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
61 changes: 41 additions & 20 deletions src/components/AppFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</ul>
</div>
<div class="column">
<div class="logos-container is-flex is-justify-content-center">
<div class="logos-container is-flex">

<a href="https://www.chartes.psl.eu/fr/rubrique-centre-jean-mabillon/centre-jean-mabillon" target="_blank">
<img src="@/assets/partners_logo/Logo-CMJ.png" alt="Logo Centre Jean Mabillon" class="logo logo-cmj"/>
Expand Down Expand Up @@ -71,7 +71,7 @@
</a>

<a href="https://www.bibliotheque-mazarine.fr/fr/" target="_blank">
<img src="@/assets/partners_logo/Logo_mazarine_sansfond 6B6B6B.svg" alt="Logo Bibliothèque Mazarine" class="logo mazarine"/>
<img src="@/assets/partners_logo/Logo_mazarine_sansfond 6B6B6B.svg" alt="Logo Bibliothèque Mazarine" class="logo logo-mazarine"/>
</a>

</div>
Expand Down Expand Up @@ -107,7 +107,7 @@ footer .columns {
}

footer .columns .column {
padding: 55px 40px 8px;
padding: 55px 40px 30px;
background-color: #4C4949;
}

Expand All @@ -124,7 +124,7 @@ footer .columns .column:nth-child(2) {

footer .columns .column:last-child {
padding-left: 0;
padding-top: 40px;
padding-top: 45px;
}


Expand Down Expand Up @@ -165,8 +165,13 @@ footer .columns .column:last-child {
text-align: justify;
}

.footer-links{
display: flex;
.footer-links {
display: inline-block;
}

.footer-links li {
position: relative;
display: inline;
}

.footer-links li,
Expand All @@ -175,13 +180,20 @@ footer .columns .column:last-child {
line-height: 1;
}

.footer-links li:not(:last-child) {
margin-right: 10px;
padding-right: 10px;
}

.footer-links li:not(:last-child):after {
content: "";
position: absolute;
top: 0;
right: 0;
display: inline-block;
width: 1px;
height: 80%;
border-right: solid #ffffff 1px;
margin: 0 10px;
transform: translateY(2px);
}

Expand All @@ -195,16 +207,25 @@ footer .columns .column:last-child {
.footer-links li a:hover {
text-decoration: underline;
text-underline-offset: 3px;
color: var(--light-brown-alt);
}



.logos-container {
justify-content: flex-start;
align-items: center;
gap: 40px;
display: flex;
flex-wrap: wrap;

--logo-scale: 0.75;
}

.logos-container a {
transform-origin: 50% 50%;
transition: transform ease-in-out 0.35s;
}

.logos-container a:hover {
transform: scale(1.25);
}

.logo {
Expand All @@ -213,43 +234,43 @@ footer .columns .column:last-child {
}

.logo-cmj {
width: 178px;
width: calc( 178px * var(--logo-scale));
}

.logo-enc {
width: 256px;
width: calc( 256px * var(--logo-scale));
}

.logo-anr {
width: 183px;
width: calc( 183px * var(--logo-scale));
}

.logo-lamop {
width: 145px;
width: calc( 145px * var(--logo-scale));
}

.logo-paris1 {
width: 74px;
width: calc( 74px * var(--logo-scale));
}

.logo-cnrs {
width: 82px;
width: calc( 82px * var(--logo-scale));
}

.logo-pariscite {
width: 177px;
width: calc( 177px * var(--logo-scale));
}

.logo-an {
width: 223px;
width: calc( 223px * var(--logo-scale));
}

.logo-bnf {
width: 160px;
width: calc( 160px * var(--logo-scale));
}

.logo-mazarine {
width: 110px;
width: calc( 110px * var(--logo-scale));
}


Expand Down
14 changes: 10 additions & 4 deletions src/components/PersonDataCarousel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ export default {
},
700: {
itemsToShow: 2,
itemsToScroll: 2
itemsToScroll: 1
},
1024: {
itemsToShow: 3,
itemsToScroll: 3
itemsToScroll: 1
},
},
}
Expand Down Expand Up @@ -166,6 +166,8 @@ export default {
}

.box-content .active-slide-caption {
display: none;

position: absolute;
bottom: 0;
width: 100%;
Expand Down Expand Up @@ -233,12 +235,12 @@ li.carousel__slide a::after {
position: relative;
}

:deep(.carousel__slide--active:after) {
:deep(.carousel__slide--active::after) {
content:"";
position: absolute;
bottom: 76px;
display: block;
border: 7px solid white;
border: 7px solid var(--light-brown);
width: 100%;
transform: scale(0.7);
z-index: 6;
Expand Down Expand Up @@ -300,6 +302,10 @@ li.carousel__slide a::after {
padding: 0 var(--mobile-side-padding) 0 !important;
}

:deep(.carousel__slide--active::after) {
display: none;
}

}


Expand Down
6 changes: 4 additions & 2 deletions src/components/PersonDataTimeline.vue
Original file line number Diff line number Diff line change
Expand Up @@ -391,12 +391,14 @@ export default {

.timeline-scroll-container {
max-height: 30rem;
overflow-y: auto;
overflow-y: hidden;
border-top: 1px solid #A7A7A7;
border-bottom: 1px solid #A7A7A7;

/*
scrollbar-width: thin;
scrollbar-color: var(--light-brown-alt) #DFDEDE;
*/
}

.timeline-scroll-container::-webkit-scrollbar {
Expand Down Expand Up @@ -459,7 +461,7 @@ export default {
}

.button.btn-scroll[disabled] {
opacity: 1;
opacity: 0.25;
}

.popup-group {
Expand Down
37 changes: 26 additions & 11 deletions src/components/PersonPagination.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="pagination-box box">
<div class="pagination-box box" :class="{ 'top-pagination' : topPagination }">
<nav class="pagination">
<a class="pagination-previous" :class="{ 'disabled': currentPage === 1 }"
@click="handleChangePage(currentPage - 1)">
Expand Down Expand Up @@ -52,7 +52,7 @@
</span>
</a>
</nav>
<div class="pagination-panel">
<div class="pagination-panel" :class="{ 'results-by-page-control' : resultsByPageControl }">
<input id="limit-results" class="input items-by-page-input" type="number" placeholder="50"
:min="itemsByPageMinDisplay" :max="itemsByPageMaxDisplay" step="10"
v-model="itemsByPageDisplay" @change="handleItemsPerPageChange">
Expand All @@ -71,6 +71,8 @@ export default {
itemsByPageDefault: Number,
itemsByPageMax: Number,
itemsByPageMin: Number,
topPagination: Boolean,
resultsByPageControl: Boolean
},
data() {
return {
Expand Down Expand Up @@ -141,6 +143,10 @@ nav.pagination {
}

.pagination-panel {
display: none;
}

.pagination-panel.results-by-page-control {
display: flex;
align-items: center;
justify-content: flex-end;
Expand Down Expand Up @@ -184,7 +190,7 @@ nav.pagination {

.disabled {
pointer-events: none;
opacity: 0.5;
opacity: 0.15;
}

.pagination-list {
Expand Down Expand Up @@ -225,6 +231,11 @@ nav.pagination {
display: none;
}

.pagination-previous:active,
.pagination-next:active {
box-shadow: none;
}

.pagination-previous:before,
.pagination-next:before {
content: "";
Expand Down Expand Up @@ -255,16 +266,8 @@ nav.pagination {

.pagination-previous,
.pagination-next {
position: absolute;
top: 45px;
right: 0;
width: 53px;
height: 45px;
padding: 0;
}

.pagination-previous {
transform: translateX(-82px);
}

.pagination-previous:before,
Expand All @@ -274,6 +277,18 @@ nav.pagination {
height: 45px;
}

.top-pagination .pagination-previous,
.top-pagination .pagination-next {
position: absolute;
top: 45px;
right: 0;
padding: 0;
}

.top-pagination .pagination-previous {
transform: translateX(-82px);
}

.pagination-panel .label,
.pagination-panel .items-by-page-input {
display: none;
Expand Down
Loading
Loading