Skip to content

Commit

Permalink
fix per le issue per la presentazione del 30 (#314)
Browse files Browse the repository at this point in the history
* fix per le issue per la presentazione del 30

Co-authored-by: unknown <[email protected]>
  • Loading branch information
DoomRock88 and unknown authored Nov 24, 2022
1 parent 8021a6c commit 0ee8c25
Show file tree
Hide file tree
Showing 22 changed files with 91 additions and 62 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ API_URL=
SPARQL_ENDPOINT_URL=http://localhost:8890/sparql
IMAGE_INLINE_SIZE_LIMIT=0
INLINE_RUNTIME_CHUNK=false
MAINTENANCEALERTS=
NDC_MAINTENANCE_MESSAGE=
MATOMO_SITE_ID=35
29 changes: 28 additions & 1 deletion src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,17 @@ div.progress-bar:empty {
.notUnderline {
text-decoration: none !important;
}
.searchForCategoryLink {
color: #0066cc;
text-decoration: none;
}
.searchForCategoryLink :hover {
color: #0066cc;
text-decoration: underline;
}
.endSectionBkg {
background-color: #0066cc !important;
min-height: 26.56rem !important;
}
.txtWhite {
color: white !important;
Expand All @@ -95,11 +104,29 @@ a.btn.endSection {
background-color: white;
color: #0066cc;
}
.container-fluid {
max-width: 1600px;
margin: 0 auto;
}
.breadcrumb-container {
max-width: 1600px;
margin: 0 auto;
}
.container-fluid.schemaPadding {
padding-left: 8.7rem !important;
padding-right: 8.7rem !important;
}

.mantainenceAllert{
width: 100%;
background-color: #0059b3;
}
.mantainenceAllertWhite{
width: 100%;
background-color: white;
}
.alert{
background-color: white;
}
@media (max-width: 960px) {
.container-fluid.schemaPadding {
padding-left: 3rem !important;
Expand Down
13 changes: 9 additions & 4 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,20 @@ import getAlertMessage from "./services/alertService";
function App() {
const mainRef = useRef(null);
const footerRef = useRef(null);
const alertMess = getAlertMessage();
console.log(window.history);
let bkgAlert = "mantainenceAllert";
return (
<BrowserRouter>
<SkipToContent mainRef={mainRef} footerRef={footerRef} />
<div id="page-front">
<Header />
{getAlertMessage ? (
<div className="container-fluid schemaPadding py-1">
<div className="alert alert-warning m-0" role="alert">
<strong>Avviso di manutenzione</strong> - {getAlertMessage}
{alertMess && alertMess != "" ? (
<div className={bkgAlert}>
<div className="container-fluid schemaPadding py-3">
<div className="alert alert-warning m-0" role="alert">
<strong>Avviso di manutenzione</strong> - {alertMess}
</div>
</div>
</div>
) : null}
Expand Down
2 changes: 1 addition & 1 deletion src/assets/images/dipartimento.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/images/line_13.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 3 additions & 4 deletions src/components/common/EndSection/EndSection.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,12 @@ export const EndSection = (props) => {
<p className="txtWhite">
Se trovi errori o bug apri una issue si github.
<br /> Se vuoi contribuire al catalogo con un contenuto{" "}
<br />
leggi la guida su docs italia
</p>
</div>
</div>
<div className="row mx-0 mt-2">
<div className="col-xl-5 col-lg-6">
<div className="col-xl-5">
<a
className="btn btn-primary endSection link font-weight-bold"
href={GITHUB_SCHEMA}
Expand All @@ -76,9 +75,9 @@ export const EndSection = (props) => {
/>
</a>
</div>
<div className="col-xl-6 col-lg-6 mt-2 mt-lg-0">
<div className="col-xl-6 mt-2 mt-lg-0 d-flex justify-content-start justify-content-xl-end">
<a
className="btn btn-outline-light font-weight-bold"
className="btn btn-outline-light font-weight-bold ml-0 ml-xl-3 mt-2 mt-xl-0"
href={DIGITALE_DOCS_URL}
role="button"
aria-label="vai alla pagina di docs italia"
Expand Down
8 changes: 5 additions & 3 deletions src/components/common/IntroSection/IntroSection.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ const IntroSection = ({
{primaryButtonLink && primaryButtonText ? (
<div
className={
primaryButtonText.length > 20 ? "col-sm-6" : "col-sm-4"
"col-lg-6 mb-2 mb-lg-0" + primaryButtonText.length > 20
? "col-lg-6"
: "col-lg-5"
}
>
<a className={"btn btn-primary"} href={primaryButtonLink}>
Expand All @@ -56,7 +58,7 @@ const IntroSection = ({
)}

{secondaryButtonLink ? (
<div className="col-sm-5">
<div className="col-lg-6 d-flex justify-content-start">
<a
className={
"btn btn-outline-primary " + styles.btnSecondary
Expand All @@ -72,7 +74,7 @@ const IntroSection = ({
</div>
</div>
{type && heroSpace && heroSpace?.url ? (
<div className="col-lg-6 mt-5 d-flex justify-content-end">
<div className="col-lg-6 mt-5 d-flex justify-content-center">
<img
width={heroSpace?.w}
height={heroSpace?.h}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const ExploreByCategory = () => {
onClick={item.onClick}
data-testid={item.key}
>
<a href="#" className="link notUnderline">
<a href="#" className="searchForCategoryLink">
<div className="card card-teaser rounded shadow">
<div className="card-body">
<div className="row mx-0 px-1">
Expand Down
10 changes: 6 additions & 4 deletions src/components/explore/ExploreByType/ExploreByType.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,12 @@ const ExploreByType = () => {

return (
<ExploreSection title="Esplora per strumenti semantici">
<div className={"row mx-0 mt-4 mb-5 pb-3"} role="list">
{renderType(AT_ONTOLOGY)}
{renderType(AT_VOCABULARY)}
{renderType(AT_SCHEMA)}
<div className="container-fluid schemaPadding">
<div className={"row mx-0 mt-4 mb-5 pb-3"} role="list">
{renderType(AT_ONTOLOGY)}
{renderType(AT_VOCABULARY)}
{renderType(AT_SCHEMA)}
</div>
</div>
</ExploreSection>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/explore/ExploreSection/ExploreSection.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { element, string } from "prop-types";
import "./ExploreSection.css";

const ExploreSection = ({ title, children }) => (
<div className="container-fluid mx-0">
<div className="container-fluid">
<div data-testid="ExploreSection">
<div className="pt-3 ml-4">
<div className="container-fluid schemaPadding">
Expand Down
6 changes: 3 additions & 3 deletions src/components/layout/HeaderMainMenu/HeaderMainMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ const HeaderMainMenu = () => {
title={menuItem.label}
aria-label={menuItem.label}
className={
"nav-link justify-content-center focus-element" +
"nav-link justify-content-center focus-element mr-3" +
(isActive(menuItem.href) ? " active" : "")
}
to={menuItem.href}
>
<span className="pr-lg-5">{menuItem.label}</span>
<span className="">{menuItem.label}</span>
</Link>
</li>
))}
Expand All @@ -94,7 +94,7 @@ const HeaderMainMenu = () => {
}
to={menuItem.href}
>
<span className="pr-lg-1">{menuItem.label}</span>
<span className="">{menuItem.label}</span>
</Link>
</li>
))}
Expand Down
Loading

0 comments on commit 0ee8c25

Please sign in to comment.