Skip to content

Formatted the calendar widget #36995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
akshitrattan wants to merge 10 commits into from
Closed

Formatted the calendar widget #36995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
477bd78
formatted the calendar widget
Feb 10, 2022
6cc9f96
Merge branch '4.1-dev' into Fix#36933
akshitrattan Feb 10, 2022
000738e
removed uneccessary comments
Feb 10, 2022
6a71dbf
changed the margin attribute for the '.calendar-container' table
Feb 10, 2022
6d0cb48
merge 4.1-dev
Feb 10, 2022
e53ee30
Merge branch 'Fix#36933' of github.com:akshitrattan/joomla-cms into F…
Feb 10, 2022
259bc23
Merge branch '4.1-dev' into Fix#36933
akshitrattan Feb 26, 2022
0b663ba
Merge tag 'psr12anchor' into psr12/merge/36995
joomla-bot Jun 27, 2022
ce56bbf
Merge tag 'psr12final' into psr12/merge/36995
joomla-bot Jun 27, 2022
cfef221
Merge branch '4.2-dev' into Fix#36933
QuyTon Jan 30, 2023
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: 4 additions & 2 deletions build/media_source/system/css/fields/calendar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,17 @@
}
.calendar-container {
float: left;
min-width: 160px;
min-width: 280px;
padding: 0;
list-style: none;
border-radius: 5px;
background-color: #ffffff !important;
z-index: 1100 !important;
}
.calendar-container table {
margin: 0 0 0 55px;
table-layout: fixed;
max-width: 262px;
max-width: 290px;
border-radius: 5px;
background-color: #ffffff !important;
z-index: 1100 !important;
Expand Down Expand Up @@ -167,6 +168,7 @@ div.calendar-container table td.title { /* This holds the current "month, year"
.buttons-wrapper .btn:last-child {
margin-right: 0;
}

.time .time-title {
background-image: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='utf-8'%3F%3E%3Csvg width='22' height='22' viewBox='0 0 1792 1792' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M1024 544v448q0 14-9 23t-23 9h-320q-14 0-23-9t-9-23v-64q0-14 9-23t23-9h224v-352q0-14 9-23t23-9h64q14 0 23 9t9 23zm416 352q0-148-73-273t-198-198-273-73-273 73-198 198-73 273 73 273 198 198 273 73 273-73 198-198 73-273zm224 0q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z'/%3E%3C/svg%3E");
background-repeat: no-repeat;
Expand Down
11 changes: 5 additions & 6 deletions build/media_source/system/js/fields/calendar.es5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,16 +699,15 @@
cell = createElement("td", row);
cell.className = "time time-title";
cell.colSpan = 1;
cell.style.verticalAlign = 'middle';
cell.innerHTML = " ";
cell.innerHTML = "";

var cell1 = createElement("td", row);
cell1.className = "time hours-select";
cell1.colSpan = 2;
cell1.colSpan = 3;

var cell2 = createElement("td", row);
cell2.className = "time minutes-select";
cell2.colSpan = 2;
cell2.colSpan = 3;

(function () {
function makeTimePart(className, selected, range_start, range_end, cellTml) {
Expand Down Expand Up @@ -744,8 +743,8 @@
hrs -= 12;
}

var H = makeTimePart("time time-hours", hrs, t12 ? 1 : 0, t12 ? 12 : 23, cell1),
M = makeTimePart("time time-minutes", mins, 0, 59, cell2),
var H = makeTimePart("time time-hours form-select form-select-sm w-auto", hrs, t12 ? 1 : 0, t12 ? 12 : 23, cell1),
M = makeTimePart("time time-minutes form-select form-select-sm w-auto", mins, 0, 59, cell2),
AP = null;

cell = createElement("td", row);
Expand Down