Skip to content

Commit 81e4298

Browse files
authored
Merge pull request #42 from ishythefishy/add-audio-playback
Add credits to footer
2 parents 8f9e312 + 71cba28 commit 81e4298

File tree

5 files changed

+113
-38
lines changed

5 files changed

+113
-38
lines changed
Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,47 @@
11
<footer class="footer">
2-
<p class="footer__copyright">&copy; {{ date | date: "yyyy" }} Fretonator</p>
2+
<h6 class="footer__creditsTitle">Fretonator is open source</h6>
3+
<p class="footer__thanksCopy">
4+
Thank you to the following generous contributors:
5+
</p>
6+
<ul class="footer__creditsList">
7+
<li class="footer__creditsListItem">
8+
<a
9+
href="http://drozar.io"
10+
rel="nofollow noopener noreferrer"
11+
target="_blank"
12+
class="footer__creditsListItemLink"
13+
>
14+
Jacob D'Rozario
15+
</a>
16+
- design & UX
17+
</li>
18+
<li class="footer__creditsListItem">
19+
<a
20+
href="https://github.com/geometricpanda"
21+
rel="nofollow noopener noreferrer"
22+
target="_blank"
23+
class="footer__creditsListItemLink"
24+
>Jim Drury</a
25+
>
26+
- all things Angular
27+
</li>
28+
<li class="footer__creditsListItem">
29+
<a
30+
href="https://ell.io.tt/"
31+
rel="nofollow noopener noreferrer"
32+
target="_blank"
33+
class="footer__creditsListItemLink"
34+
>Elliot Brooks</a
35+
>
36+
- audio playback
37+
</li>
38+
</ul>
339
<a
440
class="footer__viewGithub"
541
href="https://github.com/ishythefishy/fretonator"
642
rel="nofollow noopener noreferrer"
743
target="_blank"
844
>View on GitHub</a
945
>
46+
<p class="footer__copyright">&copy; {{ date | date: 'yyyy' }} Fretonator</p>
1047
</footer>
Lines changed: 40 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
@import "../../../styles/vars";
2-
@import "../../../styles/functions";
3-
@import "../../../styles/mixins";
1+
@import '../../../styles/vars';
2+
@import '../../../styles/functions';
3+
@import '../../../styles/mixins';
4+
@import '../../../styles/typography';
45

56
.footer {
6-
background-color: var(--peach);
7+
background-color: var(--black);
78
box-sizing: border-box;
89
display: flex;
910
flex-direction: column;
@@ -12,8 +13,41 @@
1213
padding: pxToRem($grid-unit * 2);
1314
}
1415

16+
.footer__thanksCopy {
17+
@include font_bodyCopy();
18+
color: var(--offwhite);
19+
}
20+
21+
.footer__creditsTitle {
22+
@include font_medium();
23+
margin-top: pxToRem($grid-unit);
24+
margin-bottom: pxToRem($grid-unit);
25+
color: var(--peach);
26+
font-weight: var(--font-weight-bold);
27+
}
28+
29+
.footer__creditsList {
30+
list-style: none;
31+
text-align: center;
32+
padding: 0;
33+
margin-bottom: pxToRem($grid-unit * 4);
34+
}
35+
36+
.footer__creditsListItem {
37+
@include font_bodyCopy();
38+
color: var(--offwhite);
39+
}
40+
41+
.footer__creditsListItemLink {
42+
@include text_link();
43+
color: var(--yellow);
44+
border-color: var(--yellow);
45+
46+
@include focus_accessible();
47+
}
48+
1549
.footer__copyright {
16-
color: var(--black);
50+
color: var(--offwhite);
1751
font-size: pxToRem(12);
1852
letter-spacing: var(--letter-spacing-display);
1953
font-weight: var(--font-weight-bold);
@@ -23,10 +57,6 @@
2357
}
2458

2559
.footer__viewGithub {
26-
color: var(--black);
27-
font-size: pxToRem(12);
28-
display: block;
60+
@include hard_button_base();
2961
margin-bottom: pxToRem($grid-unit * 2);
30-
31-
@include focus_accessible($focus_box_shadow_color_alt);
3262
}

apps/fretonator-web/src/app/common/fretonator/scale-map/scale-map.component.scss

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -167,35 +167,12 @@
167167
}
168168

169169
.infoHighlight {
170-
border-radius: var(--border-radius-button);
170+
border-radius: var(--border-radius-chip);
171171
padding: pxToRem($grid-unit / 4) pxToRem($grid-unit * 2);
172172
color: var(--black);
173173
background-color: var(--peach);
174174
}
175175

176176
.actionButton {
177-
border-radius: var(--border-radius-button);
178-
border: pxToRem(2) solid var(--offwhite);
179-
text-transform: uppercase;
180-
font-family: var(--font-family-main);
181-
font-size: pxToRem(18);
182-
margin-left: auto;
183-
margin-right: auto;
184-
display: inline-block;
185-
background-color: transparent;
186-
padding: pxToRem($grid-unit) pxToRem($grid-unit * 2);
187-
color: var(--offwhite);
188-
text-decoration: none;
189-
cursor: pointer;
190-
transition: all 0.2s ease-in-out;
191-
font-weight: var(--font-weight-bold);
192-
letter-spacing: var(--letter-spacing-display);
193-
margin-top: pxToRem($grid-unit * 3);
194-
195-
@include focus_accessible();
196-
197-
&:hover {
198-
border-color: var(--yellow);
199-
color: var(--yellow);
200-
}
177+
@include hard_button_base();
201178
}

apps/fretonator-web/src/styles.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030

3131
--border-width-base: 1px;
3232
--border-radius-base: 2px;
33-
--border-radius-button: 16px;
33+
--border-radius-chip: 16px;
34+
--border-radius-button: 0;
3435

3536
--border-width-button: 2px;
3637

apps/fretonator-web/src/styles/_mixins.scss

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
border-style: solid;
4242
border-color: var(--black);
4343
background-color: var(--white);
44-
border-radius: var(--border-radius-button);
44+
border-radius: var(--border-radius-chip);
4545
padding: pxToRem(4) pxToRem(8);
4646
cursor: pointer;
4747
font-weight: var(--font-weight-bold);
@@ -52,3 +52,33 @@
5252

5353
@include focus_accessible();
5454
}
55+
56+
@mixin hard_button_base(
57+
$foregroundColor: var(--offwhite),
58+
$backgroundColor: var(--black)) {
59+
border-radius: var(--border-radius-button);
60+
border: pxToRem(2) solid $foregroundColor;
61+
text-transform: uppercase;
62+
font-family: var(--font-family-main);
63+
font-size: pxToRem(18);
64+
margin-left: auto;
65+
margin-right: auto;
66+
display: inline-block;
67+
background-color: $backgroundColor;
68+
padding: pxToRem($grid-unit) pxToRem($grid-unit * 2);
69+
color: $foregroundColor;
70+
text-decoration: none;
71+
cursor: pointer;
72+
transition: all 0.2s ease-in-out;
73+
font-weight: var(--font-weight-bold);
74+
letter-spacing: var(--letter-spacing-display);
75+
margin-top: pxToRem($grid-unit * 3);
76+
box-shadow: 8px 8px 0 0 $foregroundColor;
77+
78+
@include focus_accessible();
79+
80+
&:hover {
81+
border-color: var(--yellow);
82+
color: var(--yellow);
83+
}
84+
}

0 commit comments

Comments
 (0)