Skip to content

Commit c7e5ab6

Browse files
jennydamanindefinities
authored andcommitted
Add message to feature yourself on People
- Add default colors for <a> in styles - Pass isMobile to <router-view> - Conditional flow-direction for member social links buttons - Add message at top of People page notifying visitors they may feature themselves by making a PR or emailing webmaster@nuhacks.io
1 parent b69c564 commit c7e5ab6

File tree

5 files changed

+71
-26
lines changed

5 files changed

+71
-26
lines changed

src/components/hacks-nav.vue

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ export default {
7171
display: block;
7272
margin: auto;
7373
74-
@media (max-width: $hacks-page-width) {
75-
display: unset;
76-
}
77-
7874
&__button {
7975
line-height: 48px;
8076
cursor: pointer;
@@ -100,12 +96,12 @@ export default {
10096
text-decoration: none;
10197
font-weight: 900;
10298
size: 14px !important;
103-
color: $hacks-nav-inactive-color;
99+
color: $hacks-nav-inactive-color !important;
104100
font-size: $hacks-h2;
105-
padding: 0.5em 1em;
101+
padding: 0.5em;
106102
107103
&.router-link-exact-active {
108-
color: $hacks-nav-active-color;
104+
color: $hacks-nav-active-color !important;
109105
}
110106
111107
&:hover,
@@ -131,7 +127,7 @@ export default {
131127
display: flex;
132128
flex-wrap: wrap;
133129
align-items: baseline;
134-
max-width: fit-content;
130+
margin: unset;
135131
margin-top: 1em;
136132
137133
:nth-child(1) {

src/styles/_default.scss

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,16 @@ p {
3030
font-size: $hacks-text;
3131
margin: unset;
3232
}
33+
34+
a,
35+
a:visited {
36+
color: $hacks-a;
37+
}
38+
39+
a:hover {
40+
color: $hacks-a-hover;
41+
}
42+
43+
a:active {
44+
color: $hacks-a-active;
45+
}

src/styles/_variables.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ $hacks-nav-inactive-color: #c5e0da;
1818
$hacks-text-color: #d2dad3;
1919
$hacks-dark-text-color: #52414c;
2020
$hacks-background-color: #1b263b;
21+
$hacks-a: #465775;
22+
$hacks-a-hover: #4e2c3d;
23+
$hacks-a-active: #a13d63;

src/views/Members.vue

Lines changed: 49 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,29 @@
11
<template>
22
<section class="hacks-members">
3+
<p class="feature-message">
4+
<small>
5+
Want to feature yourself?
6+
<br />Make a
7+
<a
8+
class="hacks-members__link"
9+
href="https://github.com/hacks/hacks.github.io/blob/vue/src/data/members.js"
10+
>PR</a>
11+
or email
12+
<a
13+
class="hacks-members__link"
14+
href="mailto:webmaster@nuhacks.io"
15+
>webmaster@nuhacks.io</a>
16+
your name, interests, and a photo!
17+
</small>
18+
</p>
19+
320
<div v-for="(person, index) in members" :key="index">
421
<div class="hacks-members__row hacks-members__member">
5-
<div class="hacks-members__column">
6-
<hacks-button
7-
v-if="person.links.website"
8-
:link="person.links.website"
9-
>
22+
<div :style="{flexDirection: + isMobile ? 'row' : 'column'}" class="hacks-members__column">
23+
<hacks-button v-if="person.links.website" :link="person.links.website">
1024
<img :src="cursorIcon" />
1125
</hacks-button>
12-
<hacks-button
13-
v-if="person.links.email"
14-
:link="`mailto:${person.links.email}`"
15-
>
26+
<hacks-button v-if="person.links.email" :link="`mailto:${person.links.email}`">
1627
<img :src="outlookIcon" />
1728
</hacks-button>
1829
<hacks-button
@@ -32,9 +43,7 @@
3243
<div class="hacks-members__list">
3344
<p class="hacks-small-caps">interests</p>
3445
<ul>
35-
<li v-for="(interest, index) in person.interests" :key="index">
36-
{{ interest }}
37-
</li>
46+
<li v-for="(interest, index) in person.interests" :key="index">{{ interest }}</li>
3847
</ul>
3948
</div>
4049
</div>
@@ -51,17 +60,24 @@ export default {
5160
name: "hacks-members",
5261
components: {
5362
HacksProfileCard,
54-
HacksButton,
63+
HacksButton
64+
},
65+
props: {
66+
isMobile: {
67+
type: Boolean,
68+
required: true,
69+
default: false
70+
}
5571
},
5672
data() {
5773
return {
5874
members: MEMBERS,
5975
githubIcon: require("../assets/GitHub-Mark-64px.png"),
6076
cursorIcon: require("../assets/cursor.svg"),
6177
linkedinIcon: require("../assets/linkedin.svg"),
62-
outlookIcon: require("../assets/microsoft-outlook.svg"),
78+
outlookIcon: require("../assets/microsoft-outlook.svg")
6379
};
64-
},
80+
}
6581
};
6682
</script>
6783

@@ -114,13 +130,30 @@ export default {
114130
&__column {
115131
margin-top: 2em;
116132
display: flex;
117-
flex-flow: column wrap;
118133
}
119134
120135
&__column img {
121136
display: block;
122137
width: 20px;
123138
margin: auto 1em;
124139
}
140+
141+
.feature-message {
142+
width: 100%;
143+
margin-bottom: 1em;
144+
border: 1px solid white;
145+
border-radius: 25px;
146+
147+
a {
148+
color: white !important;
149+
}
150+
}
151+
152+
.feature-message > * {
153+
display: block;
154+
width: 60vw;
155+
margin: auto;
156+
padding: 1em;
157+
}
125158
}
126159
</style>

src/views/Page.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<section class="hacks-page">
33
<github-corner :is-mobile="isMobile" :link="link" />
44
<hacks-nav :is-mobile="isMobile" />
5-
<router-view />
5+
<router-view :is-mobile="isMobile" />
66
</section>
77
</template>
88

@@ -23,7 +23,7 @@ export default {
2323
};
2424
},
2525
beforeMount() {
26-
const breakpoint = window.matchMedia("( max-width: 981px )");
26+
const breakpoint = window.matchMedia("( max-width: 710px )");
2727
this.addQuery(breakpoint, mq => {
2828
this.isMobile = mq.matches;
2929
});

0 commit comments

Comments
 (0)