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

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

Draft
wants to merge 18 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
2 changes: 2 additions & 0 deletions app/assets/javascripts/fontawesome.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { faCircleQuestion } from "@fortawesome/free-solid-svg-icons/faCircleQues
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


let FontAwesomeIconLoader = () => {
config.autoAddCss = false;
Expand All @@ -28,6 +29,7 @@ let FontAwesomeIconLoader = () => {
faTriangleExclamation,
faCircleExclamation,
faInfoCircle,
faPaperPlane,
]);
dom.watch();
};
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
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