SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-05-01 12:20:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix layout in merge mode

Browse Source
This commit is contained in:
Christian Guenter 2018-08-27 17:50:05 +00:00 committed by Lars Hvam
parent 46f32e6422
commit f167adecd2
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ui/zcl_abapgit_gui_page_merge_res.clas.abap
View File

@ -111,7 +111,7 @@ ENDCLASS.
CLASS zcl_abapgit_gui_page_merge_res IMPLEMENTATION. CLASS ZCL_ABAPGIT_GUI_PAGE_MERGE_RES IMPLEMENTATION.
METHOD apply_merged_content. METHOD apply_merged_content.
@ -284,7 +284,7 @@ CLASS zcl_abapgit_gui_page_merge_res IMPLEMENTATION.
"Table for Div-Table and textarea "Table for Div-Table and textarea
ro_html->add( '<div class="diff_content">' ). "#EC NOTEXT ro_html->add( '<div class="diff_content">' ). "#EC NOTEXT
ro_html->add( '<table>' ). "#EC NOTEXT ro_html->add( '<table class="w100">' ). "#EC NOTEXT
ro_html->add( '<thead class="header">' ). "#EC NOTEXT ro_html->add( '<thead class="header">' ). "#EC NOTEXT
ro_html->add( '<tr>' ). "#EC NOTEXT ro_html->add( '<tr>' ). "#EC NOTEXT
ro_html->add( '<th>Code</th>' ). "#EC NOTEXT ro_html->add( '<th>Code</th>' ). "#EC NOTEXT
@ -313,9 +313,9 @@ CLASS zcl_abapgit_gui_page_merge_res IMPLEMENTATION.
ro_html->add( '</td>' ). "#EC NOTEXT ro_html->add( '</td>' ). "#EC NOTEXT
ro_html->add( '<td>' ). "#EC NOTEXT ro_html->add( '<td>' ). "#EC NOTEXT
ro_html->add( '<div class="form-container">' ). ro_html->add( '<div class="form-container">' ).
ro_html->add( |<form id="merge_form" class="aligned-form" accept-charset="UTF-8"| ). ro_html->add( |<form id="merge_form" class="aligned-form w100" accept-charset="UTF-8"| ).
ro_html->add( |method="post" action="sapevent:apply_merge">| ). ro_html->add( |method="post" action="sapevent:apply_merge">| ).
ro_html->add( |<textarea id="merge_content" name="merge_content" | ). ro_html->add( |<textarea id="merge_content" name="merge_content" class="w100" | ).
ro_html->add( |rows="{ lines( is_diff-o_diff->get( ) ) }">{ lv_target_content }</textarea>| ). ro_html->add( |rows="{ lines( is_diff-o_diff->get( ) ) }">{ lv_target_content }</textarea>| ).
ro_html->add( '<input type="submit" class="hidden-submit">' ). ro_html->add( '<input type="submit" class="hidden-submit">' ).
ro_html->add( '</form>' ). "#EC NOTEXT ro_html->add( '</form>' ). "#EC NOTEXT
@ -531,6 +531,11 @@ CLASS zcl_abapgit_gui_page_merge_res IMPLEMENTATION.
ENDMETHOD. ENDMETHOD.
METHOD zif_abapgit_gui_page_hotkey~get_hotkey_actions.
ENDMETHOD.
METHOD zif_abapgit_gui_page~on_event. METHOD zif_abapgit_gui_page~on_event.
FIELD-SYMBOLS: <ls_conflict> TYPE zif_abapgit_definitions=>ty_merge_conflict. FIELD-SYMBOLS: <ls_conflict> TYPE zif_abapgit_definitions=>ty_merge_conflict.
@ -578,10 +583,4 @@ CLASS zcl_abapgit_gui_page_merge_res IMPLEMENTATION.
ENDCASE. ENDCASE.
ENDMETHOD. ENDMETHOD.
METHOD zif_abapgit_gui_page_hotkey~get_hotkey_actions.
ENDMETHOD.
ENDCLASS. ENDCLASS.

6
src/zabapgit_css_common.w3mi.data.css
View File

@ -412,6 +412,12 @@ div.diff_content {
border-top: 1px solid #DDD; border-top: 1px solid #DDD;
border-bottom: 1px solid #DDD; border-bottom: 1px solid #DDD;
} }
div.diff_content tbody tr td{
width: 50%;
vertical-align: top
}
div.diff_head span.state-block { div.diff_head span.state-block {
margin-left: 0.5em; margin-left: 0.5em;
font-family: Consolas, Lucida Console, Courier, monospace; font-family: Consolas, Lucida Console, Courier, monospace;