diff --git a/src/Kodetre/Kodeliste/KodeVindu.js b/src/Kodetre/Kodeliste/KodeVindu.js index b5f9ad1a1..f3282f814 100644 --- a/src/Kodetre/Kodeliste/KodeVindu.js +++ b/src/Kodetre/Kodeliste/KodeVindu.js @@ -70,8 +70,7 @@ const KodeVindu = ({ square="false" elevation={4} style={{ - position: "relative", - top: -72 + position: "relative" }} > {kode === "NN-LA-TI" && ( - +
- {/* - // for fremtidig oppgradering om vi ønsker det, isåfal må vi detektere transparang bakgrunn på et vis
- */} } + icon={} primary="Landskap" /> + } + primary="Fylke" + /> + } + primary="Naturvernområde" + /> + } + primary="Truet art/natur" + /> + } + primary="Art" + /> + } primary="Informasjon" onClick={this.handleClickInfoTab} /> + Datagrunnlag } primary="Last ned data" onClick={this.handleClickLastNed} /> + } + primary="Levere data" + /> + + } + primary="Datakilder" + /> + } + primary="Kildekode" + /> - Bidra + Kontakt } primary="Tilbakemeldinger" /> - } - primary="Kildekode" - /> - } - primary="Levere data" - /> - - Driftes av +
- +
@@ -135,7 +167,7 @@ class MainDrawer extends Component { handleClickLastNed = () => window.open("https://data.artsdatabanken.no/"); handleClickLastOpp = () => window.open( - "https://github.com/Artsdatabanken/nin-kart-frontend/blob/master/docs/BidraMedData.md" + "https://github.com/Artsdatabanken/nin-kart-frontend/wiki/%C3%98nsker-du-%C3%A5-bidra-med-data%3F" ); handleClickLogo = () => window.open("https://artsdatabanken.no"); handleClickMap = () => this.props.history.push("/"); @@ -145,6 +177,19 @@ class MainDrawer extends Component { handleClickLandskap = () => this.props.history.push("/Natur_i_Norge/Landskap/"); handleClickStat = () => this.props.history.push("/Natur_i_Norge/Stats/"); + + handleClickFylke = () => this.props.history.push("/Fylke/"); + handleClickNaturvernområde = () => + this.props.history.push("/Naturvernområde/"); + handleClickTruet_art_natur = () => + this.props.history.push("/Truet_art_natur/"); + handleClickArt = () => this.props.history.push("/Biota/"); + handleClickDatakilde = () => this.props.history.push("/Datakilde/"); + handleClickNaturvernområde = () => + this.props.history.push("/Naturvernområde/"); + handleClickNaturvernområde = () => + this.props.history.push("/Naturvernområde/"); + handleNavigate = url => this.props.history.push(url); } diff --git a/src/style/App.css b/src/style/App.css index c90108338..5d5e0df20 100644 --- a/src/style/App.css +++ b/src/style/App.css @@ -62,15 +62,6 @@ div { max-width: 100%; } -.sidebar { - position: fixed; - height: 100vh; - overflow-x: hidden; - max-width: 408px; - background: #ededed; - width: 100%; -} - .mobile_navigation { display: none; } @@ -80,12 +71,6 @@ div { top: calc(100vh - 150px) !important; } - .sidebar { - width: 100%; - max-width: 100%; - padding-top: 56px; - } - .mobile_navigation { display: block; width: 100%; diff --git a/src/style/Sidebar.css b/src/style/Sidebar.css index 268a55e80..e226218ca 100644 --- a/src/style/Sidebar.css +++ b/src/style/Sidebar.css @@ -1,19 +1,19 @@ /* Normalize across browsers */ -.sidebar div { - box-sizing: border-box; - margin: 0px; -} - .sidebar { position: fixed; height: 100vh; overflow-x: hidden; max-width: 408px; - background: #ededed; + background: #fbfbfb; width: 100%; } +.sidebar div { + box-sizing: border-box; + margin: 0px; +} + @media only screen and (max-width: 678px) { .sidebar { width: 100%; @@ -115,3 +115,27 @@ white-space: none; color: #81b2bb; } + +.page_topic_header { + height: 60px; + width: 100%; + padding-top: 0px; +} + +.sidebar_top_image { + height: 250px; + background: #b7d3d8; + background-size: cover; + background-position: center; +} + +.sidebar_top_image.trasparent_image { + filter: drop-shadow(rgba(0, 0, 0, 0.5) 5px 5px 4px); + background: transparent; + background-size: contain; + background-position: center; + background-repeat: no-repeat; + margin-top: 10px; + margin-bottom: 10px; + height: calc(250px - 20px); +}