Skip to content

Commit

Permalink
Merge branch 'staging' into main-into-stage
Browse files Browse the repository at this point in the history
  • Loading branch information
@MagicLegend
MagicLegend authored Aug 1, 2024
2 parents 7d4c931 + f78dda5 commit 87a0361
Show file tree
Hide file tree
Showing 31 changed files with 753 additions and 123 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ out
# Package dependencies
node_modules/
/npm-debug.log

# Compilation results from the SCSS transpiler
resources/
97 changes: 97 additions & 0 deletions admin/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,12 @@ collections:
name: "button_text"
widget: "string"
i18n: true
required: false
- label: "Button url"
name: "button_url"
widget: "string"
i18n: true
required: false
- label: "FAQ groups"
name: "faqgroups"
widget: list
Expand Down Expand Up @@ -1290,6 +1292,100 @@ collections:
required: false,
}

######################################
# SECTION: Why our work matters
####

# PAGE: !Why our work matters #####################################################
- name: "why-our-work-matters"
label: "Why our work matters"
folder: "content/why-our-work-matters"
slug: "_index"
create: false
i18n: true
fields:
- label: "Title"
name: "title"
widget: "string"
default: "Why our work matters"
required: false
i18n: true
- label: "Intro"
name: "intro"
widget: text
required: false
i18n: true
- label: "Left content block"
name: "leftblock"
i18n: true
widget: "object"
fields:
- label: "Content"
name: "content"
widget: "markdown"
i18n: true
- {
label: "Image",
name: "image",
widget: "image",
public_folder: "/images/",
media_folder: "/assets/images/",
required: false,
}
- {
label: alt,
name: "Alt tag for image",
widget: string,
required: false,
i18n: true,
}
- label: "Learn More"
name: "learnmore"
widget: "string"
required: false
i18n: true
- label: "Right content block"
name: "rightblock"
i18n: true
widget: "object"
fields:
- label: "Content"
name: "content"
widget: "markdown"
i18n: true
- {
label: "Image",
name: "image",
widget: "image",
public_folder: "/images/",
media_folder: "/assets/images/",
required: false,
}
- {
label: alt,
name: "Alt tag for image",
widget: string,
required: false,
i18n: true,
}
- label: "Learn More"
name: "learnmore"
widget: "string"
required: false
i18n: true
- label: "Content Title"
name: "contenttitle"
widget: "markdown"
i18n: true
- label: "Body"
name: "body"
widget: "markdown"
i18n: true
- label: "Below woordenboek"
name: "belowwoordenboek"
widget: "markdown"
i18n: true

########################################################################
# CONTENT BLOCKS
########################################################################
Expand Down Expand Up @@ -1335,6 +1431,7 @@ collections:
search_fields: ["title", "case.caseid"]
value_field: "/newsroom/articles/{{slug}}"
display_fields: ["title", "case.caseid"]
required: false
multiple: true

# BLOCK: Our mission #####################################################
Expand Down
97 changes: 97 additions & 0 deletions admin/development/config-dev.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,12 @@ collections:
name: "button_text"
widget: "string"
i18n: true
required: false
- label: "Button url"
name: "button_url"
widget: "string"
i18n: true
required: false
- label: "FAQ groups"
name: "faqgroups"
widget: list
Expand Down Expand Up @@ -1290,6 +1292,100 @@ collections:
required: false,
}

######################################
# SECTION: Why our work matters
####

# PAGE: !Why our work matters #####################################################
- name: "why-our-work-matters"
label: "Why our work matters"
folder: "content/why-our-work-matters"
slug: "_index"
create: false
i18n: true
fields:
- label: "Title"
name: "title"
widget: "string"
default: "Why our work matters"
required: false
i18n: true
- label: "Intro"
name: "intro"
widget: text
required: false
i18n: true
- label: "Left content block"
name: "leftblock"
i18n: true
widget: "object"
fields:
- label: "Content"
name: "content"
widget: "markdown"
i18n: true
- {
label: "Image",
name: "image",
widget: "image",
public_folder: "/images/",
media_folder: "/assets/images/",
required: false,
}
- {
label: alt,
name: "Alt tag for image",
widget: string,
required: false,
i18n: true,
}
- label: "Learn More"
name: "learnmore"
widget: "string"
required: false
i18n: true
- label: "Right content block"
name: "rightblock"
i18n: true
widget: "object"
fields:
- label: "Content"
name: "content"
widget: "markdown"
i18n: true
- {
label: "Image",
name: "image",
widget: "image",
public_folder: "/images/",
media_folder: "/assets/images/",
required: false,
}
- {
label: alt,
name: "Alt tag for image",
widget: string,
required: false,
i18n: true,
}
- label: "Learn More"
name: "learnmore"
widget: "string"
required: false
i18n: true
- label: "Content Title"
name: "contenttitle"
widget: "markdown"
i18n: true
- label: "Body"
name: "body"
widget: "markdown"
i18n: true
- label: "Below woordenboek"
name: "belowwoordenboek"
widget: "markdown"
i18n: true

