diff --git a/ScaleDictionary.js b/ScaleDictionary.js index c30ff00..32fc97d 100644 --- a/ScaleDictionary.js +++ b/ScaleDictionary.js @@ -45,6 +45,8 @@ var dictKeys = { var INTS_FLATS = ['R', '♭9', '9', '♭3', '3', '11', '♭5', '5', '♭13', '13', '♭7', '7']; var INTS_SHARP4 = ['R', '♭9', '9', '♭3', '3', '11', '♯11', '5', '♭13', '13', '♭7', '7']; +var INTS_DOM = ['R', '♭9', '9', '♯9', '3', '11', '♭5', '5', '+5', '13', '♭7', '7']; + var INTS_SHARP4AUG = ['R', '♭9', '9', '♭3', '3', '11', '♯11', '5', '+5', '13', '♭7', '7']; var INTS_DIM = ['R', '♭9', '9', '♭3', '3', '11', '♯4', '5', '+5', '♭♭7', '♭7', '7']; var INTS_SUPERLOCRIAN = ['R', '♭9', '9', '♭3', '♭4', '11', '♭5', '5', '♭13', '13', '♭7', '7']; @@ -282,7 +284,7 @@ var INTCLR_DIM = ["i_root", "white","white","i_third","white","white","i_fifth", var ARP_MAJ = { "name" : "maj", "intnames": INTS_FLATS, "color" : INTCLR_MAJ }; var ARP_MAJ7 = { "name" : "maj7", "intnames": INTS_SHARP4, "color" : INTCLR_MAJ7 }; -var ARP_DOM7 = { "name" : "7", "intnames": INTS_SHARP4, "color" : INTCLR_DOM7 }; +var ARP_DOM7 = { "name" : "7", "intnames": INTS_DOM, "color" : INTCLR_DOM7 }; var ARP_MIN = { "name" : "min", "intnames": INTS_FLATS, "color" : INTCLR_MIN }; var ARP_MIN7 = { "name" : "min7", "intnames": INTS_FLATS, "color" : INTCLR_MIN7 }; var ARP_MIN7b5 = { "name" : "min7♭5", "intnames": INTS_FLATS, "color" : INTCLR_MIN7b5 }; diff --git a/boxfrets.js b/boxfrets.js index 6e44558..bdd93b5 100644 --- a/boxfrets.js +++ b/boxfrets.js @@ -372,12 +372,12 @@ var ctrl_updateMessage = function(){ var ctl_updateIntervalMode = function(boolNewMode){ if(boolNewMode){ - $('#modeNoteInt').attr('value', 'Intervals'); + $('#modeNoteInt').attr('value', 'Notes'); INTERVALMODE = true; set_notespans(); update_link(); } else { - $('#modeNoteInt').attr('value', 'Notes'); + $('#modeNoteInt').attr('value', 'Intervals'); INTERVALMODE = false; set_notespans(); update_link(); diff --git a/fretboard.css b/fretboard.css index 62fa1b9..d921cf7 100644 --- a/fretboard.css +++ b/fretboard.css @@ -12,6 +12,7 @@ table#fretclone { position:absolute; top:100px; left:-5px; border-spacing:8px; } table#fretclone tr td { margin: 0 12px; display:inline-block; border:2px solid transparent; background-color:transparent; font-size:18px; font-weight:bold; width:40px;height:24px; text-align:center; z-index:1; border-radius: 14px; } table#fretclone tr td:hover { cursor:pointer; border-color: black !important; border-style: dotted !important; } +input { padding: 0 4px 0 4px;} a:focus { outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } a:hover, a:active { outline: 0; } @@ -65,7 +66,7 @@ div.h_ctrl { display:inline; margin-right: 12px; } .setRootArmed { background-color:rgb(147,32,32); color: #FFF;} -#clear, #eraser, #brush { font-weight: bold; padding: 2px; } +#eraser, #brush { font-weight: bold; padding: 2px; } input.color_button { width:40px; border-radius: 5px; margin-left: 8px; } diff --git a/fretboard.html b/fretboard.html index a44990b..a3110fb 100644 --- a/fretboard.html +++ b/fretboard.html @@ -42,27 +42,16 @@