Skip to content

Commit

Permalink
Merge pull request #705 from dotkom/fix/fix-linting-workflow
Browse files Browse the repository at this point in the history
Fix linting workflow
  • Loading branch information
jotjern authored Nov 10, 2023
2 parents d26e409 + 1b45bf2 commit a314f02
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 57 deletions.
1 change: 1 addition & 0 deletions .npmrc
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
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
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
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@
font-size: 1.1rem;
margin-top: 1rem;
}

1 comment on commit a314f02

@vercel
Copy link

@vercel vercel bot commented on a314f02 Nov 10, 2023

Choose a reason for hiding this comment

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

Please sign in to comment.