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

Fix linting workflow #705

Merged
merged 4 commits into from
Nov 10, 2023
Merged

Fix linting workflow #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0b3304
Attempted fix for lint workflow
jotjern Nov 10, 2023
4abde17
Moved node options from env to npmrc
jotjern Nov 10, 2023
a959cc0
Fixed linting problems
jotjern Nov 10, 2023
1b45bf2
Fixed minor style problem
jotjern Nov 10, 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
1 change: 1 addition & 0 deletions .npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node-options="--openssl-legacy-provider"
2 changes: 1 addition & 1 deletion src/common/components/Modal/ConfirmModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Modal, Button } from '@dotkomonline/design-system';
import { FC } from 'react';
import React, { FC } from 'react';
import style from './modal.less';

interface ConfirmModalProps {
Expand Down
33 changes: 16 additions & 17 deletions src/common/components/Modal/modal.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
.title {
font-size: 1.2rem;
font-weight: bold;
margin-bottom: 0.5rem;

font-size: 1.2rem;
font-weight: bold;
margin-bottom: 0.5rem;
}

.message {
font-size: 1.1rem;
font-size: 1.1rem;
}

.buttonContainer {
display: flex;
flex-direction: row;
justify-content: center;
align-items: flex-end;
width: 100%;
gap: 0.5rem;
margin-top: 0.5rem;
display: flex;
flex-direction: row;
justify-content: center;
align-items: flex-end;
width: 100%;
gap: 0.5rem;
margin-top: 0.5rem;

& > button {
padding: 0.5rem 1.4rem;
min-width: 5rem;
}
}
& > button {
padding: 0.5rem 1.4rem;
min-width: 5rem;
}
}
66 changes: 33 additions & 33 deletions src/core/components/Footer/ContactInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,41 @@ const ContactInfo = () => {
//Update phone number whenever a new leader of Online is elected
const contactTlf = '454 61 372';
return (
<>
<address>
<p>Besøksadresse: </p>
<p>A-blokka, A4-137</p>
<p>Høgskoleringen 5 </p>
<p>NTNU Gløshaugen</p>
</address>
<div>
<p>Kontaktinformasjon:</p>
<p>
<FontAwesomeIcon icon={faBriefcase} fixedWidth /> 992 548 045 (OrgNr)
</p>
<a href="mailto:[email protected]">
<>
<address>
<p>Besøksadresse: </p>
<p>A-blokka, A4-137</p>
<p>Høgskoleringen 5 </p>
<p>NTNU Gløshaugen</p>
</address>
<div>
<p>Kontaktinformasjon:</p>
<p>
<FontAwesomeIcon icon={faEnvelope} fixedWidth /> [email protected]
<FontAwesomeIcon icon={faBriefcase} fixedWidth /> 992 548 045 (OrgNr)
</p>
</a>
<a href="mailto:[email protected]">
<p>
<FontAwesomeIcon icon={faFile} fixedWidth /> [email protected] <br />
</p>
</a>
<a href={"tel:+47"+contactTlf.replace(/\s+/g, '')}>
<p>
<FontAwesomeIcon icon={faMobileAlt} fixedWidth /> {contactTlf}
</p>
</a>
</div>
<div>
<p>Post og faktura: </p>
<p>Online Linjeforening </p>
<p>Sem Sælands vei 9 </p>
<p>7491 Trondheim</p>
</div>
</>
<a href="mailto:[email protected]">
<p>
<FontAwesomeIcon icon={faEnvelope} fixedWidth /> [email protected]
</p>
</a>
<a href="mailto:[email protected]">
<p>
<FontAwesomeIcon icon={faFile} fixedWidth /> [email protected] <br />
</p>
</a>
<a href={'tel:+47' + contactTlf.replace(/\s+/g, '')}>
<p>
<FontAwesomeIcon icon={faMobileAlt} fixedWidth /> {contactTlf}
</p>
</a>
</div>
<div>
<p>Post og faktura: </p>
<p>Online Linjeforening </p>
<p>Sem Sælands vei 9 </p>
<p>7491 Trondheim</p>
</div>
</>
);
};

Expand Down
8 changes: 4 additions & 4 deletions src/events/components/DetailView/detail.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

@gap: 1rem;

.calendarButton > button {
width: 100%;
}

.container {
display: grid;
grid-template-columns: 5fr 2fr;
Expand Down Expand Up @@ -169,7 +173,3 @@
.calendarButton {
margin-top: 1em;
}

.calendarButton > button {
width: 100%;
}
2 changes: 1 addition & 1 deletion src/pages/applications/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import style from '../../applications/committee.less';

const Committees: React.FC = () => {
const [committees, setCommittees] = useState<IOnlineGroup[]>([]);
const applicationFormUrl = 'https://forms.gle/BpQfh42FXfC85tNd6' // updated for August 2023
const applicationFormUrl = 'https://forms.gle/BpQfh42FXfC85tNd6'; // updated for August 2023

useEffect(() => {
console.log('Running');
Expand Down
1 change: 0 additions & 1 deletion src/profile/components/Settings/Calendar/calendar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@
font-size: 1.1rem;
margin-top: 1rem;
}

Loading