diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangeComponent.js b/app/components/SimpleEditor/elements/track_change/TrackChangeComponent.js index 29ccb21d77b3f1c2bb8a5c09b952630e1d193024..e8d67dc85fdb37fb5983257e99af86b307caad44 100644 --- a/app/components/SimpleEditor/elements/track_change/TrackChangeComponent.js +++ b/app/components/SimpleEditor/elements/track_change/TrackChangeComponent.js @@ -16,14 +16,17 @@ class TrackChangeComponent extends AnnotationComponent { ShowAdditions = 'sc-track-add-show' } - const accept = $$('a').addClass('sc-track-item') - .on('click', this.acceptTrackChange) - .append('accept') - const reject = $$('a').addClass('sc-track-item') - .on('click', this.rejectTrackChange) - .append('reject') - const seperator = $$('span').addClass('sc-track-separator') - .append(' / ') + const accept = $$('a') + .addClass('sc-track-item-accept') + .on('click', this.acceptTrackChange) + + const reject = $$('a') + .addClass('sc-track-item-reject') + .on('click', this.rejectTrackChange) + + const seperator = $$('span') + .addClass('sc-track-item-separator') + const container = $$('span').addClass('sc-accept-reject-container') .append(accept) .append(seperator) diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangeControlCommand.js b/app/components/SimpleEditor/elements/track_change/TrackChangeControlCommand.js index d3a7f5d04077c345dddd2d51dcc06d1810eeb5f2..fb48eb07ec9ffd3efc0dd4675def7d640568cc73 100644 --- a/app/components/SimpleEditor/elements/track_change/TrackChangeControlCommand.js +++ b/app/components/SimpleEditor/elements/track_change/TrackChangeControlCommand.js @@ -10,6 +10,7 @@ class TrackChangeControlCommand extends Command { return newState } execute (params, context) { + console.log('in execute') const surface = context.surfaceManager.getSurface('body') surface.send('trackChangesUpdate') return true diff --git a/app/components/SimpleEditor/elements/track_change/trackChange.scss b/app/components/SimpleEditor/elements/track_change/trackChange.scss index 6bbb6a2ba3e1eac4c3ba3364f8050a8f708f6b0e..d1352322824510ac691f1545b8f06143c0633708 100644 --- a/app/components/SimpleEditor/elements/track_change/trackChange.scss +++ b/app/components/SimpleEditor/elements/track_change/trackChange.scss @@ -2,13 +2,18 @@ $blue: #4a90e2; $red: #f00; $yellow: #f7f70c; -.sc-track-change { - // background-color: #f7f70c; + + .se-selection-fragment { + .sc-accept-reject-container:only-of-type { + display: none; + } } + + + .sc-track-change-add { color: $blue; - // display: inline-block; text-decoration: none; } @@ -25,23 +30,39 @@ $yellow: #f7f70c; color: inherit !important; .sc-accept-reject-container { - display: none; - } + display: none; +} } -.sc-accept-reject-container { - display: inline-block; +.sc-track-item-accept::after { + color: $blue; + content: 'accept'; + cursor: pointer; + display: inline-flex; font-size: 14px; margin-left: -90px; margin-top: 20px; position: absolute; +} - .sc-track-item { - color: $blue; - cursor: pointer; - } +.sc-track-item-separator::after { + color: $blue; + content: '/'; + cursor: default; + display: inline-flex; + font-size: 14px; + margin-left: -45px; + margin-top: 20px; + position: absolute; +} - .sc-track-separator { - color: $blue; - } +.sc-track-item-reject::after { + color: $blue; + content: 'reject'; + cursor: pointer; + display: inline-flex; + font-size: 14px; + margin-left: -35px; + margin-top: 20px; + position: absolute; }