Skip to content

Commit d76e26f

Browse files
authored
Merge pull request #198 from Emilia-Capital/develop
v1.0.2
2 parents bb84184 + b123376 commit d76e26f

33 files changed

+451
-166
lines changed

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
= 1.0.2 =
2+
3+
Fixed:
4+
5+
* Remove duplicated weekly suggested tasks.
6+
* The REST API endpoint for getting stats was broken, causing the weekly emails not to work.
7+
* Scrollable monthly badges widget was the wrong height on page load.
8+
* 2026 monthly badges were showing up and shouldn't (yet).
9+
10+
Enhancements:
11+
12+
* Refocus the "add new task" input after a to-do item is added.
13+
114
= 1.0.1 =
215

316
Fixed:

assets/css/dashboard-widgets/score.css

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#progress_planner_dashboard_widget_score {
22

33
.prpl-dashboard-widget {
4+
padding-top: 5px; /* Total 16px top spacing */
45
display: grid;
56
grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
67
grid-gap: calc(var(--prpl-gap) / 2);
@@ -36,12 +37,12 @@
3637
}
3738

3839
.prpl-dashboard-widget-footer {
39-
margin-top: 1em;
40-
padding-top: 1em;
40+
margin-top: 1rem;
41+
padding-top: 1rem;
4142
border-top: 1px solid #c3c4c7; /* same color as the one WP-Core uses */
4243
font-size: var(--prpl-font-size-base);
4344
display: flex;
44-
gap: 1em;
45+
gap: 0.5rem;
4546
align-items: center;
4647
}
4748
}

assets/css/onboard.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
min-height: 1px;
44
}
55

6-
#prpl-onboarding-form .prpl-form-fields label,
7-
#prpl-onboarding-submit-grid-wrapper {
6+
#prpl-onboarding-form .prpl-form-fields label {
87
display: grid;
98
grid-template-columns: 1fr 3fr;
109
margin-bottom: 0.5em;

assets/css/page-widgets/whats-new.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,5 @@
5757
border-radius: var(--prpl-border-radius);
5858
box-shadow: 5px 5px 5px var(--prpl-color-gray-2);
5959
border: 1px solid var(--prpl-color-gray-2);
60+
background-color: var(--prpl-color-gray-1); /* Fallback, if remote host image is not accessible */
6061
}

assets/css/welcome.css

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
.prpl-welcome {
2-
1+
.prpl-wrap.prpl-pp-not-accepted {
32
padding: 0;
4-
overflow-x: hidden;
5-
max-height: 80vh;
6-
width: 80vw;
7-
margin: 10vh 10vw;
8-
z-index: 9999;
3+
}
4+
5+
.prpl-welcome {
96

107
.inner-content {
118
padding: calc(var(--prpl-gap) * 1.5);
@@ -15,8 +12,13 @@
1512
grid-template-columns: repeat(auto-fit, minmax(20rem, 1fr));
1613
gap: calc(var(--prpl-gap) * 2);
1714

15+
.left {
16+
flex-grow: 1;
17+
}
18+
1819
img {
1920
max-width: 100%;
21+
width: 550px;
2022
height: auto;
2123
}
2224
}
@@ -45,4 +47,18 @@
4547
}
4648
}
4749
}
50+
51+
ul {
52+
list-style: disc;
53+
margin-left: 1rem;
54+
}
55+
56+
.prpl-onboard-form-radio-select {
57+
margin-top: 0.75rem;
58+
}
59+
60+
.prpl-disabled {
61+
opacity: 0.5;
62+
pointer-events: none;
63+
}
4864
}
16.9 KB
Loading
Lines changed: 1 addition & 0 deletions
Loading

assets/js/onboard.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,15 @@ if ( document.getElementById( 'prpl-onboarding-form' ) ) {
115115
.addEventListener( 'change', function () {
116116
const privacyPolicyAccepted = !! this.checked;
117117

118-
document.getElementById(
119-
'prpl-onboarding-submit-wrapper'
120-
).style.display = privacyPolicyAccepted ? 'block' : 'none';
118+
if ( privacyPolicyAccepted ) {
119+
document
120+
.getElementById( 'prpl-onboarding-submit-wrapper' )
121+
.classList.remove( 'prpl-disabled' );
122+
} else {
123+
document
124+
.getElementById( 'prpl-onboarding-submit-wrapper' )
125+
.classList.add( 'prpl-disabled' );
126+
}
121127
} );
122128

123129
document

assets/js/web-components/prpl-badge.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ customElements.define(
2020
}"
2121
alt="Badge"
2222
${ false === complete ? 'style="filter: grayscale(1);opacity: 0.25;"' : '' }
23+
onerror="this.onerror=null;this.src='${
24+
progressPlannerBadge.placeholderImageUrl
25+
}';"
2326
/>
2427
`;
2528
}

assets/js/web-components/prpl-gauge.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ customElements.define(
1616
start: '270deg',
1717
cutout: '57%',
1818
contentFontSize: 'var(--prpl-font-size-6xl)',
19+
contentPadding:
20+
'var(--prpl-padding) var(--prpl-padding) calc(var(--prpl-padding) * 2) var(--prpl-padding)',
21+
marginBottom: 'var(--prpl-padding)',
1922
},
2023
content = ''
2124
) {
@@ -41,11 +44,18 @@ customElements.define(
4144
props.cutout = this.getAttribute( 'cutout' ) || props.cutout;
4245
props.contentFontSize =
4346
this.getAttribute( 'contentFontSize' ) || props.contentFontSize;
47+
props.contentPadding =
48+
this.getAttribute( 'contentPadding' ) || props.contentPadding;
49+
props.marginBottom =
50+
this.getAttribute( 'marginBottom' ) || props.marginBottom;
4451

4552
this.innerHTML = `
46-
<div style="padding: var(--prpl-padding) var(--prpl-padding) calc(var(--prpl-padding) * 2) var(--prpl-padding); background: ${
53+
<div style="padding: ${ props.contentPadding };
54+
background: ${
4755
props.background
48-
}; border-radius:var(--prpl-border-radius-big); aspect-ratio: 2 / 1; overflow: hidden; position: relative;margin-bottom: var(--prpl-padding);">
56+
}; border-radius:var(--prpl-border-radius-big); aspect-ratio: 2 / 1; overflow: hidden; position: relative; margin-bottom: ${
57+
props.marginBottom
58+
};">
4959
<div style="width: 100%; aspect-ratio: 1 / 1; border-radius: 100%; position: relative; background: radial-gradient(${
5060
props.background
5161
} 0 ${ props.cutout }, transparent ${

0 commit comments

Comments
 (0)