Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/stats' into add/stat-lis…
Browse files Browse the repository at this point in the history
…ting-search-impressions
  • Loading branch information
pgk committed Feb 20, 2024
2 parents 74d7711 + 109e94a commit 958800a
Show file tree
Hide file tree
Showing 26 changed files with 1,120 additions and 678 deletions.
98 changes: 98 additions & 0 deletions assets/css/job-dashboard.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@

@import "mixins";

#job-manager-job-dashboard {

}

.jm-dashboard-job, .jm-dashboard-header {
display: flex;
align-items: center;
padding: var(--jm-ui-space-sm);
gap: var(--jm-ui-space-sm);
margin: var(--jm-ui-space-sm) 0;
font-size: var(--jm-ui-font-size-m);
}

.jm-dashboard-header {
color: fadeCurrentColor(85%);
margin-bottom: unset;
padding-bottom: unset;
}

.jm-dashboard__intro {
display: flex;
justify-content: space-between;
align-items: baseline;
flex-wrap: wrap;
gap: var(--jm-ui-space-sm);
}

.jm-dashboard-job {
border: var(--jm-ui-border-size) solid var(--jm-ui-border-light);
}

.jm-dashboard-job-column {
flex: 1 1 calc(50% - var(--jm-ui-space-sm));
min-width: 0;
}

.jm-dashboard small {
font-size: var(--jm-ui-font-size-s);
}

.jm-dashboard-job-column.job_title {
flex: 1 1 200%;

.job-status {
text-transform: uppercase;
font-weight: 500;
font-size: var(--jm-ui-font-size-s);
line-height: var(--jm-ui-icon-size-s);
color: fadeCurrentColor( 80% );

.jm-ui-icon {
width: var(--jm-ui-icon-size-s);
height: var(--jm-ui-icon-size-s);
}
}
}


.jm-dashboard-job-column.actions {
flex: 0.5 1 100%;
text-align: right;
}

.jm-dashboard-job-column a.job-title {
font-weight: 600;
font-size: var(--jm-ui-font-size);
text-decoration: unset;
}

.jm-dashboard-job-column a.job-title:hover {
text-decoration: underline;
}

.jm-dashboard-action {
display: block;
text-decoration: none;

}
.jm-dashboard-action:where(:not(:hover):not(:focus)) {
color: inherit;
}

.job-dashboard-action-delete {
color: var(--jm-ui-danger-color);
}

@media (max-width: 600px) {
.jm-dashboard-job {
flex-wrap: wrap;
}

.jm-dashboard-header {
display: none;
}
}
5 changes: 1 addition & 4 deletions assets/css/ui.dialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,7 @@
opacity: 0.7;

.jm-ui-button__icon {
background-color: currentColor;
mask: var(--jm-ui-svg-close) no-repeat center center;
width: var(--jm-ui-icon-size);
height: var(--jm-ui-icon-size);
mask-image: var(--jm-ui-svg-close);
}

}
Expand Down
85 changes: 84 additions & 1 deletion assets/css/ui.elements.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@

transition: color 0.2s ease-out, background 0.2s ease-out;

&:focus:not(:focus-visible) {
outline: unset;
}

&:focus-visible {
outline: 1.5px solid fadeCurrentColor(85%);
outline-offset: 1.5px;
Expand Down Expand Up @@ -90,6 +94,13 @@
}
}

.jm-ui-button__icon {
background-color: currentColor;
mask: var(--jm-ui-svg-close) no-repeat center center;
width: var(--jm-ui-icon-size);
height: var(--jm-ui-icon-size);
}

.jm-ui-link {
border-radius: 2px;

Expand All @@ -102,7 +113,7 @@
}
}

.jm-ui-actions {
.jm-ui-actions-row {
display: flex;
flex-direction: row;
gap: var(--jm-ui-space-s);
Expand All @@ -115,3 +126,75 @@
margin-left: calc(-1 * var(--jm-ui-space-s));
}
}

