Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
e7cc029
Merge pull request #13 from OpenSourceOrg/add/9-last-modified-date
bernattorras Aug 25, 2023
e31603b
Merge pull request #14 from OpenSourceOrg/add/9-last-modified-date
bernattorras Aug 28, 2023
0306496
Merge pull request #17 from OpenSourceOrg/add/25/change-cpt-name
bernattorras Sep 8, 2023
155e593
Added "No Header with title" template
bernattorras Nov 8, 2023
7e476cd
Merge pull request #23 from OpenSourceOrg/add/dev/19-webinar-template
bernattorras Nov 8, 2023
734ea01
Added a footer sidebar and removed max-width limitation
bernattorras Nov 16, 2023
983aef6
Merge pull request #25 from OpenSourceOrg/add/dev/21/footer-credits
bernattorras Nov 16, 2023
0101524
Update blog archive page
NickGreen Jan 18, 2024
ca4370d
Merge branch 'develop' into update/blog-import
NickGreen Jan 18, 2024
c257c30
Merge pull request #41 from OpenSourceOrg/update/blog-import
NickGreen Jan 18, 2024
9e4825e
Fix overlapping content on event archives page
Vrishabhsk Jan 19, 2024
f7efcd0
Replace $0.0 Per Ticket with Free Event
Vrishabhsk Jan 19, 2024
e857a8b
Set upcoming events as default for archive page
Vrishabhsk Jan 19, 2024
6f1a2b3
Fix broken layout on mobile viewports
Vrishabhsk Jan 19, 2024
6a05ae4
Replace pre_get_posts with template_redirect
Vrishabhsk Jan 22, 2024
127ab20
Modified sugar-calendar functions
Vrishabhsk Jan 22, 2024
a172e78
Merge pull request #1 from Vrishabhsk/fix/VJ-31-overlapping
Vrishabhsk Jan 23, 2024
b7c5769
Merge branch 'develop' into fix/VJ-40-responsive
Vrishabhsk Jan 23, 2024
4dc2099
Merge pull request #44 from Vrishabhsk/fix/VJ-31-overlapping
ahegyes Jan 23, 2024
f1f5f26
Merge pull request #5 from Vrishabhsk/fix/VJ-40-responsive
Vrishabhsk Jan 23, 2024
0bb016c
Merge pull request #46 from Vrishabhsk/fix/VJ-40-responsive
ahegyes Jan 23, 2024
ce1656b
Fix conditional
Vrishabhsk Jan 24, 2024
55b2f63
Merge pull request #3 from Vrishabhsk/fix/VJ-36-weird-chars
Vrishabhsk Jan 24, 2024
3142e58
Merge branch 'develop' into fix/VJ-37-events-order
Vrishabhsk Jan 24, 2024
c45d31e
Merge pull request #4 from Vrishabhsk/fix/VJ-37-events-order
Vrishabhsk Jan 24, 2024
fa03320
Fix PHPCS
Vrishabhsk Jan 24, 2024
722592e
Merge branch 'fix/VJ-37-events-order' into fix/VJ-36-weird-chars
Vrishabhsk Jan 24, 2024
4b51bcd
Fix PHPCS
Vrishabhsk Jan 24, 2024
6f0de60
Merge branch 'fix/VJ-36-weird-chars' into develop
Vrishabhsk Jan 24, 2024
ee9e857
Update auto-generated readmore to match blog site
NickGreen Jan 24, 2024
9de9460
Merge pull request #48 from Vrishabhsk/fix/VJ-36-weird-chars
ahegyes Jan 25, 2024
ac8f5b4
Merge branch 'develop' into develop
Vrishabhsk Jan 25, 2024
671f7aa
Merge pull request #50 from Vrishabhsk/develop
ahegyes Jan 26, 2024
0669ed1
Remove featured image from 'posts'
NickGreen Feb 1, 2024
c8220de
Restore comments section & email signup block
NickGreen Feb 1, 2024
8f12c8b
Merge pull request #52 from OpenSourceOrg/update/blog-import
NickGreen Feb 1, 2024
35e792c
Protecting against Sugar Calendar deactivation
NickGreen Mar 15, 2024
65978c8
Merge pull request #67 from OpenSourceOrg/merge/pr_66_to_dev
NickGreen Mar 15, 2024
f241c9d
Second try for autodeployment
NickGreen Mar 15, 2024
4c95352
Merge pull request #68 from OpenSourceOrg/merge/pr_66_to_dev
NickGreen Mar 15, 2024
2b0f2b7
Third try for autodeployment
NickGreen Mar 15, 2024
0de018c
Merge pull request #69 from OpenSourceOrg/merge/pr_66_to_dev
NickGreen Mar 15, 2024
c38d1ed
Add single license page sidebar widget area
nickpagz May 11, 2024
3178b43
re-compile style sheet
nickpagz May 11, 2024
6d93c3b
Initial pass at styling the donation form
nickpagz May 22, 2024
5175778
Delay loading styling JS until remote form is loaded
nickpagz May 22, 2024
6772353
Fix multiple issues with header menu
geoffguillain Jul 29, 2024
ce96904
Merge pull request #106 from OpenSourceOrg/fix/menu-header
geoffguillain Jul 29, 2024
2017972
Fix menu position while admin bar is on
geoffguillain Jul 29, 2024
bf3d09a
Merge pull request #107 from OpenSourceOrg/fix/menu-header
geoffguillain Jul 29, 2024
e398954
Merge remote-tracking branch 'origin/develop' into add/donation-widge…
nickpagz Jul 31, 2024
fddf777
donation-form tweaks
nickpagz Jul 31, 2024
2012e5c
Re-compile scss
nickpagz Jul 31, 2024
955f0a5
Re-sync with current develop branch
nickpagz Jul 31, 2024
754e743
Merge pull request #108 from OpenSourceOrg/add/donation-widget-licens…
nickpagz Jul 31, 2024
33acdf0
Change mobile button menu size to pixels
geoffguillain Aug 12, 2024
6dd5f29
Merge pull request #109 from OpenSourceOrg/fix/menu-header
geoffguillain Aug 12, 2024
9f74a04
Fix image width issue on Safari
geoffguillain Aug 19, 2024
fe47229
Merge pull request #113 from OpenSourceOrg/fix/menu-header
geoffguillain Aug 19, 2024
827a4c9
Fix logo on safari ios
geoffguillain Aug 19, 2024
2fafadc
Merge branch 'develop' into fix/menu-header
geoffguillain Aug 20, 2024
a77b87a
Merge pull request #114 from OpenSourceOrg/fix/menu-header
geoffguillain Aug 20, 2024
3d8efc2
Move comment section
geoffguillain Aug 27, 2024
82bfa48
linting errors
geoffguillain Aug 27, 2024
c221e73
Merge pull request #117 from OpenSourceOrg/fix/discourse-comment-temp…
geoffguillain Aug 27, 2024
01f9f19
Add header to the discourse comment link output
geoffguillain Aug 27, 2024
465ade8
Merge pull request #119 from OpenSourceOrg/fix/discourse-comment-temp…
geoffguillain Aug 27, 2024
9f76430
Always display comment block
geoffguillain Aug 28, 2024
e65759f
Merge pull request #121 from OpenSourceOrg/fix/discourse-comment-temp…
geoffguillain Aug 28, 2024
cca6bbf
Merge CSS from the customizer for comments
geoffguillain Sep 4, 2024
314a973
Merge pull request #123 from OpenSourceOrg/fix/discourse-comment-temp…
geoffguillain Sep 4, 2024
36db4da
Open non-osi content links on new tab
Vrishabhsk Sep 4, 2024
ae0f6d0
Fix PHPCS in newly added block of code
Vrishabhsk Sep 4, 2024
51cd342
Update function name
Vrishabhsk Sep 4, 2024
495a714
Merge pull request #125 from Vrishabhsk/feature/VJ-52-target-blank-dev
ahegyes Sep 4, 2024
fcc0ad4
Remove style manipulation for CiviCRM donation form integration
nickpagz Sep 9, 2024
6a14571
Merge pull request #126 from OpenSourceOrg/add/donation-widget-licens…
nickpagz Sep 9, 2024
dbef8dc
Tweak sidebar box-sizing for mobile
nickpagz Sep 9, 2024
12997c3
recompile style sheets
nickpagz Sep 9, 2024
1902575
Merge pull request #127 from OpenSourceOrg/add/donation-widget-licens…
nickpagz Sep 9, 2024
2eea4c3
Verify EM plugin is active using fn_exists check
Vrishabhsk Sep 10, 2024
20f786a
Merge pull request #128 from Vrishabhsk/feature/VJ-52-target-blank-dev
ahegyes Sep 10, 2024
b796b25
Increase license page content width
nickpagz Sep 17, 2024
01a797b
Merge pull request #131 from OpenSourceOrg/add/donation-widget-licens…
nickpagz Sep 17, 2024
d7c43c3
Fix CPT taxonomies so they ignore the custom permalink structure.
nickpagz Sep 20, 2024
0b18db4
Merge pull request #134 from OpenSourceOrg/fix/taxonomy-permalinks-de…
nickpagz Sep 20, 2024
29a597b
Add comments section to single license template part
nickpagz Sep 20, 2024
61a5187
Merge pull request #135 from OpenSourceOrg/add/license-comments-field…
nickpagz Sep 20, 2024
2ba5667
Tweak css to hide background when no comments
nickpagz Sep 20, 2024
8b91008
recompile stylesheet
nickpagz Sep 20, 2024
dac9391
Merge pull request #137 from OpenSourceOrg/add/license-comments-field…
nickpagz Sep 20, 2024
e490203
Trim the Discourse comment body to 50 words
geoffguillain Sep 26, 2024
f95840d
Linting errors
geoffguillain Sep 26, 2024
d4c031a
Fix linting
geoffguillain Sep 26, 2024
0b5240b
Merge pull request #138 from OpenSourceOrg/fix/discourse-preview
geoffguillain Sep 26, 2024
cfd15d4
Only limit the number of posts to account for the sticky blog on page…
gin0115 Nov 11, 2024
5748533
Merge pull request #146 from gin0115/fix/gh144-only-11-board-members-…
ahegyes Nov 11, 2024
f557d2b
Create new page template similar to the No Page Header but wider
mlaetitia Nov 14, 2024
5ae77c1
Linter errors - removing blank line from while cycle code
mlaetitia Nov 15, 2024
b7d9848
Merge pull request #148 from OpenSourceOrg/add/new-page-template-nohe…
mlaetitia Nov 15, 2024
c3474af
Fixes issue where no pronoun hides the role
gin0115 Nov 19, 2024
94c71f0
Fix simple liniting issues
gin0115 Nov 19, 2024
3b7a05b
Ensure all translations are run throgh esc_x
gin0115 Nov 19, 2024
369e072
Merge pull request #150 from gin0115/feature/gh144-allow-role-to-show…
ahegyes Nov 19, 2024
6015863
Styling of the new Wide template
mlaetitia Nov 28, 2024
1aeeb59
Merge pull request #153 from OpenSourceOrg/update/new-wide-template-r…
mlaetitia Nov 28, 2024
238caeb
Added in css to ensure the clipping of bg image is hidden and doesnt …
gin0115 Nov 29, 2024
c6659ee
Added in the shortcode for rendering the supporters£
gin0115 Dec 2, 2024
1a1eeec
House Keeping
gin0115 Dec 2, 2024
b006789
Fix simple liniting issues
gin0115 Dec 2, 2024
80dfa64
Fix simple liniting issues
gin0115 Dec 2, 2024
35a93e3
Fix simple liniting issues
gin0115 Dec 2, 2024
51a307b
Fix simple liniting issues
gin0115 Dec 2, 2024
31076fb
Merge pull request #154 from gin0115/fix/gh152-fix-firefox-print-prev…
ahegyes Dec 2, 2024
fa6846d
New wide page template - make changes to all elements styles
mlaetitia Dec 6, 2024
67ef2c8
New wide page template - make changes to all elements styles
mlaetitia Dec 6, 2024
a5fbb84
build files
mlaetitia Dec 6, 2024
03af363
Merge pull request #158 from OpenSourceOrg/update/wide-template-chang…
mlaetitia Dec 6, 2024
b038cae
First stab at getting Contact 7 > ACF integration
Jan 10, 2025
90c1775
Trying to get verbosity of errors
Jan 10, 2025
8a55d61
Fixing WPCF typo
Jan 10, 2025
e5a3572
Adding WPCF7 debug
Jan 10, 2025
f4c56bb
Removing errors verbosity + adding quote field
Jan 10, 2025
bd37a90
Changing status for Pending Review
Jan 10, 2025
abd8a98
Adding Endorsement Type
Jan 10, 2025
d880f27
Fix Typo
Jan 10, 2025
8f6d232
Clean up
Jan 10, 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
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ themes/*
upgrade/*
uploads/*
languages/*
database/*
db.php

# Created by https://www.toptal.com/developers/gitignore/api/macos,linux,windows,node,yarn,composer,phpstorm+all,visualstudiocode,sublimetext
# Edit at https://www.toptal.com/developers/gitignore?templates=macos,linux,windows,node,yarn,composer,phpstorm+all,visualstudiocode,sublimetext
Expand Down Expand Up @@ -351,12 +353,14 @@ bh_unicode_properties.cache
GitHub.sublime-settings

### VisualStudioCode ###
.vscode/
.vscode/*
!.vscode/settings.json
.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/*.code-snippets
themes/osi/.vscode/settings.json

# Local History for Visual Studio Code
.history/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@ public function get_args() {

return wp_parse_args(
[
'rewrite' => array( 'slug' => 'license-category' ),
'rewrite' => array(
'slug' => 'license-category',
'with_front' => false,
),
],
parent::get_args()
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,11 @@ public function get_args() {
return wp_parse_args(
[
'hierarchical' => true,
'rewrite' => array( 'slug' => 'publication' ),
'rewrite' => array(
'slug' => 'publication',
'with_front' => false,
),

],
parent::get_args()
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ public function get_args() {
return wp_parse_args(
[
'hierarchical' => false,
'rewrite' => array( 'slug' => 'seat-type' ),
'rewrite' => array(
'slug' => 'seat-type',
'with_front' => false,
),
],
parent::get_args()
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,11 @@ public function get_args() {
return wp_parse_args(
[
'hierarchical' => false,
'rewrite' => array( 'slug' => 'status' ),
'rewrite' => array(
'slug' => 'about/board-of-directors',
'with_front' => false,
'hierarchical' => false,
),
],
parent::get_args()
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ public function get_args() {
return wp_parse_args(
[
'hierarchical' => false,
'rewrite' => array( 'slug' => 'steward' ),
'rewrite' => array(
'slug' => 'steward',
'with_front' => false,
),
],
parent::get_args()
);
Expand Down
136 changes: 105 additions & 31 deletions themes/osi/assets/css/editor-style.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion themes/osi/assets/css/editor-style.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion themes/osi/assets/js/build/vendor.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('jquery'), 'version' => 'e025ea38feca3ffa8690');
<?php return array('dependencies' => array('jquery'), 'version' => '9a08034ec8a2505dbde0');
2 changes: 1 addition & 1 deletion themes/osi/assets/js/build/vendor.js

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions themes/osi/assets/js/src/theme/discourse.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
document.addEventListener('DOMContentLoaded', function () {
// Select the discource div with the class 'wpdc-join-discussion'
const discussionDiv = document.querySelector('.wpdc-join-discussion');

// Check if the element exists
if (discussionDiv) {
const heading = document.createElement('h3');
heading.classList.add('wp-block-heading');
heading.textContent = 'Join the discussion on Discourse!';
discussionDiv.insertBefore(heading, discussionDiv.firstChild);
}
});
4 changes: 4 additions & 0 deletions themes/osi/assets/scss/_4_elements.inputs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ form {
max-width: $contentMax;
}

.page-template-template-no-header-wide form {
max-width: $boxedMax
}

input[type="text"],
input[type="date"],
input[type="time"],
Expand Down
37 changes: 37 additions & 0 deletions themes/osi/assets/scss/_5_objects.layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@
}
}

.page-template-template-no-header-wide .content.has_no_sidebar, .page-template-template-no-header-wide footer{
.content--page article:not(.archive), .comments, .archive-press-mentions {
max-width: inherit !important;
margin-left: auto !important;
margin-right: auto !important;
}
}

.content.has_no_sidebar, footer {
.alignwide {
// @extend %alignwide;
Expand Down Expand Up @@ -88,6 +96,35 @@
}
}
}

.single-license & {
.content--page article:not(.archive), .comments {
max-width: $boxedMax !important;

.alignwide {
@extend %alignwide;
}
.alignfull {
@extend %alignfull;
}
.alignwide.email-block {
max-width: none !important;
}
}

.license-comments {
background: #f0E68C;
padding: 2rem;

.wp-block-heading {
margin-top: 0;
}

&:not(:has(h2)):not(:has(.wp-block-heading)) {
background: none;
}
}
}
}

.alignfull {
Expand Down
92 changes: 40 additions & 52 deletions themes/osi/assets/scss/_5_objects.structure.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
body > .wrapper {
body>.wrapper {
background: transparent;
font-size: $textFontSize;
min-height: 100%;
Expand All @@ -8,9 +8,8 @@ body > .wrapper {
position: relative;
@include multi-transition('margin-left .2s ease-out, margin-right .2s ease-out, left .2s ease-out');
z-index: 1;

&:after {
content: '';
content: '';
background-color: $Nlightest;
position: absolute;
width: 100vw;
Expand All @@ -23,106 +22,95 @@ body > .wrapper {
mask-repeat: no-repeat;
z-index: -1;
}

}

@media print {
// Esnure the background is not printed
body>.wrapper::after {
content: none !important;
display: none !important;
visibility: hidden !important;
}
}

.content {
padding: 0;
// padding: 0 $smallPadding; // for a boxed width background with sidebar only
padding-top: $paddingTopMobile; // for fixed-position header, adjust to match header size

@media only screen and ( max-width: 1200px ) {
@media only screen and ( max-width: 1200px) {
padding-top: 0;
}

&.inner-padding {
padding: 0 $smallPadding;
}

.content-full .content--page {
max-width: $boxedMax; // for a boxed width background with no sidebar
padding: 0 $smallPadding; // for a boxed width background with no sidebar
}

.content--page.no-title {
padding-bottom: 0 !important;
padding-top: 0 !important;
padding-bottom: 0 !important;
padding-top: 0 !important;
}

.content--inner {
max-width: $boxedMax; // for a boxed width background with no sidebar
max-width: $boxedMax; // for a boxed width background with no sidebar
}

&.has_sidebar {
max-width: $boxedMax; // for a boxed width background with sidebar only
padding: $paddingTopMobile $smallPadding 0 $smallPadding; // for a boxed width background with sidebar only

.content--inner {
max-width: none;
}
max-width: $boxedMax; // for a boxed width background with sidebar only
padding: $paddingTopMobile $smallPadding 0 $smallPadding; // for a boxed width background with sidebar only
.content--inner {
max-width: none;
}
}
}

@media only screen and (min-width: #{$break-small}) {
.content {
&.inner-padding {
padding: 0 $midPadding;
}

.content-full .content--page {
padding: 0 $midPadding; // for a boxed width background with no sidebar
margin: 0 auto;
}

&.has_sidebar {
padding: $paddingTopMobile $midPadding 0 $midPadding; // for a boxed width background with sidebar only
}
}
.content {
&.inner-padding {
padding: 0 $midPadding;
}
.content-full .content--page {
padding: 0 $midPadding; // for a boxed width background with no sidebar
margin: 0 auto;
}
&.has_sidebar {
padding: $paddingTopMobile $midPadding 0 $midPadding; // for a boxed width background with sidebar only
}
}
}

@media only screen and (min-width: #{$break-nav}) {

.content{
.content {
//padding-bottom:100px; // to account for position absolute footer
// padding-top: $paddingTop; // for fixed-position header, adjust to match header size

.content-full .content--page{
.content-full .content--page {
padding: 0 $maxPadding; // for a boxed width background with no sidebar
}

.content--page.no-title {
padding-top: 0;
padding-top: 0;
}

&.has_sidebar {
padding: $paddingTop $maxPadding 0 $maxPadding; // for a boxed width background with sidebar only
padding: $paddingTop $maxPadding 0 $maxPadding; // for a boxed width background with sidebar only
}

}
}

@media only screen and (min-width: #{$break-xlarge}) {

.content {
//padding-bottom: 150px; // to account for position absolute footer
}

.content-main {
padding-right: 1em;
@include pinkgrid($colspan:9, $padside:3%);
@include pinkrow($rowitems:2)
@include pinkgrid($colspan: 9, $padside: 3%);
@include pinkrow($rowitems: 2)
}
}

@media only screen and (min-width: #{$break-wide}) {
.content {
margin: 0 auto;
// padding-top: $paddingTop; // for fixed-position header, adjust to match header size
// padding-top: $paddingTop; // for fixed-position header, adjust to match header size
}

.content--inner {
margin: 0 auto;
margin: 0 auto;
}

}
}
20 changes: 20 additions & 0 deletions themes/osi/assets/scss/_6_components.comments.scss
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,23 @@
width: calc(100% - 5rem);
}
}

/* Discourse comments link */
.wpdc-join-discussion {
max-width: 730px;
background-color: #f2f3f2;
border: 1px solid #3ea638;
padding: 24px;
margin-left: 32px;
margin-right: 32px;
}

@media only screen and (min-width: 782px) {
.wpdc-join-discussion {
margin-left: 48px;
}
}

.wpdc-join-discussion h3 {
font-weight: 700;
}
4 changes: 4 additions & 0 deletions themes/osi/assets/scss/_6_components.content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ p, h1, h2, h3, h4, h5, h6, blockquote, ol, ul, dl, address {
max-width: $contentMax;
}

.page-template-template-no-header-wide .post--content > &, .page-template-template-no-header-wide .wp-block-group > & {
max-width: $boxedMax;
}

.footer & {
max-width: none !important;
}
Expand Down
Loading
Loading