Skip to content

Commit

Permalink
feat: smaller font size and rearrange homepage on mobile, instagram a…
Browse files Browse the repository at this point in the history 
…nd youtube for orgs
  • Loading branch information
@joaquimds
joaquimds committed Nov 7, 2023
1 parent 0c94710 commit 817daf1
Show file tree
Hide file tree
Showing 9 changed files with 75 additions and 17 deletions.
3 changes: 3 additions & 0 deletions web/app/themes/awasqa/assets/images/instagram.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions web/app/themes/awasqa/assets/images/youtube.svg
View file
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 web/app/themes/awasqa/functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
// WPML logic
require_once(__DIR__ . '/src/wpml.php');

$ver = "1.5";
$ver = "1.6";
add_action('wp_enqueue_scripts', function () use ($ver) {
wp_enqueue_style(
'awasqa',
Expand Down
13 changes: 13 additions & 0 deletions web/app/themes/awasqa/script.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
const LOCALE = document.documentElement.lang || 'en-GB'
const USER_DATA = window.USER_DATA

// Rearrange blocks on mobile
if (window.innerWidth < 782) {
const categories = document.querySelector('.home .wp-block-categories-list')
if (categories) {
const column = categories.closest('.wp-block-column')
const columns = column.parentElement
columns.removeChild(column)
const group = columns.nextElementSibling
group.appendChild(column)
column.style.marginBottom = "6rem";
}
}

// Apply orange filter to Radical Resilience block
document.querySelectorAll(".awasqa-radical-resilience").forEach((block) => {
const figure = block.querySelector("figure")
Expand Down
25 changes: 15 additions & 10 deletions web/app/themes/awasqa/src/carbon-fields-blocks.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,29 +222,34 @@ function get_issue_options()
} else {
$org = get_post();
}
$email = Awasqa\CarbonFields\awasqa_carbon_get_post_meta($org->ID, 'email');
$twitter = Awasqa\CarbonFields\awasqa_carbon_get_post_meta($org->ID, 'twitter');
$facebook = Awasqa\CarbonFields\awasqa_carbon_get_post_meta($org->ID, 'facebook');
$instagram = Awasqa\CarbonFields\awasqa_carbon_get_post_meta($org->ID, 'instagram');
$youtube = Awasqa\CarbonFields\awasqa_carbon_get_post_meta($org->ID, 'youtube');
?>
<div class="awasqa-org-contact-details">
<?php if ($email) : ?>
<h3><?= __('Email', 'awasqa') ?></h3>
<a class="awasqa-org-contact-details__email" href="mailto:<?= $email ?>">
<?= $email ?>
</a>
<?php endif; ?>
<?php if ($twitter || $facebook) : ?>
<?php if ($twitter || $facebook || $instagram || $youtube) : ?>
<h3><?= __('Social Media', 'awasqa') ?></h3>
<?php if ($twitter) : ?>
<a class="awasqa-org-contact-details__twitter" href="<?= $twitter ?>">
<a class="awasqa-org-contact-details__twitter" href="<?= $twitter ?>" target="_blank">
Twitter
</a>
<?php endif; ?>
<?php if ($facebook) : ?>
<a class="awasqa-org-contact-details__facebook" href="<?= $facebook ?>">
<a class="awasqa-org-contact-details__facebook" href="<?= $facebook ?>" target="_blank">
Facebook
</a>
<?php endif; ?>
<?php if ($instagram) : ?>
<a class="awasqa-org-contact-details__instagram" href="<?= $instagram ?>" target="_blank">
Instagram
</a>
<?php endif; ?>
<?php if ($youtube) : ?>
<a class="awasqa-org-contact-details__youtube" href="<?= $youtube ?>" target="_blank">
YouTube
</a>
<?php endif; ?>
<?php endif; ?>
</div>
<?php
Expand Down
3 changes: 2 additions & 1 deletion web/app/themes/awasqa/src/carbon-fields.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,10 @@ function add_user_to_organisation($org_id, $user_id)
Container::make('post_meta', 'Contact')
->where('post_type', '=', 'awasqa_organisation')
->add_fields(array(
Field::make('text', 'email', 'Email address')->set_attribute('type', 'email'),
Field::make('text', 'twitter', 'Twitter URL')->set_attribute('type', 'url'),
Field::make('text', 'facebook', 'Facebook URL')->set_attribute('type', 'url'),
Field::make('text', 'instagram', 'Instagram URL')->set_attribute('type', 'url'),
Field::make('text', 'youtube', 'Youtube URL')->set_attribute('type', 'url'),
));

Container::make('post_meta', 'Members')
Expand Down
19 changes: 16 additions & 3 deletions web/app/themes/awasqa/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,9 +338,12 @@ h6::after {
.wp-block-site-title {
text-transform: uppercase;
}
.has-xx-large-font-size {
font-size: var(--wp--preset--font-size--x-large) !important;
}
@media (min-width: 782px) {
.has-xx-large-font-size {
font-size: var(--wp--preset--font-size--x-large) !important;
font-size: var(--wp--preset--font-size--xx-large) !important;
}
}
.awasqa-edit-organisation-action ul {
Expand Down Expand Up @@ -571,21 +574,31 @@ footer .wp-block-image img {
.awasqa-org-contact-details__email {
margin: 1rem 0 2.5rem;
}
.awasqa-org-contact-details__facebook::before, .awasqa-org-contact-details__twitter::before {
.awasqa-org-contact-details__facebook::before, .awasqa-org-contact-details__twitter::before, .awasqa-org-contact-details__instagram::before, .awasqa-org-contact-details__youtube::before {
content: "";
background-image: url('/app/themes/awasqa/assets/images/facebook.svg');
background-position: center;
background-repeat: no-repeat;
background-size: contain;
height: 24px;
margin-right: 0.25rem;
width: 24px;
}
.awasqa-org-contact-details__facebook,.awasqa-org-contact-details__twitter {
.awasqa-org-contact-details__facebook,
.awasqa-org-contact-details__twitter,
.awasqa-org-contact-details__instagram,
.awasqa-org-contact-details__youtube {
margin: 1rem 0;
}
.awasqa-org-contact-details__twitter::before {
background-image: url('/app/themes/awasqa/assets/images/twitter.svg');
}
.awasqa-org-contact-details__instagram::before {
background-image: url('/app/themes/awasqa/assets/images/instagram.svg');
}
.awasqa-org-contact-details__youtube::before {
background-image: url('/app/themes/awasqa/assets/images/youtube.svg');
}
.awasqa_organisation .wp-block-post-featured-image {
background-color: #fff;
border-radius: 0.5rem;
Expand Down
18 changes: 17 additions & 1 deletion web/app/themes/awasqa/styles/blocks/org-contact-details.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,16 @@
margin: 1rem 0 2.5rem;
}

.awasqa-org-contact-details__facebook,.awasqa-org-contact-details__twitter {
.awasqa-org-contact-details__facebook,
.awasqa-org-contact-details__twitter,
.awasqa-org-contact-details__instagram,
.awasqa-org-contact-details__youtube {
&::before {
content: "";
background-image: url('/app/themes/awasqa/assets/images/facebook.svg');
background-position: center;
background-repeat: no-repeat;
background-size: contain;
height: 24px;
margin-right: 0.25rem;
width: 24px;
Expand All @@ -40,4 +44,16 @@
&::before {
background-image: url('/app/themes/awasqa/assets/images/twitter.svg');
}
}

.awasqa-org-contact-details__instagram {
&::before {
background-image: url('/app/themes/awasqa/assets/images/instagram.svg');
}
}

.awasqa-org-contact-details__youtube {
&::before {
background-image: url('/app/themes/awasqa/assets/images/youtube.svg');
}
}
6 changes: 5 additions & 1 deletion web/app/themes/awasqa/styles/wp.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,12 @@
text-transform: uppercase;
}

.has-xx-large-font-size {
font-size: var(--wp--preset--font-size--x-large) !important;
}

@media (min-width: 782px) {
.has-xx-large-font-size {
font-size: var(--wp--preset--font-size--x-large) !important;
font-size: var(--wp--preset--font-size--xx-large) !important;
}
}

0 comments on commit 817daf1

Please sign in to comment.