Skip to content
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.

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

Tailwind 3 and Switch UI scaling from a base-10 to base-16 #1821

Open
wants to merge 29 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
38d8195
Switch UI scaling from a base-10 to base-16
amazingphilippe Apr 26, 2024
29c98a0
format
amazingphilippe Apr 26, 2024
0932d06
fix tests
amazingphilippe Apr 26, 2024
efcfab4
tweak test selector
amazingphilippe Apr 26, 2024
6879967
Merge branch 'main' into design/ui-scaling
amazingphilippe Apr 26, 2024
1032528
forgot to save a file
amazingphilippe Apr 26, 2024
4c8d436
small is 17, slightly bigger
amazingphilippe Apr 26, 2024
d520258
Merge branch 'main' into design/ui-scaling
amazingphilippe Apr 26, 2024
ae61da3
scheduler re-style
amazingphilippe Apr 29, 2024
746ca0f
format
amazingphilippe Apr 29, 2024
8e31245
style tweaks
amazingphilippe Apr 29, 2024
5841206
Merge branch 'main' into design/ui-scaling
amazingphilippe May 29, 2024
24e891c
Merge branch 'main' into design/ui-scaling
amazingphilippe May 29, 2024
ac34134
Merge branch 'main' into design/ui-scaling
amazingphilippe Jun 13, 2024
1e3aaa9
Merge branch 'main' into design/ui-scaling
amazingphilippe Jun 25, 2024
6b36702
Merge branch 'main' into design/ui-scaling
amazingphilippe Jul 2, 2024
03ace51
Merge branch 'main' into design/ui-scaling
amazingphilippe Aug 2, 2024
2dd86df
Merge branch 'main' into design/ui-scaling
amazingphilippe Sep 16, 2024
5efcf80
rebuildings and updating calendar icons
amazingphilippe Sep 16, 2024
38fd91d
Upgrade to tailwind 3 and fix related errors
amazingphilippe Oct 7, 2024
eab2599
Merge branch 'main' into design/ui-scaling
amazingphilippe Oct 7, 2024
11d9410
tweaks to the scheduler
amazingphilippe Oct 7, 2024
e0c7c69
format
amazingphilippe Oct 8, 2024
72324ba
Merge branch 'main' into design/ui-scaling
amazingphilippe Oct 28, 2024
33cf259
format and remove phosphor icon css
amazingphilippe Oct 28, 2024
82275d0
compiled css
amazingphilippe Oct 28, 2024
780ea47
Merge branch 'main' into design/ui-scaling
amazingphilippe Oct 29, 2024
91516d2
format
amazingphilippe Oct 29, 2024
67cc4a5
Calendar fixes after timezone content changes
amazingphilippe Oct 29, 2024
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
4 changes: 4 additions & 0 deletions app/assets/javascripts/fontawesome.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ import { faCheck } from "@fortawesome/free-solid-svg-icons/faCheck";
import { faArrowUpRightFromSquare } from "@fortawesome/free-solid-svg-icons/faArrowUpRightFromSquare";
import { faPlus } from "@fortawesome/free-solid-svg-icons/faPlus";
import { faArrowRight } from "@fortawesome/free-solid-svg-icons/faArrowRight";
import { faArrowLeft } from "@fortawesome/free-solid-svg-icons/faArrowLeft";
import { faAngleDown } from "@fortawesome/free-solid-svg-icons/faAngleDown";
import { faCircleQuestion } from "@fortawesome/free-solid-svg-icons/faCircleQuestion";
import { faTriangleExclamation } from "@fortawesome/free-solid-svg-icons/faTriangleExclamation";
import { faCircleExclamation } from "@fortawesome/free-solid-svg-icons/faCircleExclamation";
import { faInfoCircle } from "@fortawesome/free-solid-svg-icons";
import { faPaperPlane } from "@fortawesome/free-solid-svg-icons";
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the scheduler updates

import { faXmark } from "@fortawesome/free-solid-svg-icons/faXMark";
import { faTag } from "@fortawesome/free-solid-svg-icons/faTag";

Expand All @@ -25,11 +27,13 @@ let FontAwesomeIconLoader = () => {
faArrowUpRightFromSquare,
faPlus,
faArrowRight,
faArrowLeft,
faAngleDown,
faCircleQuestion,
faTriangleExclamation,
faCircleExclamation,
faInfoCircle,
faPaperPlane,
faXmark,
faTag,
]);
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/main.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/assets/javascripts/scheduler.min.js

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions app/assets/javascripts/scheduler/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ export const App = () => {
<ErrorMessage />
<p className="messageTextStyle">{translate("select_date")}</p>
<div className="schedule">
<div>
<Calendar />
</div>
<Calendar />
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing this unclassed div helped make the scheduler responsive don to 320px

<DateTime />
<SetDateTime />
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/scheduler/Calendar/YearMonth.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const YearMonth = () => {
}}
disabled={prevMonthEnabled(date, firstAvailableDate) ? false : true}
>
&#10094;
<i aria-hidden="true" class="fa-solid fa-arrow-left"></i>
</button>
<div className="Nav--month">{dayjs(date).format("MMMM")}</div>
<button
Expand All @@ -80,7 +80,7 @@ export const YearMonth = () => {
}}
disabled={nextMonthEnabled(date, lastAvailableDate) ? false : true}
>
&#10095;
<i aria-hidden="true" class="fa-solid fa-arrow-right"></i>
</button>
</section>
);
Expand Down
17 changes: 10 additions & 7 deletions app/assets/javascripts/scheduler/Confirmation/Confirmation.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,21 @@ export const Confirmation = () => {
_24hr === "on" ? time : dayjs(date).format(translate("time_format"));

return selected.length > 0 && time ? (
<div>
<div className="confirmation set">
<div className="confirmation set">
<i
aria-hidden="true"
class="confirmationIcon fa-xl fa-solid fa-paper-plane"
></i>

<div className="confirmationMessage">
<p>{translate("message_will_be_sent")}</p>
<p>
<strong>
<p className="confirmationTime">
<time datetime={date}>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a <time> element like in #1799

{translate("date_prefix")}
{dayjs(date).format(translate("date_format"))} {translate("at")}{" "}
{timeFormat}
</strong>
</time>
</p>
</div>
<div>
<p>{translate("cancel")}</p>
</div>
</div>
Expand Down
Loading
Loading