Skip to content

Commit 71b14a5

Browse files
Make a consistent experience when looking at pentatonic scales as well
1 parent 45089d8 commit 71b14a5

File tree

6 files changed

+1
-56
lines changed

6 files changed

+1
-56
lines changed

apps/fretonator-web/src/app/common/fretonator/fretboard/fretboard.component.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@
4444
<div class="controlPanel">
4545
<div class="controlPanel__row">
4646
<div class="controlPanel__section">
47-
<h4 class="controlPanel__title" *ngIf="mode | displayScaleDegrees">Highlight scale degrees</h4>
47+
<h4 class="controlPanel__title">Highlight scale degrees</h4>
4848
<app-scale-degrees
49-
*ngIf="mode | displayScaleDegrees"
5049
[tonicActive]="highlightedDegrees.has(ScaleDegrees.tonic)"
5150
[mediantActive]="highlightedDegrees.has(ScaleDegrees.mediant)"
5251
[dominantActive]="highlightedDegrees.has(ScaleDegrees.dominant)"

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -326,14 +326,6 @@ $note-height: 36;
326326
color: var(--note-color-dominant);
327327
}
328328
}
329-
330-
&[data-mode="majorPentatonic"],
331-
&[data-mode="minorPentatonic"] {
332-
&:after {
333-
background-color: var(--note-background) !important;
334-
color: var(--note-color) !important;
335-
}
336-
}
337329
}
338330

339331
.fretboard__cell--string {

apps/fretonator-web/src/app/common/fretonator/scale-map/display-scale-degrees.pipe.spec.ts

Lines changed: 0 additions & 27 deletions
This file was deleted.

apps/fretonator-web/src/app/common/fretonator/scale-map/display-scale-degrees.pipe.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

apps/fretonator-web/src/app/common/fretonator/scale-map/scale-map.module.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { ScaleMapComponent } from './scale-map.component';
4-
import { DisplayScaleDegreesPipe } from './display-scale-degrees.pipe';
5-
import { GetEnharmonicEquivalentPipe } from '../get-enharmonic-equivalent.pipe';
64
import { RouterModule } from '@angular/router';
7-
import { GetEnharmonicRouterLinkPipe } from '../get-enharmonic-router-link.pipe';
85
import { CrossModule } from '../../svgs/cross/cross.module';
96
import { PlayModule } from '../../svgs/play/play.module';
107
import { ScaleDegreesModule } from '../scale-degrees/scale-degrees.module';
@@ -13,11 +10,9 @@ import { ScaleDegreesModule } from '../scale-degrees/scale-degrees.module';
1310
@NgModule({
1411
declarations: [
1512
ScaleMapComponent,
16-
DisplayScaleDegreesPipe
1713
],
1814
exports: [
1915
ScaleMapComponent,
20-
DisplayScaleDegreesPipe
2116
],
2217
imports: [
2318
CommonModule,

apps/fretonator-web/src/app/pages/home/home-index/__snapshots__/home-index.component.spec.ts.snap

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,13 +1208,11 @@ exports[`HomeIndexComponent should create 1`] = `
12081208
<div
12091209
class="controlPanel__section"
12101210
>
1211-
12121211
<h4
12131212
class="controlPanel__title"
12141213
>
12151214
Highlight scale degrees
12161215
</h4>
1217-
12181216
<app-scale-degrees>
12191217
<div
12201218
class="degreesDisplay"

0 commit comments

Comments
 (0)