Merge branch 'master' of github.com:no-chris/chords-charts-studio

no-chris · Dec 13, 2021 · a556299 · a556299
2 parents c82f351 + a23ec69
commit a556299
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 24 deletions.
diff --git a/packages/chord-charts-studio/scss/chordMark.scss b/packages/chord-charts-studio/scss/chordMark.scss
@@ -34,54 +34,57 @@ $themes: (
 
 .cmLine {
 	margin: 0;
-	font-family: $font-family-monospace;
+	font-family: Consolas, 'Andale Mono WT', 'Andale Mono', 'Lucida Console',
+		'Lucida Sans Typewriter', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono',
+		'Liberation Mono', 'Nimbus Mono L', Monaco, 'Courier New', Courier,
+		monospace;
 	white-space: pre-wrap;
 
 	// editorPreview
 	.editorPreview & {
 		padding: 0 $spacer-small;
-		@include font-size(small);
+		@include font-size(normal);
 	}
 	.exportPreview & {
-		@include font-size(small);
+		@include font-size(normal);
 	}
 
 	// playRenderer
 	.playRenderer {
 		padding: 0 $spacer-small;
 	}
 	.playRenderer.cmLine--fontSize-5 & {
-		font-size: 7px;
+		font-size: 9px;
 	}
 	.playRenderer.cmLine--fontSize-4 & {
-		font-size: 8px;
+		font-size: 10px;
 	}
 	.playRenderer.cmLine--fontSize-3 & {
-		font-size: 9px;
+		font-size: 11px;
 	}
 	.playRenderer.cmLine--fontSize-2 & {
-		font-size: 10px;
+		font-size: 12px;
 	}
 	.playRenderer.cmLine--fontSize-1 & {
-		font-size: 11px;
+		font-size: 13px;
 	}
 	.playRenderer.cmLine--fontSize0 & {
-		font-size: 12px;
+		font-size: 14px;
 	}
 	.playRenderer.cmLine--fontSize1 & {
-		font-size: 13px;
+		font-size: 15px;
 	}
 	.playRenderer.cmLine--fontSize2 & {
-		font-size: 14px;
+		font-size: 16px;
 	}
 	.playRenderer.cmLine--fontSize3 & {
-		font-size: 15px;
+		font-size: 17px;
 	}
 	.playRenderer.cmLine--fontSize4 & {
-		font-size: 16px;
+		font-size: 18px;
 	}
 	.playRenderer.cmLine--fontSize5 & {
-		font-size: 17px;
+		font-size: 19px;
 	}
 
 	// printPreview

diff --git a/packages/chord-charts-studio/src/editor/songEditor/prosemirror/ProsemirrorEditorView.scss b/packages/chord-charts-studio/src/editor/songEditor/prosemirror/ProsemirrorEditorView.scss
@@ -16,8 +16,11 @@ $themes: (
 	height: 100%;
 
 	outline: none;
-	font-family: $font-family-monospace;
-	@include font-size(small);
+	font-family: Consolas, 'Andale Mono WT', 'Andale Mono', 'Lucida Console',
+		'Lucida Sans Typewriter', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono',
+		'Liberation Mono', 'Nimbus Mono L', Monaco, 'Courier New', Courier,
+		monospace;
+	@include font-size(normal);
 
 	@include themify($themes) {
 		color: themed('editor-txt');

diff --git a/packages/chord-charts-studio/src/songRenderers/exportPreview/_components/ExportPreview.scss b/packages/chord-charts-studio/src/songRenderers/exportPreview/_components/ExportPreview.scss
@@ -18,10 +18,13 @@ $themes: (
 .exp-SongRenderer {
 	p {
 		margin: 0;
-		font-family: $font-family-monospace;
+		font-family: Consolas, 'Andale Mono WT', 'Andale Mono', 'Lucida Console',
+			'Lucida Sans Typewriter', 'DejaVu Sans Mono',
+			'Bitstream Vera Sans Mono', 'Liberation Mono', 'Nimbus Mono L',
+			Monaco, 'Courier New', Courier, monospace;
 		white-space: pre-wrap;
 
-		@include font-size(small);
+		@include font-size(normal);
 	}
 
 	@include themify($themes) {

diff --git a/packages/chord-charts-studio/src/ui/layout/app/_components/Nav.scss b/packages/chord-charts-studio/src/ui/layout/app/_components/Nav.scss
@@ -17,9 +17,14 @@
 .mainNavEntry {
 	display: inline-block;
 	padding: $spacer-small $spacer-medium;
-	cursor: pointer;
+	cursor: default;
+	font-weight: bold;
 
-	&:hover:not(.mainNavEntry-isDisabled) {
+	&:hover:not(.mainNavEntry-isActive) {
+		cursor: pointer;
+	}
+
+	&:hover:not(.mainNavEntry-isDisabled):not(.mainNavEntry-isActive) {
 		@include themify($themes) {
 			color: themed('header-txtHover');
 			background-color: themed('header-bgHover');

diff --git a/packages/chord-charts-studio/src/ui/layout/app/_themes.scss b/packages/chord-charts-studio/src/ui/layout/app/_themes.scss
@@ -12,12 +12,12 @@ $themes: (
 		leftBar-collapser-border: cv(dark-foreground, dark30),
 		// header
 		header-txt: cv(dark-foreground, fade),
-		header-txtHover: cv(dark-foreground),
-		header-txtActive: cv(dark-foreground),
+		header-txtHover: cv(dark-primary, dark10),
+		header-txtActive: cv(dark-primary, dark10),
 		header-txtDisabled: cv(dark-foreground, dark30),
 		header-bg: cv(dark-background),
-		header-bgHover: cv(dark-background, light10),
-		header-bgActive: cv(dark-background, dark10),
+		header-bgHover: cv(dark-accent, light20),
+		header-bgActive: cv(dark-accent),
 		header-bgDisabled: cv(dark-background),
 		header-border: cv(dark-background, dark10),
 		// footer