Merge branch 'develop' into ari/fix-pro/129

Author: aristath

assets/css/admin.css

@@ -57,12 +57,13 @@
 	background: #fff;
 	border: 1px solid var(--prpl-color-gray-2);
 	border-radius: var(--prpl-border-radius);
-	padding: calc(var(--prpl-padding) * 2);
+	padding: var(--prpl-settings-page-gap) calc(var(--prpl-padding) * 2);
 	max-width: var(--prpl-container-max-width);
 	color: var(--prpl-color-text);
 	font-size: var(--prpl-font-size-base);
 	line-height: 1.4;
 	position: relative;
+	margin-top: var(--prpl-padding);
 }
 
 /*------------------------------------*\
@@ -164,15 +165,15 @@ button.prpl-info-icon {
 	Header & logo.
 \*------------------------------------*/
 .prpl-header {
-	margin-bottom: 2em;
+	margin-bottom: 2rem;
 	display: flex;
 	flex-wrap: wrap;
 	justify-content: space-between;
 	align-items: center;
 }
 
 .prpl-header-logo svg {
-	height: 100px;
+	height: 88px;
 }
 
 .prpl-header-right {

assets/css/page-widgets/challenge.css

@@ -37,19 +37,4 @@
 			}
 		}
 	}
-
-	h2.prpl-widget-title {
-		background: var(--prpl-background-purple);
-		padding: 0.75rem 1rem;
-		border-radius: 0.5rem;
-		color: var(--prpl-color-headings);
-		display: flex;
-		gap: 0.5rem;
-		align-items: center;
-
-		img {
-			max-width: 1em;
-			max-height: 1em;
-		}
-	}
 }

assets/css/page-widgets/todo.css

@@ -11,21 +11,6 @@
 		padding-left: var(--prpl-padding);
 	}
 
-	.prpl-widget-title {
-		display: flex;
-		align-items: center;
-		gap: 0.5rem;
-		font-size: 1.3rem;
-		background: var(--prpl-background-red);
-		padding: 0.5rem 1rem;
-		border-radius: 0.5rem;
-
-		.icon {
-			width: 1.25em;
-			height: 1.25em;
-		}
-	}
-
 	.prpl-todo-golden-task-description,
 	.prpl-todo-silver-task-description {
 		display: none;

views/page-widgets/challenge.php

@@ -12,9 +12,6 @@
 $prpl_challenge = \progress_planner()->get_admin__widgets__challenge()->get_challenge();
 ?>
 <h2 class="prpl-widget-title">
-	<?php if ( $prpl_challenge['icon'] ) : ?>
-		<img src="<?php echo \esc_url( $prpl_challenge['icon'] ); ?>" alt="">
-	<?php endif; ?>
 	<?php echo \esc_html( $prpl_challenge['name'] ); ?>
 </h2>
 

views/page-widgets/todo.php

@@ -11,9 +11,6 @@
 
 ?>
 <h2 class="prpl-widget-title">
-	<span class="icon">
-		<svg baseProfile="tiny" version="1.2" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="M32.1,47.9H7c-3.8,0-6.9-3.1-6.9-6.9V15.9c0-3.8,3.1-6.9,6.9-6.9h11.3c.8,0,1.5.7,1.5,1.5s-.7,1.5-1.5,1.5H7c-2.1,0-3.9,1.7-3.9,3.9v25.1c0,2.1,1.7,3.9,3.9,3.9h25.1c2.1,0,3.9-1.7,3.9-3.9v-11.3c0-.8.7-1.5,1.5-1.5s1.5.7,1.5,1.5v11.3c0,3.8-3.1,6.9-6.9,6.9ZM8.8,40.7c-.4,0-.8-.2-1.1-.4s-.5-1-.4-1.5l1.9-6.4c.6-1.9,1.6-3.7,3.1-5.2L37.7,1.9c1.1-1.1,2.6-1.7,4.2-1.7s3.1.6,4.2,1.7c1.1,1.1,1.7,2.6,1.7,4.2s-.6,3.1-1.7,4.2l-25.3,25.3c-1.4,1.4-3.2,2.5-5.2,3.1l-6.4,1.9c-.1,0-.3,0-.4,0ZM34.7,9.1L14.4,29.3c-1.1,1.1-1.9,2.4-2.3,3.9l-1.1,3.8,3.8-1.1c1.5-.4,2.8-1.2,3.9-2.3l20.3-20.3-4.2-4.2ZM36.8,7l4.2,4.2,3-3c.6-.6.9-1.3.9-2.1s-.3-1.5-.9-2.1c-1.1-1.1-3.1-1.1-4.2,0l-3,3Z" fill="#f43f5e"/><text transform="translate(3.2 -14.2)" font-family="MyriadPro-Regular, 'Myriad Pro'" font-size="12"><tspan x="0" y="0">44,75px / lijn 3px</tspan></text></svg>
-	</span>
 	<span><?php \esc_html_e( 'My to-do list', 'progress-planner' ); ?></span>
 </h2>