.jm-ui-icon {
display: inline-block;
flex: 0 0 auto;
width: var(--jm-ui-icon-size);
height: var(--jm-ui-icon-size);
mask-size: 100% 100%;

&[data-icon=check] {
background-color: currentColor;
mask-image: url('data:image/svg+xml,%3csvg xmlns=\'http://www.w3.org/2000/svg\' width=\'24\' height=\'24\' fill=\'none\' viewBox=\'0 0 24 24\'%3e%3cg stroke-width=\'1.5\'%3e%3cpath stroke=\'%231E1E1E\' d=\'M12 20a8 8 0 1 0 0-16 8 8 0 0 0 0 16Z\'/%3e%3cpath stroke=\'black\' d=\'m15.96 8.18-5.34 7.18-3.1-2.3\'/%3e%3c/g%3e%3c/svg%3e');
}

&[data-icon=check-circle] {
background-color: currentColor;
mask-image: url('data:image/svg+xml,%3csvg xmlns=\'http://www.w3.org/2000/svg\' width=\'24\' height=\'24\' fill=\'none\' viewBox=\'0 0 24 24\'%3e%3cg stroke-width=\'1.5\'%3e%3cpath stroke=\'%231E1E1E\' d=\'M12 20a8 8 0 1 0 0-16 8 8 0 0 0 0 16Z\'/%3e%3cpath stroke=\'black\' d=\'m15.96 8.18-5.34 7.18-3.1-2.3\'/%3e%3c/g%3e%3c/svg%3e');
}

&[data-icon=check] {
background-color: currentColor;
mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' fill='none' viewBox='0 0 24 24'%3e%3cpath fill='black' fill-rule='evenodd' d='m17.93 7.98-7.2 9.68-4.52-3.36.9-1.2 3.31 2.46 6.3-8.48 1.2.9Z' clip-rule='evenodd'/%3e%3c/svg%3e");
}

&[data-icon=star] {
background-color: currentColor;
mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' fill='none' viewBox='0 0 24 24'%3e%3cpath fill='black' d='M11.78 4.45a.25.25 0 0 1 .44 0l2.07 4.2c.04.07.11.12.2.13l4.62.68c.2.02.28.28.14.42l-3.35 3.26a.25.25 0 0 0-.07.23l.79 4.6c.03.2-.18.36-.37.27l-4.13-2.18a.25.25 0 0 0-.24 0l-4.13 2.18a.25.25 0 0 1-.37-.27l.8-4.6a.25.25 0 0 0-.08-.23L4.75 9.88a.25.25 0 0 1 .14-.42l4.63-.68a.25.25 0 0 0 .19-.13l2.07-4.2Z'/%3e%3c/svg%3e");
}

&[data-icon=info] {
background-color: currentColor;
mask-image: url('data:image/svg+xml,%3csvg xmlns=\'http://www.w3.org/2000/svg\' width=\'24\' height=\'24\' fill=\'none\' viewBox=\'0 0 24 24\'%3e%3ccircle cx=\'12\' cy=\'12\' r=\'8\' stroke=\'black\' stroke-width=\'1.5\'/%3e%3cpath fill=\'black\' d=\'M11 11h2v6h-2zm0-4h2v2h-2z\'/%3e%3c/svg%3e');
}

&[data-icon=alert] {
background-color: currentColor;
mask-image: url('data:image/svg+xml,%3csvg xmlns=\'http://www.w3.org/2000/svg\' width=\'24\' height=\'24\' fill=\'none\' viewBox=\'0 0 24 24\'%3e%3cpath stroke=\'%231E1E1E\' stroke-width=\'1.5\' d=\'M12 20a8 8 0 1 0 0-16 8 8 0 0 0 0 16Z\'/%3e%3cpath fill=\'%231E1E1E\' d=\'M13 7h-2v6h2V7Zm0 8h-2v2h2v-2Z\'/%3e%3c/svg%3e');
}
}

/*
* Action menu.
*/
.jm-ui-actions-menu {
position: relative;
display: inline-block;
}

.jm-ui-action-menu__open-button {
cursor: pointer;

.jm-ui-button__icon {
mask-image: var(--jm-ui-svg-ellipsis-v);
}
}

.jm-ui-action-menu__content {
position: absolute;
right: 0;
top: calc(100% + 2px);
border: var(--jm-ui-border-size) solid var(--jm-ui-border-strong);
border-radius: var(--jm-ui-radius);
background-color: var(--jm-ui-background-color, #fff);
box-shadow: var(--jm-ui-shadow-popover);
padding: var(--jm-ui-space-s);
z-index: 10;
font-size: var(--jm-ui-font-size-s);
text-align: left;
white-space: nowrap;

display: flex;
flex-direction: column;
}
7 changes: 7 additions & 0 deletions assets/css/ui.form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,13 @@
padding-right: var(--jm-ui-space-ml);
}

