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.

Sign up for GitHub

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

release versions/v1.6.1 #827

Merged
merged 11 commits into from
Nov 23, 2023
Merged

release versions/v1.6.1 #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c60b41d
chore: Update all outdated drupal/* packages.
unocha-jenkins Nov 23, 2023
68702ed
HPC-9292: Update styles for embedded stories
berliner Nov 23, 2023
ec3b4db
Merge pull request #823 from UN-OCHA/berliner/HPC-9292
berliner Nov 23, 2023
113143f
Merge pull request #821 from UN-OCHA/update/patch-4f2cf84
berliner Nov 23, 2023
678c598
Don't show year switcher on global section nodes
berliner Nov 23, 2023
5334553
Merge pull request #824 from UN-OCHA/berliner/global-section-year-swi…
berliner Nov 23, 2023
c4ae8dd
HPC-9276: Show megamenu bottom border also on small screens
berliner Nov 23, 2023
cbf7640
HPC-9104: Temporarilly disable search until solr is available in prod
berliner Nov 23, 2023
75edbb9
Merge pull request #825 from UN-OCHA/berliner/HPC-9276
berliner Nov 23, 2023
1207a55
Merge pull request #826 from UN-OCHA/berliner/HPC-9104
berliner Nov 23, 2023
ef80470
Merge branch 'develop' into release-versions/v1.6.1
berliner Nov 23, 2023
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
92 changes: 46 additions & 46 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/block.block.exposedformsearch_solrpage_search_results.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
uuid: 3f8ba6f4-c9c3-4628-b231-6e245b6fd1f8
langcode: en
status: true
status: false
dependencies:
config:
- views.view.search_solr
Expand Down
3 changes: 3 additions & 0 deletions html/modules/custom/ghi_blocks/ghi_blocks.theme.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,9 @@ function ghi_blocks_preprocess_section_switcher(&$variables) {
}
}
foreach ($sections as $key => $section) {
if (empty($labels[$key])) {
continue;
}
$label = $labels[$key];
if (count(array_keys($labels, $label)) > 1 && !empty($label_additions[$key])) {
// We need to add an additional element to distinguish non-unique labels.
Expand Down
6 changes: 5 additions & 1 deletion html/modules/custom/ghi_blocks/src/Plugin/Block/Menu/SectionSwitcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ public static function create(ContainerInterface $container, array $configuratio
* {@inheritdoc}
*/
public function build() {
$section = $this->getSectionNode();
if ($section instanceof GlobalSection) {
return;
}
$sections = $this->buildSectionSwitcherOptions();
if (!$sections) {
return [];
Expand All @@ -104,7 +108,7 @@ public function build() {
'#theme' => 'section_switcher',
'#title' => $this->t('Other years'),
'#sections' => $sections,
'#current_section' => $this->getSectionNode(),
'#current_section' => $section,
];
return $build;
}
Expand Down
13 changes: 8 additions & 5 deletions html/themes/custom/common_design_subtheme/components/gho-story/gho-story.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@
position: relative;
}
.gho-story .media-caption {
padding: 1rem 0 0.5rem 0;
margin-bottom: 0.5rem;
border-bottom: 1px solid #fff;
padding: 1rem 0 0.5rem 0;
color: #fff;
border-bottom: 1px solid #fff;
font-size: 0.75rem;
}
@media (min-width: 768px) {
Expand All @@ -72,12 +72,15 @@
.gho-story .media-caption * {
display: inline;
}
.gho-story .media-caption .credit {
font-style: italic;
}
.gho-story .media-caption > div {
display: inline;
}
.gho-story .media-caption .double-field-first {
font-weight: bold;
}
.gho-story .media-caption .field--name-field-caption > *::after {
content: ".";
}
.gho-story .gho-caption {
margin: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion html/themes/custom/common_design_subtheme/css/styles.css
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions html/themes/custom/common_design_subtheme/sass/ghi/components/_entity-navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,8 @@ ul.links--entity-navigation {
}
}

@include tablet {
&.megamenu > div[data-cd-hidden=false] {
border-bottom: 2px solid var(--ghi-yellow);
}
&.megamenu > div[data-cd-hidden=false] {
border-bottom: 2px solid var(--ghi-yellow);
}

@include tablet {
Expand Down
Loading