From 40b0ce43e401bb816f34ccc2663cb832dfe1d9cc Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Mon, 11 Apr 2022 10:37:40 +1200 Subject: [PATCH] FIX Highlight paragraph changes in diff. --- client/dist/styles/bundle.css | 2 +- client/src/components/HistoryViewer/HistoryViewer.scss | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css index d0e73592..88905468 100644 --- a/client/dist/styles/bundle.css +++ b/client/dist/styles/bundle.css @@ -1 +1 @@ -#Form_EditForm_OtherDropdown_Holder{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center;margin:-1.5385rem -1.5385rem 0;border-bottom:1px solid #ced5e1;padding:3.077rem;background-color:#fff}#Form_EditForm_error.good+fieldset>#Form_EditForm_OtherDropdown_Holder,#Form_EditForm_error.info+fieldset>#Form_EditForm_OtherDropdown_Holder,#Form_EditForm_error.warning+fieldset>#Form_EditForm_OtherDropdown_Holder{margin-top:0}#Form_EditForm_OtherDropdown_Holder:after{border-bottom:none}#Form_EditForm_OtherDropdown_Holder .form__field-label{max-width:none;width:auto;margin-bottom:.9231rem;color:#566b8d;font-size:19px}#Form_EditForm_OtherDropdown_Holder .form__field-holder{width:100%;max-width:23rem}.history-viewer>.panel--padded{padding-top:0}.history-viewer.history-viewer__compare-mode .panel--padded{padding-top:30px}.history-viewer--no-margins{margin-left:-1.5385rem;margin-right:-1.5385rem}.panel--padded-side{padding-bottom:0;padding-top:0}.history-viewer__form{position:relative}.history-viewer__version-state .text-muted{margin-right:10px}.history-viewer__compare-button{border:1px solid #fff;color:#fff;margin-right:1rem}.history-viewer__close-button{background:transparent;border:1px solid #fff;border-radius:50%;color:#fff;padding:.4rem .55rem}.history-viewer__close-button:before{font-size:1.4rem}.history-viewer__messages .message-box:first-child{margin-top:1.5385rem}.history-viewer__messages .message-box:last-child{margin-bottom:0}.history-viewer__preview{margin-top:-54px}.history-viewer__toolbar--condensed{min-width:50%;width:50%}.history-viewer__version-detail-diff del{background-color:#ffd2da;border-radius:1px}.history-viewer__version-detail-diff ins{background-color:#b9f1c8;border-radius:1px;text-decoration:none}@media (max-width:991.98px){.history-viewer__preview{display:none}}.history-viewer__compare-notice{border-top:none;border-radius:0 0 .23rem .23rem;padding:0;position:absolute;left:50%;-webkit-transform:translateX(-50%);-o-transform:translateX(-50%);transform:translateX(-50%)}.history-viewer__compare-notice .notice-message{padding:.4rem 1rem .4rem 1.5rem;vertical-align:middle}.history-viewer__compare-notice button{background-color:inherit;color:inherit;border-width:0 0 0 1px;border-color:#bde0f1;margin-right:0;border-radius:0 0 .23rem 0}.history-viewer__compare-notice button:hover{background-color:#bde0f1}.history-viewer__actions-dropdown .form-check-label{text-transform:none}.history-viewer__actions-dropdown .btn[class*=font-icon-]:before{margin-right:0}.history-viewer__actions-dropdown.show .dropdown-menu{min-width:14rem}.history-viewer__actions-dropdown .form-check{margin-top:.5rem}.history-viewer__heading{font-size:.923rem;text-transform:uppercase}.history-viewer__row--current .history-viewer__version-link{cursor:default}.history-viewer__selected-message,.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected .history-viewer__close-button{display:none}.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected .history-viewer__selected-message{display:block}.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected:focus-within .history-viewer__selected-message,.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected:hover .history-viewer__selected-message{display:none}.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected:focus-within .history-viewer__close-button,.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected:hover .history-viewer__close-button{display:block}.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected:focus .history-viewer__selected-message,.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected:hover .history-viewer__selected-message{display:none}.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected:focus .history-viewer__close-button,.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected:hover .history-viewer__close-button{display:block}.history-viewer__table{padding:0}.history-viewer__table li{display:-webkit-box;display:-webkit-flex;display:flex;list-style-type:none}.history-viewer__table--comparison-selected{margin-bottom:0;border-bottom:5px solid #303b4d}.history-viewer__row--comparison-selected:last-child{border-bottom:none}.history-viewer__heading,.history-viewer__row{border-bottom:1px solid #dbe0e9}.history-viewer__row{background-color:#fff}.history-viewer__row:active,.history-viewer__row:hover{background-color:#f0f4f7}.history-viewer__version-link{color:inherit;cursor:pointer;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-flex:1;-webkit-flex-grow:1;flex-grow:1}.history-viewer__version-link:active,.history-viewer__version-link:hover{color:inherit;text-decoration:none}.history-viewer__table--current .history-viewer__version-link:hover{cursor:default}.history-viewer__actions,.history-viewer__author,.history-viewer__version-no,.history-viewer__version-state{padding:1.2308rem}.history-viewer__version-no{width:3.7%}.history-viewer__author,.history-viewer__version-state{-webkit-box-flex:1;-webkit-flex-grow:1;flex-grow:1;width:50%}.history-viewer__actions{padding-top:0;padding-bottom:0;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end;min-width:12rem}.table .history-viewer__row--current,.table .history-viewer__row--current:hover{background-color:#0071c4;color:#fff}.table .history-viewer__row--current .text-muted{color:#fff!important}.history-viewer__table--current{margin-bottom:.76925rem}.history-viewer__pagination select{width:auto} \ No newline at end of file +#Form_EditForm_OtherDropdown_Holder{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center;margin:-1.5385rem -1.5385rem 0;border-bottom:1px solid #ced5e1;padding:3.077rem;background-color:#fff}#Form_EditForm_error.good+fieldset>#Form_EditForm_OtherDropdown_Holder,#Form_EditForm_error.info+fieldset>#Form_EditForm_OtherDropdown_Holder,#Form_EditForm_error.warning+fieldset>#Form_EditForm_OtherDropdown_Holder{margin-top:0}#Form_EditForm_OtherDropdown_Holder:after{border-bottom:none}#Form_EditForm_OtherDropdown_Holder .form__field-label{max-width:none;width:auto;margin-bottom:.9231rem;color:#566b8d;font-size:19px}#Form_EditForm_OtherDropdown_Holder .form__field-holder{width:100%;max-width:23rem}.history-viewer>.panel--padded{padding-top:0}.history-viewer.history-viewer__compare-mode .panel--padded{padding-top:30px}.history-viewer--no-margins{margin-left:-1.5385rem;margin-right:-1.5385rem}.panel--padded-side{padding-bottom:0;padding-top:0}.history-viewer__form{position:relative}.history-viewer__version-state .text-muted{margin-right:10px}.history-viewer__compare-button{border:1px solid #fff;color:#fff;margin-right:1rem}.history-viewer__close-button{background:transparent;border:1px solid #fff;border-radius:50%;color:#fff;padding:.4rem .55rem}.history-viewer__close-button:before{font-size:1.4rem}.history-viewer__messages .message-box:first-child{margin-top:1.5385rem}.history-viewer__messages .message-box:last-child{margin-bottom:0}.history-viewer__preview{margin-top:-54px}.history-viewer__toolbar--condensed{min-width:50%;width:50%}.history-viewer__version-detail-diff del{display:inline-block;background-color:#ffd2da;border-radius:1px}.history-viewer__version-detail-diff ins{display:inline-block;background-color:#b9f1c8;border-radius:1px;text-decoration:none}@media (max-width:991.98px){.history-viewer__preview{display:none}}.history-viewer__compare-notice{border-top:none;border-radius:0 0 .23rem .23rem;padding:0;position:absolute;left:50%;-webkit-transform:translateX(-50%);-o-transform:translateX(-50%);transform:translateX(-50%)}.history-viewer__compare-notice .notice-message{padding:.4rem 1rem .4rem 1.5rem;vertical-align:middle}.history-viewer__compare-notice button{background-color:inherit;color:inherit;border-width:0 0 0 1px;border-color:#bde0f1;margin-right:0;border-radius:0 0 .23rem 0}.history-viewer__compare-notice button:hover{background-color:#bde0f1}.history-viewer__actions-dropdown .form-check-label{text-transform:none}.history-viewer__actions-dropdown .btn[class*=font-icon-]:before{margin-right:0}.history-viewer__actions-dropdown.show .dropdown-menu{min-width:14rem}.history-viewer__actions-dropdown .form-check{margin-top:.5rem}.history-viewer__heading{font-size:.923rem;text-transform:uppercase}.history-viewer__row--current .history-viewer__version-link{cursor:default}.history-viewer__selected-message,.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected .history-viewer__close-button{display:none}.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected .history-viewer__selected-message{display:block}.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected:focus-within .history-viewer__selected-message,.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected:hover .history-viewer__selected-message{display:none}.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected:focus-within .history-viewer__close-button,.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected:hover .history-viewer__close-button{display:block}.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected:focus .history-viewer__selected-message,.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected:hover .history-viewer__selected-message{display:none}.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected:focus .history-viewer__close-button,.history-viewer__table--headerless .history-viewer__row--current.history-viewer__row--comparison-selected:hover .history-viewer__close-button{display:block}.history-viewer__table{padding:0}.history-viewer__table li{display:-webkit-box;display:-webkit-flex;display:flex;list-style-type:none}.history-viewer__table--comparison-selected{margin-bottom:0;border-bottom:5px solid #303b4d}.history-viewer__row--comparison-selected:last-child{border-bottom:none}.history-viewer__heading,.history-viewer__row{border-bottom:1px solid #dbe0e9}.history-viewer__row{background-color:#fff}.history-viewer__row:active,.history-viewer__row:hover{background-color:#f0f4f7}.history-viewer__version-link{color:inherit;cursor:pointer;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-flex:1;-webkit-flex-grow:1;flex-grow:1}.history-viewer__version-link:active,.history-viewer__version-link:hover{color:inherit;text-decoration:none}.history-viewer__table--current .history-viewer__version-link:hover{cursor:default}.history-viewer__actions,.history-viewer__author,.history-viewer__version-no,.history-viewer__version-state{padding:1.2308rem}.history-viewer__version-no{width:3.7%}.history-viewer__author,.history-viewer__version-state{-webkit-box-flex:1;-webkit-flex-grow:1;flex-grow:1;width:50%}.history-viewer__actions{padding-top:0;padding-bottom:0;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end;min-width:12rem}.table .history-viewer__row--current,.table .history-viewer__row--current:hover{background-color:#0071c4;color:#fff}.table .history-viewer__row--current .text-muted{color:#fff!important}.history-viewer__table--current{margin-bottom:.76925rem}.history-viewer__pagination select{width:auto} \ No newline at end of file diff --git a/client/src/components/HistoryViewer/HistoryViewer.scss b/client/src/components/HistoryViewer/HistoryViewer.scss index 86614d4b..e5445662 100644 --- a/client/src/components/HistoryViewer/HistoryViewer.scss +++ b/client/src/components/HistoryViewer/HistoryViewer.scss @@ -71,11 +71,13 @@ $diff-added-color: #b9f1c8; .history-viewer__version-detail-diff { del { + display: inline-block; background-color: $diff-removed-color; border-radius: 1px; } ins { + display: inline-block; background-color: $diff-added-color; border-radius: 1px; text-decoration: none;