Skip to content

Commit

Permalink
Merge pull request #99 from AaronDavidNewman/ui-button-array
Browse files Browse the repository at this point in the history 
UI button array
  • Loading branch information
@AaronDavidNewman
AaronDavidNewman authored Sep 22, 2024
2 parents 9a1ce0d + 52dd9a7 commit d4036ab
Show file tree
Hide file tree
Showing 104 changed files with 18,723 additions and 2,050 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ We are approaching Smoosic 1.0 status! Many of the things I wanted to do with S
* dynamic music library with links to scores, tags etc. Inspired by iRealPro app 'ireal' format
* library mode for custom applications

Smoosic is highly dependent on the [Vexflow engraving library](https://github.com/0xfe/vexflow), and especially its authors/maintainers [@rvilari](https://github.com/0xfe/vexflow/commits?author=rvilarl), [@ronyeh](https://github.com/0xfe/vexflow/commits?author=ronyeh) and [@0xfe](https://github.com/0xfe).
Smoosic is highly dependent on the [Vexflow engraving library](https://github.com/0xfe/vexflow), and especially its authors/maintainers [@rvilarl](https://github.com/0xfe/vexflow/commits?author=rvilarl), [@ronyeh](https://github.com/0xfe/vexflow/commits?author=ronyeh) and [@0xfe](https://github.com/0xfe).

See [changes](https://aarondavidnewman.github.io/Smoosic/changes.html) for changes, updates, initiatives etc.

Expand Down
4 changes: 4 additions & 0 deletions build/build.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
require('child_process').exec('node ./node_modules/webpack-cli/bin/cli.js', (error, stdout, stderr) => {
console.log(`${stdout}`);
console.log(new Date().toUTCString());
});
8 changes: 4 additions & 4 deletions build/html/smoosic.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
<head>
<meta charset="utf-8">
<title>Smoosic Editor</title>
<link href="https://aarondavidnewman.github.io/Smoosic/build/styles/fonts.css" rel="stylesheet">
<link href="../styles/fonts.css" rel="stylesheet">
<link href="../styles/media.css" rel="stylesheet">
<link href="../styles/ribbon.css" rel="stylesheet">
<!-- link href="https://aarondavidnewman.github.io/Smoosic/build/styles/dialogs.css" rel="stylesheet" -->
<link href="../styles/dialogs.css" rel="stylesheet">
<link href="../styles/menus.css" rel="stylesheet">
<link href="https://aarondavidnewman.github.io/Smoosic/build/styles/piano.css" rel="stylesheet">
<link href="https://aarondavidnewman.github.io/Smoosic/build/styles/tree.css" rel="stylesheet">
<!-- link href="https://aarondavidnewman.github.io/Smoosic/build/styles/bravura-font-codes.css" rel="stylesheet" -->
<link href="../styles/bravura-font-codes.css" rel="stylesheet">
<link href="../styles/bootstrap.min.css" rel="stylesheet">
<!-- script type="text/javascript" src="https://aarondavidnewman.github.io/vexflow_smoosic/releases/vexflow-debug.js"></script -->
<script type="text/javascript" src="../../node_modules/vexflow_smoosic/build/cjs/vexflow-debug-with-tests.js"></script>
<!-- script type="text/javascript" src="../../node_modules/vexflow_smoosic/build/cjs/vexflow-debug-with-tests.js"></script -->
<script type="text/javascript" src="../../../vexflow_smoosic/build/cjs/vexflow-debug-with-tests.js"></script>
<!-- script src="https://unpkg.com/[email protected]/build/cjs/vexflow-debug.js"></script -->
<!-- script type="text/javascript" src="..\..\node_modules\vxflw-early-access\build\cjs\vexflow-debug.js"></script -->
<!---- script type="text/javascript" src="../../vxflw-early-access/build/cjs/vexflow-debug.js"></script -->
Expand Down
5 changes: 5 additions & 0 deletions build/styles/bravura-font-codes.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
font-size: 16px;
left: 4px;
}
/* not in file */
.icon-note:before {content: "\2669";}
.icon-grace-note:before {content: "\e562"}
.icon-grace-note-strike:before {content: "\e560"}

.icon-bracketTop:before {content: "\e003";}
.icon-bracketBottom:before {content: "\e004";}
.icon-barlineTick:before {content: "\e039";}
Expand Down
155 changes: 79 additions & 76 deletions build/styles/dialogs.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,12 @@ body.showAttributeDialog .attributeDialog {
top: 0;
display:none;
}

button.nav-link {
width: 100%;
}
.attributeModal {
position:absolute;
width:380px;
min-width:380px;
background: #fff;
border-style: groove;
border-width: 2px;
Expand All @@ -223,72 +225,20 @@ body.showAttributeDialog .attributeDialog {
.attributeModal .buttonContainer .button-right {
margin-left:5px;
}


.attributeModal .buttonContainer button {
border-radius:3px;
padding: 2px 4px;
width:100px;
height:25px;
}

.attributeModal .buttonContainer .ok-button {
border:#9cee9d 1px ridge;
}

.attributeModal .buttonContainer .ok-button:hover {
background:#334488;
color: #fff;
transition-duration: 0.5s;
transition-timing-function:ease;
}

.attributeModal .buttonContainer .cancel-button:hover {
background:#884433;
color: #fff;
transition-duration: 0.5s;
transition-timing-function:ease;
}

.attributeModal .buttonContainer .remove-button:hover {
background:#664433;
color: #ded;
transition-duration: 0.5s;
transition-timing-function:ease;
}

.attributeModal .buttonContainer .remove-button:hover .icon-cancel-circle {
background:#664433;
color: #ded;
}

.attributeModal .buttonContainer .remove-button .icon-cancel-circle {
float:left;
color:#933;
}

.attributeModal .buttonContainer .ok-button:hover {
background:#334488;
color: #fff;
transition-duration: 0.5s;
transition-timing-function:ease;
}


.attributeModal .buttonContainer .cancel-button {
border:#dc8899 1px ridge;
}

.attributeModal .buttonContainer .remove-button {
border:#dc8899 1px ridge;
}


.attributeModal h2 {
text-align:center;
font-size:1.2em;
}

.smoControlContainer .button-array-buttons button.repetext {
font-size: 0.8em;
font-style: italic;
flex: 4 1 220px;
}
.smoControlContainer .button-array-buttons button.repetext .icon-bravura .button-text {
font-size: 12px;
min-width: 35px;
}
.attributeModal.tempoTextMode #dialog-tempo-duration,
.attributeModal.tempoTextMode #dialog-tempo-bpm ,
.attributeModal.tempoDurationMode #dialog-tempo-tempoText {
Expand Down Expand Up @@ -329,6 +279,10 @@ body.showAttributeDialog .attributeDialog {
margin-left:15px;
}

.smoControlContainer .text-input.hide-input input {
display: none;
}

.smoControl.toggleControl {
display:flex;
align-items:center;
Expand Down Expand Up @@ -406,18 +360,70 @@ body.showAttributeDialog .attributeDialog {
border: 2px #ddd outset;
}
.attributeModal .smoControl.buttonArray {
flex: 1 1 100%;
flex-flow: row wrap;
justify-content: center;
bottom:8px;
left:8px;
flex-flow: column nowrap;
border: 2px #ddd outset;
}

.pad-span {
padding: 5px;
}
.attributeModal .smoControl.buttonArray .button-array-row{
display: flex;
flex-flow: row nowrap;
justify-content:flex-start;
}
.button-array-buttons {
display: flex;
align-items: center;
flex: 1 2 auto;
}
.button-row-container {
display:flex;
flex-flow: column;
flex: 1 1 auto;
}
.button-array-label {
display: flex;
flex: 0 0 100px;
min-width: 100px;
justify-content: flex-end;
}
.nav-item {
border-bottom: 1px solid #eee;
}
.attributeModal .smoControl.button-hotkey {
display: flex;
flex-flow: row;
}
.attributeModal .smoControl.button-hotkey button {
width: 70px;
text-align: left;
}
.attributeModal .smoControl.button-hotkey span.button-text {
float: right;
}
.attributeModal .smoControl.buttonArray .icon-bravura {
top:-5px;
left:calc(50% - 12px);
}
.attributeModal .smoControl.buttonArray .icon-bravura.icon-mid {
top: 0;
left:8px;
}
.attributeModal .smoControl.buttonArray .icon-bravura.icon-transparent {
color: #333333aa;
}
.attributeModal .smoControl.buttonArray .icon-bravura.icon-lg {
font-size: 24px;
top:inherit;
}
.attributeModal .smoControl.buttonArray .icon-bravura.icon-top {
left:8px;
}

.attributeModal .smoControl.buttonArray .icon-bravura.icon-brassFallRoughMedium,
.attributeModal .smoControl.buttonArray .icon-bravura.icon-brassLiftMedium {
font-size:20px;
top:50%;
}
.smoControl.buttonArray button:hover {
background:#334488;
color: #fff;
Expand Down Expand Up @@ -456,21 +462,18 @@ button.button-array.initial {
}

.smoControl button, .smoControl input,.smoControl select {
margin-right:2px;
height: 30px;
border-radius: 5%;
border: 1px solid #52ba73;
}
.smoControl button.button-array {
width: 30px;
height: 30px;
width: 35px;
height: 35px;
position:relative;
}
.smoControl button.button-array.pushed {
font-weight: bold;
}
.smoControl button.button-array .icon-bravura {
font-size: 38px;
font-size: 30px;
}
.smoControl.cbTextInPlace,.smoControl.cbDragTextDialog ,.smoControl.cbResizeTextBox {
position:relative;
Expand Down
6 changes: 6 additions & 0 deletions build/styles/fonts.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@
-moz-osx-font-smoothing: grayscale;
}

.icon-metronome4:before {
content: "\e99f";
}
.icon-enter2:before {
content: "\e99a";
}
.icon-radio-checked2:before {
content: "\ea55";
}
Expand Down
2 changes: 1 addition & 1 deletion build/styles/fonts/smoosic.json
View file

Large diffs are not rendered by default.

Loading

0 comments on commit d4036ab

Please sign in to comment.