28 lines
1.2 KiB
Plaintext
28 lines
1.2 KiB
Plaintext
.sn-component
|
||
.sk-modal.large#conflict-resolution-modal
|
||
.sk-modal-background
|
||
.sk-modal-content
|
||
.sk-panel
|
||
.sk-panel-header
|
||
%h1.sk-panel-header-title Conflicted items — choose which version to keep
|
||
.sk-horizontal-group
|
||
%a.sk-a.info.close-button{"ng-click" => "keepItem1()"} Keep left
|
||
%a.sk-a.info.close-button{"ng-click" => "keepItem2()"} Keep right
|
||
%a.sk-a.info.close-button{"ng-click" => "keepBoth()"} Keep both
|
||
%a.sk-a.info.close-button{"ng-click" => "export()"} Export
|
||
%a.sk-a.info.close-button{"ng-click" => "dismiss(); $event.stopPropagation()"} Close
|
||
.sk-panel-content.selectable
|
||
.sk-panel-section
|
||
%h3
|
||
%strong Content type:
|
||
{{contentType}}
|
||
%p You may wish to look at the "created_at" and "updated_at" fields of the items to gain better context in deciding which to keep.
|
||
#items
|
||
.sk-panel.static#item1.item
|
||
%p.normal{"style" => "white-space: pre-wrap; font-size: 16px;"} {{item1Content}}
|
||
|
||
.border
|
||
|
||
.sk-panel.static#item2.item
|
||
%p.normal{"style" => "white-space: pre-wrap; font-size: 16px;"} {{item2Content}}
|