input[type].jm-ui-input--search-icon {
background-image: var(--jm-ui-svg-search);
background-position: var(--jm-ui-space-xs) center;
background-repeat: no-repeat;
padding-left: calc(var(--jm-ui-space-ml) + var(--jm-ui-space-xs));
}

.select2-container.select2-container.select2-container {

input {
Expand Down
22 changes: 17 additions & 5 deletions assets/css/ui.neutral.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,19 @@
--jm-ui-radius-4x: calc(4 * var(--jm-ui-radius));

--jm-ui-accent-color: inherit;
--jm-ui-danger-color: #cc1818;
--jm-ui-error-color: #cc1818;
--jm-ui-info-color: #4e71ec;
--jm-ui-success-color: #4ab866;
--jm-ui-accent-color-contrast: #ffffff;

--jm-ui-button-color: var(--jm-ui-accent-color);
--jm-ui-button-contrast: var(--jm-ui-accent-color-contrast, #ffffff);
--jm-ui-link-color: var(--jm-ui-accent-color, inherit);

--jm-ui-notice-error: #cc1818;
--jm-ui-notice-info: #4e71ec;
--jm-ui-notice-success: #4ab866;
--jm-ui-notice-error: var(--jm-ui-danger-color);
--jm-ui-notice-info: var(--jm-ui-info-color);
--jm-ui-notice-success: var(--jm-ui-success-color);
--jm-ui-notice-strong: var(--jm-ui-border-strong);

--jm-ui-notice-shadow: none;
Expand All @@ -43,17 +47,25 @@
--jm-ui-space-xxl: calc(24 * var(--jm-ui-space-base)); // 96px

--jm-ui-font-size: 16px;
--jm-ui-font-size-m: 14px;
--jm-ui-font-size-s: 12px;
--jm-ui-heading-font-size: 20px;
--jm-ui-large-font-size: 24px;
--jm-ui-button-font-size: 14px;
--jm-ui-icon-size: 24px;
--jm-ui-icon-size-m: 20px;
--jm-ui-icon-size-s: 18px;

--jm-ui-shadow-modal: 0 0.7px 1px 0 rgba(0, 0, 0, 0.15),
0 2.7px 3.8px -0.2px rgba(0, 0, 0, 0.15),
0px 5.5px 7.8px -0.3px rgba(0, 0, 0, 0.15),
0.1px 11.5px 16.4px -0.5px rgba(0, 0, 0, 0.15);

--jm-ui-shadow-popover: 0px 2px 6px 0px rgba(0, 0, 0, 0.05);

--jm-ui-svg-close: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 24 24'%3e%3cpath fill='black' d='m12 13.06 3.71 3.71 1.06-1.06-3.7-3.71 3.7-3.71-1.06-1.06-3.71 3.7-3.71-3.7-1.06 1.06 3.7 3.71-3.7 3.71 1.06 1.06 3.71-3.7Z'/%3e%3c/svg%3e");
--jm-ui-svg-arrow-down: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='32' height='6' viewBox='0 0 16 10'%3e%3cpath fill='currentColor' fill-rule='evenodd' d='M0 1.6 1.53 0 8 6.95 14.5 0 16 1.6 8 10 0 1.6Z' clip-rule='evenodd'/%3e%3c/svg%3e");
--jm-ui-svg-check: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' fill='none' viewBox='0 0 24 24'%3e%3cpath stroke='%231E1E1E' stroke-width='1.5' d='m18.93 6-8.9 11.97-5.16-3.84'/%3e%3c/svg%3e");
--jm-ui-svg-arrow-down: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='32' height='6' viewBox='0 0 16 10'%3e%3cpath fill='black' fill-rule='evenodd' d='M0 1.6 1.53 0 8 6.95 14.5 0 16 1.6 8 10 0 1.6Z' clip-rule='evenodd'/%3e%3c/svg%3e");
--jm-ui-svg-check: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' fill='none' viewBox='0 0 24 24'%3e%3cpath stroke='black' stroke-width='1.5' d='m18.93 6-8.9 11.97-5.16-3.84'/%3e%3c/svg%3e");
--jm-ui-svg-ellipsis-v: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' fill='none' viewBox='0 0 24 24'%3e%3cpath fill='black' fill-rule='evenodd' d='M11 19v-2h2v2h-2Zm0-6v-2h2v2h-2Zm0-6V5h2v2h-2Z' clip-rule='evenodd'/%3e%3c/svg%3e");
--jm-ui-svg-search: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' fill='none' viewBox='0 0 24 24'%3e%3cpath fill='black' fill-rule='evenodd' d='M19 11a6 6 0 0 1-9.68 4.74l-3.79 3.79-1.06-1.06 3.79-3.8A6 6 0 1 1 19 11Zm-1.5 0a4.5 4.5 0 1 1-9 0 4.5 4.5 0 0 1 9 0Z' clip-rule='evenodd'/%3e%3c/svg%3e");
}
24 changes: 1 addition & 23 deletions assets/css/ui.notice.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
&.color-#{$color} {
border-color: var(--jm-ui-notice-#{$color});
background-color: color-mix(in srgb, transparent, var(--jm-ui-notice-#{$color}) var(--jm-ui-background-opacity));
.jm-notice__icon {
.jm-ui-icon {
color: var(--jm-ui-notice-#{$color});
}
}
Expand Down Expand Up @@ -91,28 +91,6 @@
}
}

.jm-notice__icon {
flex: 0 0 auto;
width: var(--jm-ui-icon-size);
height: var(--jm-ui-icon-size);
mask-size: 100% 100%;

&[data-icon=check] {
background-color: currentColor;
mask-image: url('data:image/svg+xml,%3csvg xmlns=\'http://www.w3.org/2000/svg\' width=\'24\' height=\'24\' fill=\'none\' viewBox=\'0 0 24 24\'%3e%3cg stroke-width=\'1.5\'%3e%3cpath stroke=\'%231E1E1E\' d=\'M12 20a8 8 0 1 0 0-16 8 8 0 0 0 0 16Z\'/%3e%3cpath stroke=\'black\' d=\'m15.96 8.18-5.34 7.18-3.1-2.3\'/%3e%3c/g%3e%3c/svg%3e');
}

&[data-icon=info] {
background-color: currentColor;
mask-image: url('data:image/svg+xml,%3csvg xmlns=\'http://www.w3.org/2000/svg\' width=\'24\' height=\'24\' fill=\'none\' viewBox=\'0 0 24 24\'%3e%3ccircle cx=\'12\' cy=\'12\' r=\'8\' stroke=\'black\' stroke-width=\'1.5\'/%3e%3cpath fill=\'black\' d=\'M11 11h2v6h-2zm0-4h2v2h-2z\'/%3e%3c/svg%3e');
}

&[data-icon=alert] {
background-color: currentColor;
mask-image: url('data:image/svg+xml,%3csvg xmlns=\'http://www.w3.org/2000/svg\' width=\'24\' height=\'24\' fill=\'none\' viewBox=\'0 0 24 24\'%3e%3cpath stroke=\'%231E1E1E\' stroke-width=\'1.5\' d=\'M12 20a8 8 0 1 0 0-16 8 8 0 0 0 0 16Z\'/%3e%3cpath fill=\'%231E1E1E\' d=\'M13 7h-2v6h2V7Zm0 8h-2v2h2v-2Z\'/%3e%3c/svg%3e');
}
}

.jm-notice__header {
display: flex;
flex-direction: row;
Expand Down
2 changes: 2 additions & 0 deletions assets/js/datepicker.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
/* global job_manager_datepicker */
jQuery(document).ready( function() {
var $date_today = new Date();
var datePickerOptions = {
altFormat : 'yy-mm-dd',
minDate : $date_today,
};

if ( typeof job_manager_datepicker !== 'undefined' ) {
Expand Down
5 changes: 5 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# WP Job Manager

## 2.2.2 - 2024-02-15
* Fix issue with rich e-mails on some e-mail providers (#2753)
* Fix: 'featured_first' argument now works when 'show_filters' is set to false.
* Improve checkbox and radio inputs for styled forms

## 2.2.1 - 2024-01-31
* Fix PHP 7.x error for mixed returned type (#2726)

Expand Down
Loading

0 comments on commit 958800a

Please sign in to comment.