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.

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

Jump to bottom

MS1.5 fix #35 #66

Merged
merged 2 commits into from
Jun 28, 2021
Merged

MS1.5 fix #35 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b45bcdc
Fix Mobile contact if problem header wrong #35
Gum-Joe Jun 28, 2021
4c95d8f
Bump version number
Gum-Joe Jun 28, 2021
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 frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "frontend",
"version": "1.1.0-beta.3",
"version": "1.1.0-beta.4",
"private": true,
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.34",
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/SiteContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,9 @@ export default class SiteContainer extends Component<SiteProps, TheState> {
async getCalendar() {
const inputDate = new Date();
// Used for fiddling:
// NOTE: Do NOT allow code into production where these value are uncommented
//inputDate.setDate(26);
//inputDate.setMonth(2);
//inputDate.setMonth(7);
//inputDate.setFullYear(2021);
// Get which week it is
const weekChecker = new IsItWeekA(this.props.weekMarkerDate, this.props.calendarURL, inputDate);
Expand All @@ -199,7 +200,7 @@ export default class SiteContainer extends Component<SiteProps, TheState> {
<h2>It is neither Week A nor B.</h2>
<h3>This means it&#39;s probably a holiday.</h3>
<Button style={{ marginRight: "auto" }} className="forward" onClick={getScrollDownWithAdditional(0)}><div>events</div></Button>
<h5>If you believe this is in error, please email&nbsp;<a href="mailto:info@isitweeka.com">info@isitweeka.com</a></h5>
<h5 id="neitherAB-contact">If you believe this is in error, please email&nbsp;<a href="mailto:info@isitweeka.com">info@isitweeka.com</a></h5>
<Socials />
</>
);
Expand Down
7 changes: 7 additions & 0 deletions frontend/src/scss/jumbotron.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,11 @@
justify-content: center !important;
transform: scale(0.8) translate(0, 60px) !important;
}
}

// Control the styling of the "if you believe this is in error, please contact <email>" shown
// when the system can't detect A or B
// Without this it is inline-flex and so on mobile looks incorecct as the email link and header text don't appear as one line - see issue #35
#neitherAB-contact {
display: block;
}