Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
a72809e
MIM-2198:Timeline part from design sprint
ssb-cgn Feb 17, 2025
bed3e35
MIM-2198:Added optionset urlArticle
ssb-cgn Feb 18, 2025
c60c217
First version Show more button
ssb-cgn Feb 19, 2025
524235c
Refactoring show more years button
ssb-cgn Feb 19, 2025
9a6047f
MIM-2198:Added external categoryLink
ssb-cgn Feb 24, 2025
34b9176
Merge branch 'develop' of github.com:statisticsnorway/mimir into MIM-…
ssb-cgn Feb 25, 2025
feb8ec6
Merge branch 'develop' of https://github.com/statisticsnorway/mimir i…
ssb-cgn Feb 26, 2025
2f3593a
Fixing bug
ssb-cgn Feb 26, 2025
234f3e0
Fikse Vis flere knapp og endret hendelsestype
ssb-cgn Feb 27, 2025
dec3344
changing catogoryes
ssb-cgn Feb 27, 2025
dc96356
Teste alternativ part
ssb-cgn Mar 1, 2025
734e654
Fikse liten feil i ny mal
ssb-cgn Mar 5, 2025
c8521f8
Added targetUrl to DirectorBox
ssb-cgn Mar 5, 2025
e8f5eea
Fjernet alternativ visning
ssb-cgn Mar 5, 2025
79fdc95
Lagt til property for visning antall aar og fikset Vis flere knappen
ssb-cgn Mar 5, 2025
6a0b345
Midtstilt innhold hvis fullbredde
ssb-cgn Mar 5, 2025
4c02b78
Lagt til tittel og ingress
ssb-cgn Mar 5, 2025
5178998
designendringer tittel og chip
ssb-cgn Mar 6, 2025
a433f77
Fikser mer styling
ssb-cgn Mar 6, 2025
f7df74f
Mer designmikk
ssb-cgn Mar 6, 2025
36194e7
designendringer
ssb-cgn Mar 6, 2025
c7abd71
Mer mikk
ssb-cgn Mar 6, 2025
c2f7213
Fikset Vis flere knapp ved filtrering
ssb-cgn Mar 6, 2025
03c3087
Fikset typescriptfeil
ssb-cgn Mar 6, 2025
4b463c3
Refaktorering
ssb-cgn Mar 7, 2025
ae604a5
Merge branch 'develop' of https://github.com/statisticsnorway/mimir i…
ssb-cgn Mar 7, 2025
459dcca
Endringer på parten
ssb-cgn Mar 7, 2025
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
207 changes: 207 additions & 0 deletions src/main/resources/assets/styles/_timeline.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
.ssb-timeline {
.title-container {
display: grid;
grid-template-columns: repeat(12, 1fr);
margin-top: 4rem;
margin-bottom: 5rem;

.title-ingress-wrapper {
grid-column: 2 / span 10;

.title {
display: block;
margin: 0 auto;
}
.ingress {
display: block;
margin: 0 auto;
font-size: 1.25rem;
}
}
}

.filter-container {
display: flex;
justify-content: center;

.filter {
display: flex;
grid-column: 3 / span 8;
flex-wrap: wrap;
gap: 0.75rem;
margin-bottom: 4rem;
width: 740px;

.ssb-tag {
&.active {
background: $ssb-dark-5;
border: 2px solid $ssb-dark-5;
color: $ssb-white;
}
}
}
}

.timeline-container {
display: flex;
justify-content: center;
}

.timeline {
position: relative;
padding-left: 20px;
width: 740px;

.circle {
width: 16px;
height: 16px;
background-color: #274247;
border-radius: 50%;
position: absolute;
top: -10px;
transform: translateX(-40%);
}

&:before {
content: '';
width: 4px;
height: 100%;
background: #274247;
position: absolute;
top: 0;
}

&:after {
content: '';
display: block;
width: 100%;
clear: both;
}

.timeline-elements {
padding: 25px 0;
list-style: none;
}

.timeline-content {
left: -20px;
position: relative;
margin-bottom: 30px;

.year {
width: 180px;
height: 80px;
background: #274247;
border-radius: 4px;
position: absolute;
align-content: center;

&:after {
content: '';
position: absolute;
top: 0;
right: -1px;
width: 0;
height: 0;
border-top: 40px solid transparent;
border-bottom: 40px solid transparent;
border-right: 20px solid #f0f8f9;
border-radius: 4px;
}

span {
@include roboto-condenced;
color: #fff;
padding: 20px 40px;
font-size: 28px;
}
}

.events {
padding-top: 90px;
width: 100%;
min-width: 400px;
position: relative;

.event {
margin-bottom: 20px;

&:first-child {
margin-top: 20px;
}

&:last-child {
margin-bottom: 80px;
}

.ssb-card {
max-width: 400px;
}
}
}

.event-box {
background: #fff;
border: 1px solid #274247;
border-radius: 8px;
display: grid;
padding: 20px 40px;
width: 100%;
.title {
@include roboto;
font-weight: bold;
font-size: 20px;
}
.text {
margin-top: 10px;
}
}
}
}

.button-more {
left: -20px;
top: -30px;
position: relative;
}

@include media-breakpoint-down(lg) {
.title-container {
display: block;
margin-top: 2rem;
}

.filter-container {
.filter {
margin-top: 3rem;
margin-bottom: 4rem;
}
}

.timeline-container {
justify-content: start;
}

.timeline {
padding-left: 10px;
width: 100%;

.timeline-content {
width: calc(100% + 10px);
left: -10px;

.events {
min-width: 0;
}

.event-box {
padding: 20px;
}
}
}

.button-more {
left: -10px;
}
}
}
1 change: 1 addition & 0 deletions src/main/resources/assets/styles/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ $container-max-widths: (
@import './statisticContact';
@import './popup';
@import './print';
@import './timeline';

body {
-moz-osx-font-smoothing: grayscale;
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ declare global {
export type StatisticDescription = _PartComponent<'mimir:statisticDescription'>
export type SubjectArticleList = _PartComponent<'mimir:subjectArticleList'>
export type Table = _PartComponent<'mimir:table'>
export type Timeline = _PartComponent<'mimir:timeline'>
export type UpcomingReleases = _PartComponent<'mimir:upcomingReleases'>
export type Variables = _PartComponent<'mimir:variables'>
export type VideoEmbed = _PartComponent<'mimir:videoEmbed'>
Expand Down
69 changes: 69 additions & 0 deletions src/main/resources/lib/types/partTypes/timeline.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
export interface TimelineProps {
title: string
ingress: string
timelineElements: TimelineElement[]
showFilter: boolean
showMoreButtonText: string
countYear: number
}

export interface TimelineElement {
year: string
event: TimelineEvent[]
//event?: TimelineEvent | TimelineEvent[]
}

export interface TimelineEvent {
eventType: string
title: string
text?: string
directorImage?: string
directorImageAltText?: string
timelineCategory?: string
targetUrl?: string
}
export interface SimpleBox {
title: string
text?: string
timelineCategory: string
urlContentSelector?: hrefManual | hrefContent
}

export interface ExpansionBox {
title: string
text?: string
timelineCategory: string
}

export interface DirectorBox {
title: string
text?: string
directorImage?: string
urlContentSelector?: hrefManual | hrefContent
}

export interface Event {
simpleBox?: SimpleBox
expansionBox?: ExpansionBox
directorBox?: DirectorBox
_selected: 'simpleBox' | 'expansionBox' | 'directorBox'
}

export interface TimelineItemSet {
year: string
event: Event[]
}

interface hrefManual {
_selected: 'optionLink'
optionLink: {
link?: string
}
}

interface hrefContent {
_selected: 'optionXPContent'
optionXPContent: {
xpContent?: string
}
}
1 change: 1 addition & 0 deletions src/main/resources/site/i18n/phrases.properties
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@ highcharts.legendLabelNoTitle = Bytt synlighet på serie, {chartTitle}

button.showMore = Vis flere
button.showAll = Vis alle
button.showMoreYears = Vis flere år
methodsAndDocumentation = Metoder og dokumentasjon

nameSearch.title = Navnesøk
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/site/i18n/phrases_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@ highcharts.legendLabelNoTitle = Toggle series visibility, {chartTitle}

button.showMore = Show more
button.showAll = Show all
button.showMoreYears = Show more years
methodsAndDocumentation = Methods and documentation

nameSearch.title = Name search
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/site/i18n/phrases_nn.properties
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ highcharts.legendLabelNoTitle = Bytt synlighet på serie, {chartTitle}

button.showMore = Vis fleire
button.showAll = Vis alle
button.showMoreYears = Vis fleire år
methodsAndDocumentation = Metoder og dokumentasjon

nameSearch.title = Namnsøk
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<mixin>
<display-name>Lenke</display-name>
<form>
<option-set name="urlContentSelector">
<label>Lenke</label>
<expanded>false</expanded>
<occurrences minimum="0" maximum="1"/>
<options minimum="0" maximum="1">
<option name="optionLink">
<label>URL</label>
<items>
<input name="link" type="TextLine">
<label>Lenke</label>
<occurrences minimum="0" maximum="1"/>
</input>
</items>
</option>
<option name="optionXPContent">
<label>XP-innhold</label>
<items>
<input name="xpContent" type="ContentSelector">
<label>Innhold i XP</label>
<occurrences minimum="0" maximum="1"/>
<config>
<allowPath>${site}</allowPath>
</config>
</input>
</items>
</option>
</options>
</option-set>
</form>
</mixin>
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<mixin>
<display-name>Hendelsestype Tidslinje</display-name>
<form>
<input name="timelineCategory" type="RadioButton">
<label>Hendelsestype</label>
<occurrences minimum="1" maximum="1"/>
<config>
<option value="statistic">Statistikk</option>
<option value="aboutSsb">Om SSB</option>
</config>
<default>aboutSsb</default>
</input>
</form>
</mixin>
Loading
Loading