Skip to content

Commit

Permalink
Merge pull request #2227 from Inist-CNRS/theme-istex-header-not-sticky
Browse files Browse the repository at this point in the history
Theme istex header not sticky
  • Loading branch information
touv authored Nov 29, 2024
2 parents 734d191 + 6e4a970 commit 756b92c
Show file tree
Hide file tree
Showing 92 changed files with 205 additions and 16 deletions.
Binary file added src/app/custom/themes/istex/ICONO/Thumbs.db
Binary file not shown.
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\TERMINE\Downloads\EXPORT.zip
15 changes: 10 additions & 5 deletions src/app/custom/themes/istex/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,13 @@ La class interne (liste ci-après) est à saisir dans le champ 'nom interne' d'u

### class générales

- **designCta2** : bouton clair sur fond sombre ou clair
- **buttonPrimary** : bouton foncé/blanc sur fond clair/foncé (sidebar)
- **buttonSecondary** : bouton bordure fond transparent sur fond sombre ou clair
- **buttonShadow** : bouton ombre

- **blocExergue** : mise en avant d'un bloc par un léger ombrage (cf resource tools)
-> voir les boutons : [https://](https://design.istex.fr/boutons/)

- **blocExergue** : mise en avant du contenu d'un bloc par un léger ombrage (cf resource tools)

### Page d'accueil

Expand All @@ -41,7 +45,9 @@ Le bloc _designHomeContentSidebar_ est un champs composé de deux blocs :

Pour finir la page d'accueil [mise en oeuvre en cours de modification]

- **backZoneSimple** : istex home promo en bas
- **designHomebanniereSimple** : istex texte sur img pleine page
- **designHomeBanniereDouble** : istex img + texte à droite
- **designHomeTryptique** : trois blocs

### Ressource principale

Expand All @@ -59,5 +65,4 @@ pour un bloc composé
- ajoute une couleur de fond bleu très clair
- Les blocs composants ce bloc apparaissent en pavé clair

![exemple-class-interne-istex-tools-resource](https://github.com/Inist-CNRS/lodex/assets/122360177/252c3b1a-193f-4d90-9f35-75bfdddffc54)

![exemple-class-interne-istex-tools-resource](https://github.com/Inist-CNRS/lodex/assets/122360177/252c3b1a-193f-4d90-9f35-75bfdddffc54)
55 changes: 53 additions & 2 deletions src/app/custom/themes/istex/css/istex-internalclass.css
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,59 @@ div[class*='designHomebanniereSimple'] div.MuiBox-root {
/* banniere */
/* img + texte */
/*******************/
/*div[class*='banniereDouble'] {
}*/
div.property[class*='designHomeBanniereDoubleImageTexte'] {
background-color: var(--primary-main);
margin-top: -1.5rem;
width: 100%;
}
div.property[class*='designHomeBanniereDoubleImageTexte']
div:is(.property_value_container, .property, .MuiBox-root) {
margin: 0 0 !important;
padding: 0 0 !important;
}
#content
#home-page
.dataset-characteristics
> div
> div.property[class*='designHomeBanniereDoubleImageTexte']
> div:is(.property_label_container, .property_value_container) {
max-width: 100% !important;
width: 100%;
}
#content
#home-page
.dataset-characteristics
div.property[class*='BanniereImage']
> .property_value_container {
height: 450px;
min-width: 600px;
position: relative;
left: 0;
background-image: url('../ICONO/dossierdoigt-rectangle-1920x1080.jpg');
background-size: cover;
background-position: left center;
background-repeat: no-repeat;
}
#content
#home-page
.dataset-characteristics
div.property[class*='BanniereTexte']
> .property_value_container
> div
> div {
display: flex;
justify-content: center;
align-items: center;
height: 450px;
max-width: 600px;
}
div[class*='BanniereTexte'] .property_value {
padding: 4rem;
color: var(--contrast-light) !important;
}
div[class*='BanniereTexte'] .property_value_container h2 {
color: var(--contrast-light) !important;
}

/*****************/
/*page resource*/
Expand Down
11 changes: 8 additions & 3 deletions src/app/custom/themes/istex/css/istex.css
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,6 @@ body {
/*****************************/
header {
background-color: var(--contrast-light);
position: sticky;
top: 0;
z-index: 1000;
}
#nav-skip {
background-color: #fff;
Expand All @@ -152,13 +149,21 @@ header {
padding: 0.5rem;
}
.menuIstex {
position: sticky;
z-index: 1000;
top: 0;
background-color: var(--contrast-light);
font-family: 'Inter', sans-serif;
font-size: 1rem;
line-height: 1.2rem;
height: 34px;
justify-content: space-between;
text-transform: uppercase;
}
.menuIstex > div {
justify-content: space-between;
text-transform: uppercase;
}
.accesIstex {
background-color: rgba(69, 140, 165, 0.2);
padding: 10px 30px;
Expand Down
14 changes: 8 additions & 6 deletions src/app/custom/themes/istex/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
</head>
<body>
<header>
<nav class="menuIstex container flexrow" aria-label="Menu Istex">
<nav class="menuIstex" aria-label="Menu Istex">
<div class="container flexrow">
<a href="https://www.istex.fr" target="blank" class="accesIstex" title="accès Istex (lien externe)">
<img src="<%= theme.current.href %>/img/header/leftarrow.png" alt=""> Accès
Istex.fr
Expand All @@ -32,18 +32,20 @@
</li>
<li class="nav-main-item menu-item menu-item-type-custom menu-item-object-custom menu-item-2652">
<a class="nav-main-link" href="https://www.loterre.fr/" target="_blank"
title="Loterre (lien externe)">Loterre</a>
title="Loterre (lien externe)">Loterre</a>
</li>
<li class="nav-main-item menu-item menu-item-type-custom menu-item-object-custom menu-item-2653">
<a class="nav-main-link" href="https://www.istex.fr/category/actualites/" target="_blank"
title="Actualités (lien externe)">Actualités</a>
title="Actualités (lien externe)">Actualités</a>
</li>
<li class="nav-main-item menu-item menu-item-type-custom menu-item-object-custom menu-item-2654">
<a class="nav-main-link" href="https://scientific-corpus.data.istex.fr/" target="_blank"
title="Corpus spécialisés (lien externe)">Corpus spécialisés</a>
title="Corpus spécialisés (lien externe)">Corpus spécialisés</a>
</li>
</ul>
</nav>
</div>
</nav>
<header>
<div class="banner">
<div class="container">
<a href="/">
Expand Down

0 comments on commit 756b92c

Please sign in to comment.