Skip to content

Commit 3addab5

Browse files
author
Salma Alam-Naylor
committed
Small fixes
1 parent 01b5c76 commit 3addab5

File tree

3 files changed

+17
-10
lines changed

3 files changed

+17
-10
lines changed

apps/fretonator-web/src/app/common/fret-map/fret-map.service.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,6 @@ export class FretMapService {
328328

329329
const modeMap = origModeMap.map((noteObject, index) => ({
330330
...noteObject,
331-
displayName: this.convertNoteObjectToHumanReadable(noteObject),
332331
degree: ScaleDegrees[index]
333332
}));
334333

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

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,10 @@
4040
bottom: 50%;
4141
left: 0;
4242
right: 0;
43-
transform: translatey(calc(50% - 1px));
44-
opacity: .9;
43+
transform: translateY(calc(50% - 1px));
4544
cursor: pointer;
4645
}
4746

48-
&:hover:after{
49-
opacity: 1;
50-
}
51-
5247
&:nth-child(-n + 13) {
5348
height: calc(var(--string-height-base) / 2);
5449

@@ -102,22 +97,34 @@
10297
content: attr(data-display-note);
10398
height: var(--note-height);
10499
width: var(--note-height);
100+
line-height: var(--note-height);
105101
left: 50%;
106102
right: unset;
107103
box-sizing: border-box;
108104
border-radius: 50%;
109105
transform: translate(-50%, 50%);
110106
background-color: var(--note-background);
111107
color: var(--note-color);
112-
line-height: var(--note-height);
113108
text-align: center;
114109
font-weight: var(--font-weight-bold);
115110
font-family: var(--font-family-main);
116111
font-size: pxToRem(12);
112+
opacity: 0.9;
113+
transition-duration: 0.1s;
114+
transition-property: line-height, height, width, opacity;
115+
transition-timing-function: ease-in-out;
116+
}
117+
118+
&:hover:after,
119+
&:active:after {
120+
opacity: 1;
121+
height: var(--note-height-hover);
122+
width: var(--note-height-hover);
123+
line-height: var(--note-height-hover);
117124
}
118125

119126
&:nth-child(-n + 13):after {
120-
transform: translate(-50%, 1px);
127+
transform: translate(-50%, 6px);
121128
}
122129

123130
&:nth-last-child(-n + 13):after {
@@ -183,7 +190,7 @@
183190
}
184191

185192
&:nth-child(-n + 13):after {
186-
transform: translate(-50%, 1px);
193+
transform: translate(-50%, 6px);
187194
}
188195

189196
&:nth-last-child(-n + 13):after {

apps/fretonator-web/src/styles.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
--note-color: #fafac6;
1919
--note-background: #1c1c1c;
2020
--note-height: 36px;
21+
--note-height-hover: 39px;
2122

2223
--note-bg-tonic: #fecdaa;
2324
--note-color-tonic: #1c1c1c;

0 commit comments

Comments
 (0)