Skip to content

Commit

Permalink
Merge branch '1.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasOsti committed Jan 27, 2020
2 parents 9d581f7 + 1760896 commit e5ca159
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(function(global, doc, $, flatpickr) {
(function(global, doc, eZ, $, flatpickr) {
let getUsersTimeout;
const token = doc.querySelector('meta[name="CSRF-Token"]').content;
const siteaccess = doc.querySelector('meta[name="SiteAccess"]').content;
Expand Down Expand Up @@ -121,7 +121,7 @@
toggleDisabledStateOnApplyBtn();
};
const dateConfig = {
formatDate: (date) => new Date(date).toLocaleDateString(),
formatDate: (date) => eZ.helpers.timezone.formatShortDateTime(date, null),
};
const checkSelectFieldsFilled = (modal) => {
const inputs = modal.querySelectorAll('.ez-date-select');
Expand Down Expand Up @@ -287,4 +287,4 @@
listGroupsTitle.forEach((group) => group.addEventListener('click', toggleGroupState, false));
contentTypeCheckboxes.forEach((checkbox) => checkbox.addEventListener('change', filterByContentType, false));
selectBtns.forEach((btn) => btn.addEventListener('click', setSelectedDateRange, false));
})(window, window.document, window.jQuery, window.flatpickr);
})(window, window.document, window.eZ, window.jQuery, window.flatpickr);
5 changes: 3 additions & 2 deletions src/bundle/Resources/public/scss/_animations.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
0% {
transform: scale(1);
box-shadow: none;
background-color: #fff;
background-color: $ez-white;
}
25% {
box-shadow: inset 10px 10px 10px 4px rgba(237, 237, 237, 0.1),
Expand All @@ -17,6 +17,7 @@
100% {
transform: scale(1);
box-shadow: none;
background-color: transparent;
}
}

Expand All @@ -35,6 +36,6 @@
}
100% {
transform: scale(1);
background-color: #fff;
background-color: $ez-white;
}
}
4 changes: 4 additions & 0 deletions src/bundle/Resources/public/scss/_general.scss
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ img {
.align-right {
float: right;
}

blockquote {
margin: calculateRem(16px) calculateRem(40px);
}
}

.ez-login-view {
Expand Down
1 change: 1 addition & 0 deletions src/bundle/Resources/public/scss/_notifications-modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

.close {
margin-top: -0.5625rem;
outline: none;
}
}

Expand Down

0 comments on commit e5ca159

Please sign in to comment.