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

2048-14054-probleme-daffichage-graph-a-bulles-avec-themes-inist-istex #2049

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
43 changes: 19 additions & 24 deletions src/app/custom/themes/inist/css/inist-styles.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url("fonts-style.css");
@import url('fonts-style.css');
/*lodex theme_inist lodex14*/
/* MOBILE FIRST*/
@media (min-width: 794px) {
Expand All @@ -13,7 +13,7 @@
margin-top: var(--logosSansMarge) !important;
}
/* titre courant box*/
.breadcrumb-trail a:not([href*="https"]):last-child {
.breadcrumb-trail a:not([href*='https']):last-child {
padding-left: 3rem;
margin-right: 4.6rem;
}
Expand Down Expand Up @@ -73,7 +73,6 @@ body {
font-family: var(--font-texte) !important;
font-size: 1rem;
font-weight: 400;
line-height: 1.5;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
color: var(--text-primary) !important;
}
Expand Down Expand Up @@ -112,7 +111,7 @@ html {
body {
display: flex;
flex-direction: column;
background-image: url("../img/bg_projets.jpg");
background-image: url('../img/bg_projets.jpg');
background-repeat: repeat-x;
background-position: top left;
opacity: 1;
Expand All @@ -123,7 +122,7 @@ header {
top: 0;
width: 100vw;
background-color: var(--primary-main);
background-image: url("../img/bg_projets.jpg");
background-image: url('../img/bg_projets.jpg');
background-repeat: repeat-x;
background-position: top left;
opacity: 1;
Expand Down Expand Up @@ -174,16 +173,16 @@ header a.logoinist {
line-height: normal;
}
header a.logoinist > span:first-child {
font-family: "Satoshi-Bold", Arial, Helvetica, sans-serif;
font-family: 'Satoshi-Bold', Arial, Helvetica, sans-serif;
font-size: 1.875rem;
}
header a.logoinist span.inist {
font-family: "Satoshi-Regular", Arial, Helvetica, sans-serif;
font-family: 'Satoshi-Regular', Arial, Helvetica, sans-serif;
font-weight: bold;
}
header a.logoinist > span:first-child::after {
content: "|";
font-family: "Satoshi-Regular", Arial, Helvetica, sans-serif;
content: '|';
font-family: 'Satoshi-Regular', Arial, Helvetica, sans-serif;
font-weight: normal;
opacity: 0.8;
padding-left: 0.5rem;
Expand Down Expand Up @@ -233,21 +232,17 @@ footer li a:active {
color: #434148;
text-decoration: none;
}
footer li a[href*="https"]::after {
background-image: url("../img/external-link-alt_gris.svg");
footer li a[href*='https']::after {
background-image: url('../img/external-link-alt_gris.svg');
}
footer li#lodex::before {
width: 30px;
height: 30px;
content: " ";
background: #fff left center no-repeat scroll url("/favicon.ico");
content: ' ';
background: #fff left center no-repeat scroll url('/favicon.ico');
background-size: contain;
}

/*ELEMENTS lodex - texte */
.body * {
text-align: initial !important;
}
/*ELEMENTS LODEX structure*/
/*padding et fond descendent 3 noeuds*/
/*breadcrumb au niveau header fond transparent*/
Expand Down Expand Up @@ -333,7 +328,7 @@ div.static-page,
}
/*breadcrumb titre court et liens externes*/
/* titre courant box*/
.breadcrumb-trail a:not([href*="https"]):last-child {
.breadcrumb-trail a:not([href*='https']):last-child {
display: flex;
align-items: end;
background-color: white;
Expand All @@ -342,21 +337,21 @@ div.static-page,
width: max-content;
}
/*titre courant texte*/
.breadcrumb-trail a:not([href*="https"]):last-child {
.breadcrumb-trail a:not([href*='https']):last-child {
color: var(--text-primary) !important;
font-family: var(--font-titre);
font-size: 1.2rem;
font-weight: normal;
}
/*titre court clicable*/
.breadcrumb-trail a:not([href*="https"]):last-child:hover,
.breadcrumb-trail a:not([href*="https"]):last-child:focus,
.breadcrumb-trail a:not([href*="https"]):last-child:active {
.breadcrumb-trail a:not([href*='https']):last-child:hover,
.breadcrumb-trail a:not([href*='https']):last-child:focus,
.breadcrumb-trail a:not([href*='https']):last-child:active {
text-decoration: underline 2px var(--info-main);
text-underline-offset: 5px;
}
/*external links*/
.breadcrumb-trail a[href*="https"] {
.breadcrumb-trail a[href*='https'] {
display: none;
}
/*barre nav lodex*/
Expand Down Expand Up @@ -516,7 +511,7 @@ ul.MuiList-root.facets-list > li .facet-value-list svg {
}
.tiret::before,
.static-page h2::before {
content: "—";
content: '—';
padding-right: 20px;
font-weight: bold;
}
Expand Down
82 changes: 45 additions & 37 deletions src/app/custom/themes/istex/css/istex.css
Original file line number Diff line number Diff line change
@@ -1,43 +1,48 @@
@font-face {
font-family: "Montserrat";
src: local("Montserrat"),
url("/themes/istex/fonts/Montserrat/Montserrat-Regular.ttf")
format("truetype");
font-family: 'Montserrat';
src:
local('Montserrat'),
url('/themes/istex/fonts/Montserrat/Montserrat-Regular.ttf')
format('truetype');
font-style: normal;
font-display: swap;
font-weight: 400;
}
@font-face {
font-family: "Montserrat";
src: local("Montserrat"),
url("/themes/istex/fonts/Montserrat/Montserrat-Medium.ttf")
format("truetype");
font-family: 'Montserrat';
src:
local('Montserrat'),
url('/themes/istex/fonts/Montserrat/Montserrat-Medium.ttf')
format('truetype');
font-style: normal;
font-display: swap;
font-weight: 500;
}
@font-face {
font-family: "Montserrat";
src: local("Montserrat"),
url("/themes/istex/fonts/Montserrat/Montserrat-Bold.ttf")
format("truetype");
font-family: 'Montserrat';
src:
local('Montserrat'),
url('/themes/istex/fonts/Montserrat/Montserrat-Bold.ttf')
format('truetype');
font-style: normal;
font-display: swap;
font-weight: 700;
}
@font-face {
font-family: "Inter";
font-family: 'Inter';
font-style: normal;
font-weight: 400;
src: local("Inter"),
url("/themes/istex/fonts/Inter/Inter-Regular.ttf") format("truetype");
src:
local('Inter'),
url('/themes/istex/fonts/Inter/Inter-Regular.ttf') format('truetype');
}
@font-face {
font-family: "Inter";
font-family: 'Inter';
font-style: normal;
font-weight: 700;
src: local("Inter"),
url("/themes/istex/fonts/Inter/Inter-Bold.ttf") format("truetype");
src:
local('Inter'),
url('/themes/istex/fonts/Inter/Inter-Bold.ttf') format('truetype');
}
/*****************************/
/* General *******************/
Expand All @@ -49,7 +54,6 @@ html {
body {
font-family: var(--font-texte);
font-size: 1.4rem;
line-height: 1.7rem;
color: var(--text-main);
}
:root {
Expand Down Expand Up @@ -79,12 +83,16 @@ body {
flex-direction: column;
}
.fontInter {
font-family: "Inter", sans serif;
font-family:
'Inter',
sans serif;
font-size: 1.4rem;
line-height: 1.7rem;
}
.fontMontserrat {
font-family: "Montserrat", sans serif;
font-family:
'Montserrat',
sans serif;
font-size: 2rem;
line-height: 2.4rem;
font-weight: 700;
Expand Down Expand Up @@ -122,7 +130,7 @@ header {
padding: 0.5rem;
}
.menuIstex {
font-family: "Inter", sans-serif;
font-family: 'Inter', sans-serif;
font-size: 1rem;
line-height: 1.2rem;
height: 34px;
Expand Down Expand Up @@ -193,7 +201,7 @@ footer ul {
list-style: none;
}
footer.site-footer::before {
content: " ";
content: ' ';
display: block;
height: 7px;
width: 100%;
Expand All @@ -205,7 +213,7 @@ footer.site-footer::before {
background-position: left top;
}
footer.site-footer::after {
content: " ";
content: ' ';
display: block;
height: 80px;
}
Expand Down Expand Up @@ -245,7 +253,6 @@ footer.site-footer::after {
.body {
font-family: var(--font-texte) !important;
font-size: 1.4rem;
line-height: 1.7rem;
color: var(--text-main);
}
/********************/
Expand Down Expand Up @@ -349,7 +356,7 @@ a img {
border: none;
}
.body > div a:not(.graph-link),
.body > div a[target="_blank"] {
.body > div a[target='_blank'] {
color: var(--primary-main);
cursor: pointer;
}
Expand All @@ -365,13 +372,13 @@ a img {
.body a desactive {
color: #cdcdcd;
}
.body > div a:not(:empty)[target="_blank"]::after {
.body > div a:not(:empty)[target='_blank']::after {
display: inline-block;
content: " ";
content: ' ';
width: 20px;
height: 17px;
margin-bottom: -4px;
background: url("../img/lien-externe.svg") bottom right no-repeat;
background: url('../img/lien-externe.svg') bottom right no-repeat;
background-size: 15px;
}
.body ul {
Expand Down Expand Up @@ -485,7 +492,7 @@ a.button.cta2,
margin-bottom: 1.5rem;
}
/* label */
span.property_label[style*="color: rgb(158, 158, 158)"] {
span.property_label[style*='color: rgb(158, 158, 158)'] {
font-family: var(--font-titre) !important;
font-size: 1.4rem !important;
}
Expand Down Expand Up @@ -643,7 +650,7 @@ span.property_label[style*="color: rgb(158, 158, 158)"] {
.dataset-characteristics .resources-grid-content > div > a > div {
margin: 2rem;
height: 80px;
background: var(--contrast-light) url("../img/fleched.svg") no-repeat bottom
background: var(--contrast-light) url('../img/fleched.svg') no-repeat bottom
0rem right 1rem;
}
.dataset-characteristics
Expand All @@ -665,7 +672,7 @@ span.property_label[style*="color: rgb(158, 158, 158)"] {
display: inline-block;
max-height: 32px;
overflow: hidden;
text-overflow: "..." !important;
text-overflow: '...' !important;
}
.dataset-characteristics
.resources-grid-content
Expand Down Expand Up @@ -735,8 +742,8 @@ span.property_label[style*="color: rgb(158, 158, 158)"] {
> .property_value_container
> div
.property
a[target="_blank"]::after {
background: url("../img/lien-externe_blanc.svg") bottom right no-repeat;
a[target='_blank']::after {
background: url('../img/lien-externe_blanc.svg') bottom right no-repeat;
background-size: 15px;
}
/*a avec url en texte*/
Expand Down Expand Up @@ -937,7 +944,7 @@ ul.MuiList-root.facets-list > li .facet-value-list svg {
> div
> .property
> .property_label_container
span.property_label[style*="color: rgb(158, 158, 158)"] {
span.property_label[style*='color: rgb(158, 158, 158)'] {
font-size: 1.4rem;
color: var(--primary-main) !important;
border-bottom: 1px solid var(--primary-main);
Expand Down Expand Up @@ -1019,12 +1026,13 @@ ul.MuiList-root.facets-list > li .facet-value-list svg {
div.property
li:not(:last-child)
> span::after {
content: ",";
content: ',';
}
/*en savoir + = .sidebarFonce*/
/*ref bib = .blocExergue*/
.blocExergue {
box-shadow: 10px 10px 20px rgb(133 133 133),
box-shadow:
10px 10px 20px rgb(133 133 133),
-2px 0px 2px -2px rgb(236 236 236);
padding: 3rem 5rem;
margin: 5rem 0;
Expand Down
Loading