diff --git a/src/components/CommitteeContainer/CommitteeContainer.scss b/src/components/CommitteeContainer/CommitteeContainer.scss index b717717..a6f33c0 100644 --- a/src/components/CommitteeContainer/CommitteeContainer.scss +++ b/src/components/CommitteeContainer/CommitteeContainer.scss @@ -6,6 +6,15 @@ justify-content: flex-start; color: color('dark-blue'); + .committee-name { + display: flex; + justify-content: center; + text-transform: uppercase; + letter-spacing: 3px; + line-height: 14px; + font-weight: bold; + } + &__contacts { display: flex; flex-flow: row wrap; diff --git a/src/components/CommitteeContainer/CommitteeContainer.tsx b/src/components/CommitteeContainer/CommitteeContainer.tsx index 8337319..0dac08b 100644 --- a/src/components/CommitteeContainer/CommitteeContainer.tsx +++ b/src/components/CommitteeContainer/CommitteeContainer.tsx @@ -15,10 +15,10 @@ class CommitteeContainer extends React.Component -
+
{name_fi}
-
+
{name_en}
diff --git a/src/components/ContactCard/ContactCard.scss b/src/components/ContactCard/ContactCard.scss index 19f4c79..7f87a42 100644 --- a/src/components/ContactCard/ContactCard.scss +++ b/src/components/ContactCard/ContactCard.scss @@ -7,6 +7,14 @@ color: color(dark-blue); margin: 1rem 1rem; + &__notBoard { + order: 1; + } + + &__chair { + order: -1; + } + &__info { display: flex; flex-direction: column; diff --git a/src/components/ContactCard/ContactCard.tsx b/src/components/ContactCard/ContactCard.tsx index 10b76e7..10ff8b9 100644 --- a/src/components/ContactCard/ContactCard.tsx +++ b/src/components/ContactCard/ContactCard.tsx @@ -16,8 +16,14 @@ export interface ContactCardState { } class ContactCard extends React.Component { render() { const { first_name, last_name, phone, email, image, role } = this.props; + let className = "contact-card" + if (!role.is_board) { + className += " contact-card__notBoard" + } else if (role.name_fi === "Puheenjohtaja") { + className += " contact-card__chair" + } return ( -
+
profile_image
diff --git a/src/pages/ContactsPage/ContactsPage.tsx b/src/pages/ContactsPage/ContactsPage.tsx index a936838..e344645 100644 --- a/src/pages/ContactsPage/ContactsPage.tsx +++ b/src/pages/ContactsPage/ContactsPage.tsx @@ -82,29 +82,32 @@ class ContactsPage extends React.Component - +

Asiaa olisi, mutta kehen ottaa yhteyttä?
Tämä sivu yrittää valottaa sen oikean ihmisen puhelinnumeroa ja sähköpostiosoitetta.

- +

Hallitukseen saa yhteyden lähettämällä sähköpostia sik-hallitus@list.ayy.fi

- {committees.map((committee, index) => ( - - x.role.committee.name_fi === committee.name_fi)} /> - - ))} + {committees.map((committee, index) => { + const order = committee.name_fi === "Toimikunnattomat" ? 1 : 0; + return ( + + x.role.committee.name_fi === committee.name_fi)} /> + + ) + })}
); }