########################################################################
# CONTENT BLOCKS
########################################################################
Expand Down Expand Up @@ -1335,6 +1431,7 @@ collections:
search_fields: ["title", "case.caseid"]
value_field: "/newsroom/articles/{{slug}}"
display_fields: ["title", "case.caseid"]
required: false
multiple: true

# BLOCK: Our mission #####################################################
Expand Down
97 changes: 97 additions & 0 deletions admin/staging/config-staging.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,12 @@ collections:
name: "button_text"
widget: "string"
i18n: true
required: false
- label: "Button url"
name: "button_url"
widget: "string"
i18n: true
required: false
- label: "FAQ groups"
name: "faqgroups"
widget: list
Expand Down Expand Up @@ -1290,6 +1292,100 @@ collections:
required: false,
}

######################################
# SECTION: Why our work matters
####

# PAGE: !Why our work matters #####################################################
- name: "why-our-work-matters"
label: "Why our work matters"
folder: "content/why-our-work-matters"
slug: "_index"
create: false
i18n: true
fields:
- label: "Title"
name: "title"
widget: "string"
default: "Why our work matters"
required: false
i18n: true
- label: "Intro"
name: "intro"
widget: "markdown"
required: false
i18n: true
- label: "Left content block"
name: "leftblock"
i18n: true
widget: "object"
fields:
- label: "Content"
name: "content"
widget: "markdown"
i18n: true
- {
label: "Image",
name: "image",
widget: "image",
public_folder: "/images/",
media_folder: "/assets/images/",
required: false,
}
- {
label: alt,
name: "Alt tag for image",
widget: string,
required: false,
i18n: true,
}
- label: "Learn More"
name: "learnmore"
widget: "string"
required: false
i18n: true
- label: "Right content block"
name: "rightblock"
i18n: true
widget: "object"
fields:
- label: "Content"
name: "content"
widget: "markdown"
i18n: true
- {
label: "Image",
name: "image",
widget: "image",
public_folder: "/images/",
media_folder: "/assets/images/",
required: false,
}
- {
label: alt,
name: "Alt tag for image",
widget: string,
required: false,
i18n: true,
}
- label: "Learn More"
name: "learnmore"
widget: "string"
required: false
i18n: true
- label: "Content Title"
name: "contenttitle"
widget: "markdown"
i18n: true
- label: "Body"
name: "body"
widget: "markdown"
i18n: true
- label: "Below woordenboek"
name: "belowwoordenboek"
widget: "markdown"
i18n: true

########################################################################
# CONTENT BLOCKS
########################################################################
Expand Down Expand Up @@ -1335,6 +1431,7 @@ collections:
search_fields: ["title", "case.caseid"]
value_field: "/newsroom/articles/{{slug}}"
display_fields: ["title", "case.caseid"]
required: false
multiple: true

# BLOCK: Our mission #####################################################
Expand Down
Binary file added assets/images/98fdbad4-a946-452a-b851-6eceab04a0eb.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Schermafbeelding 2024-08-01 122340.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions assets/scss/core.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -762,3 +762,20 @@ table.donations {
}
}
}

.iframe-container {
position: relative;
width: 100%;
padding-bottom: 62.5%; /* Aspect ratio: 750/1200 = 0.625 */
height: 0;
overflow: hidden;
}

.iframe-container iframe {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
border: 0;
}
Loading

0 comments on commit 87a0361

Please sign in to comment.