Skip to content

Fix header sizes #265

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

Merged
merged 8 commits into from
Oct 15, 2022
Merged

Fix header sizes #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
239fee1
implementing a11y recommendations
joshreisner Oct 14, 2022
2714b8b
style updates
joshreisner Oct 15, 2022
e1c8548
update version
joshreisner Oct 15, 2022
26c68a7
fix header sizes
joshreisner Oct 15, 2022
e7d4b29
Merge branch 'main' into a11y
joshreisner Oct 15, 2022
5bd0fa3
fix header sizes
joshreisner Oct 15, 2022
8591f48
add focus back
joshreisner Oct 15, 2022
b31b422
remove duplicate rule
joshreisner Oct 15, 2022
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: 1 addition & 1 deletion public/app.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/style.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/components/Map.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ export default function Map({
onClose={() => setPopup(undefined)}
>
<div className="d-grid gap-2">
<h4 className="fw-light">{data.locations[key].name}</h4>
<h2>{data.locations[key].name}</h2>
<p>{data.locations[key].formatted_address}</p>
{listMeetingsInPopup && (
<div className="list-group mb-1">
Expand Down
10 changes: 5 additions & 5 deletions src/components/Meeting.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ export default function Meeting({
<h1 className="fw-light mb-1" id="tsml-title" tabIndex={-1}>
<Link meeting={meeting} />
</h1>
<div className="align-items-center border-bottom d-flex h6 mb-3 pb-2">
<div className="align-items-center border-bottom d-flex mb-3 pb-2">
<Icon icon="back" />
<a
href={formatUrl({
Expand Down Expand Up @@ -262,7 +262,7 @@ export default function Meeting({
)}
<div className="list-group">
<div className="d-grid gap-2 list-group-item py-3">
<h2 className="h5">{strings.meeting_information}</h2>
<h2>{strings.meeting_information}</h2>
<p>{formatTime(meeting.start, meeting.end)}</p>

{meeting.start && meeting.start.zoneName !== meeting.timezone && (
Expand Down Expand Up @@ -380,7 +380,7 @@ export default function Meeting({
'd-grid gap-2 list-group-item py-3 location'
)}
>
{meeting.location && <h2 className="h5">{meeting.location}</h2>}
{meeting.location && <h2>{meeting.location}</h2>}
{meeting.formatted_address && (
<p>{meeting.formatted_address}</p>
)}
Expand All @@ -404,7 +404,7 @@ export default function Meeting({
!!groupWeekdays.length ||
!!contactButtons.length) && (
<div className="d-grid gap-2 list-group-item py-3 group">
<h2 className="h5">{meeting.group}</h2>
<h2>{meeting.group}</h2>
{meeting.district && <p>{meeting.district}</p>}
{meeting.group_notes && (
<Paragraphs text={meeting.group_notes} />
Expand Down Expand Up @@ -484,7 +484,7 @@ function formatWeekdays(
) {
return weekday.map(({ meetings, name }, index) => (
<div key={index}>
<h3 className="h6 mb-1 mt-2">{name}</h3>
<h3 className="mb-1 mt-2">{name}</h3>
<ol className="list-unstyled">
{meetings.map((m, index) => (
<li
Expand Down
33 changes: 23 additions & 10 deletions src/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,12 @@ div.tsml-ui {
font-family: $font-family-sans-serif !important;
font-weight: $font-weight-base !important;
line-height: $line-height-base !important;
text-align: $body-text-align !important;
-webkit-tap-highlight-color: rgba($black, 0);
-webkit-text-size-adjust: 100%;
text-align: left !important;
text-size-adjust: none;

h1,
h2,
h3,
h4,
h5,
h6,
p,
ol,
ul {
Expand All @@ -93,17 +89,31 @@ div.tsml-ui {
text-transform: none;
}

h1 {
font-size: 32px !important;
@include media-breakpoint-up(md) {
font-size: 40px !important;
}
&:focus {
outline: none;
}
}

h2 {
font-size: 20px !important;
}

h3 {
font-size: 16px !important;
}

a {
color: $link-color;
&:hover {
color: $link-hover-color;
}
}

h1:focus {
outline: none;
}

button {
font-weight: inherit;
}
Expand All @@ -117,6 +127,9 @@ div.tsml-ui {
&[href] {
cursor: pointer;
}
&:focus {
box-shadow: 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
}
}

/* saves .02 mb not to enable negative margins in bootstrap */
Expand Down