Issue #2799705 by yongt9412: Change sequence of header items

css/diff.general.css

@@ -16,3 +16,7 @@
   width: 50%;
   display: inline-block;
 }
+.diff-layout {
+  display: inline-table;
+  padding: 0 1em 0 0;
+}

src/Controller/PluginRevisionController.php

@@ -133,16 +133,19 @@ class PluginRevisionController extends ControllerBase {
       '#title' => $this->t('Changes to %title', ['%title' => $entity->label()]),
     );
 
+    // Build the navigation links.
+    $build['diff_navigation'] = $this->buildRevisionsNavigation($entity, $revisions_ids, $left_revision->getRevisionId(), $right_revision->getRevisionId(), $filter);
+
     // Build the layout filter.
     $build['diff_layout'] = [
       '#type' => 'item',
       '#title' => $this->t('Layout'),
+      '#weigth' => 1,
+      '#prefix' => '<div class="diff-layout">',
+      '#suffix' => '</div>',
     ];
     $build['diff_layout']['filter'] = $this->buildLayoutNavigation($entity, $left_revision->getRevisionId(), $right_revision->getRevisionId(), $filter);
 
-    // Build the navigation links.
-    $build['diff_navigation'] = $this->buildRevisionsNavigation($entity, $revisions_ids, $left_revision->getRevisionId(), $right_revision->getRevisionId(), $filter);
-
     // Perform comparison only if both entity revisions loaded successfully.
     if ($left_revision != FALSE && $right_revision != FALSE) {
       // Build the diff comparison with the plugin.
@@ -225,6 +228,7 @@ class PluginRevisionController extends ControllerBase {
       $element['diff_navigation'] = [
         '#type' => 'item',
         '#title' => $this->t('Navigation'),
+        '#weigth' => 0,
       ];
       $i = 0;
       // Find the previous revision.

src/Plugin/diff/Layout/SplitFieldsDiffLayout.php

@@ -97,6 +97,9 @@ class SplitFieldsDiffLayout extends DiffLayoutBase {
     $build['filter'] = [
       '#type' => 'item',
       '#title' => $this->t('Filter'),
+      '#weigth' => 2,
+      '#prefix' => '<div class="diff-layout">',
+      '#suffix' => '</div>',
     ];
     $build['filter']['options'] = $this->buildFilterNavigation($entity, $left_revision, $right_revision, 'split_fields', $active_filter);
 

src/Plugin/diff/Layout/UnifiedFieldsDiffLayout.php

@@ -97,6 +97,9 @@ class UnifiedFieldsDiffLayout extends DiffLayoutBase {
     $build['filter'] = [
       '#type' => 'item',
       '#title' => $this->t('Filter'),
+      '#weigth' => 2,
+      '#prefix' => '<div class="diff-layout">',
+      '#suffix' => '</div>',
     ];
     $build['filter']['options'] = $this->buildFilterNavigation($entity, $left_revision, $right_revision, 'unified_fields', $active_filter);
 

src/Plugin/diff/Layout/VisualInlineDiffLayout.php

@@ -140,6 +140,9 @@ class VisualInlineDiffLayout extends DiffLayoutBase {
     $build['view_mode'] = [
       '#type' => 'item',
       '#title' => $this->t('View mode'),
+      '#weigth' => 2,
+      '#prefix' => '<div class="diff-layout">',
+      '#suffix' => '</div>',
     ];
     $build['view_mode']['filter'] = [
       '#type' => 'operations',