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

no-chris · no-chris · commit a556299d5318 · 2021-12-13T21:59:48.000+01:00
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

Original file line number	Diff line number	Diff line change
`@@ -34,54 +34,57 @@ $themes: (`
`34`	`34`
`35`	`35`	`.cmLine {`
`36`	`36`	`margin: 0;`
`37`		`- font-family: $font-family-monospace;`
	`37`	`+ font-family: Consolas, 'Andale Mono WT', 'Andale Mono', 'Lucida Console',`
	`38`	`+ 'Lucida Sans Typewriter', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono',`
	`39`	`+ 'Liberation Mono', 'Nimbus Mono L', Monaco, 'Courier New', Courier,`
	`40`	`+ monospace;`
`38`	`41`	`white-space: pre-wrap;`
`39`	`42`
`40`	`43`	`// editorPreview`
`41`	`44`	`.editorPreview & {`
`42`	`45`	`padding: 0 $spacer-small;`
`43`		`- @include font-size(small);`
	`46`	`+ @include font-size(normal);`
`44`	`47`	`}`
`45`	`48`	`.exportPreview & {`
`46`		`- @include font-size(small);`
	`49`	`+ @include font-size(normal);`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`// playRenderer`
`50`	`53`	`.playRenderer {`
`51`	`54`	`padding: 0 $spacer-small;`
`52`	`55`	`}`
`53`	`56`	`.playRenderer.cmLine--fontSize-5 & {`
`54`		`- font-size: 7px;`
	`57`	`+ font-size: 9px;`
`55`	`58`	`}`
`56`	`59`	`.playRenderer.cmLine--fontSize-4 & {`
`57`		`- font-size: 8px;`
	`60`	`+ font-size: 10px;`
`58`	`61`	`}`
`59`	`62`	`.playRenderer.cmLine--fontSize-3 & {`
`60`		`- font-size: 9px;`
	`63`	`+ font-size: 11px;`
`61`	`64`	`}`
`62`	`65`	`.playRenderer.cmLine--fontSize-2 & {`
`63`		`- font-size: 10px;`
	`66`	`+ font-size: 12px;`
`64`	`67`	`}`
`65`	`68`	`.playRenderer.cmLine--fontSize-1 & {`
`66`		`- font-size: 11px;`
	`69`	`+ font-size: 13px;`
`67`	`70`	`}`
`68`	`71`	`.playRenderer.cmLine--fontSize0 & {`
`69`		`- font-size: 12px;`
	`72`	`+ font-size: 14px;`
`70`	`73`	`}`
`71`	`74`	`.playRenderer.cmLine--fontSize1 & {`
`72`		`- font-size: 13px;`
	`75`	`+ font-size: 15px;`
`73`	`76`	`}`
`74`	`77`	`.playRenderer.cmLine--fontSize2 & {`
`75`		`- font-size: 14px;`
	`78`	`+ font-size: 16px;`
`76`	`79`	`}`
`77`	`80`	`.playRenderer.cmLine--fontSize3 & {`
`78`		`- font-size: 15px;`
	`81`	`+ font-size: 17px;`
`79`	`82`	`}`
`80`	`83`	`.playRenderer.cmLine--fontSize4 & {`
`81`		`- font-size: 16px;`
	`84`	`+ font-size: 18px;`
`82`	`85`	`}`
`83`	`86`	`.playRenderer.cmLine--fontSize5 & {`
`84`		`- font-size: 17px;`
	`87`	`+ font-size: 19px;`
`85`	`88`	`}`
`86`	`89`
`87`	`90`	`// printPreview`