gitk: move UI for generic colors above diff colors

The selection and link colors apply not only to the diff panel, but also
to the the commit list. Move these right after the generic background
and text color options.

The color for marked lines is only used in the diff panel, hence, leave
it below the diff color options.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>

gitk

diff --git a/gitk b/gitk
index d4c229a..9506739 100755
--- a/gitk
+++ b/gitk
@@ -11840,6 +11840,12 @@
         fg          fgcolor {} \
                     [mc "Main text"] \
                     [mc "choose main text color"] \
+        selbg       selectbgcolor {} \
+                    [mc "Selected text background"] \
+                    [mc "choose background color of selected text"] \
+        linkfg      linkfgcolor {} \
+                    [mc "Link text"] \
+                    [mc "choose color of link text"] \
         diffold     diffcolors 0 \
                     [mc "Old line text"] \
                     [mc "choose text color of old lines"] \
@@ -11858,12 +11864,6 @@
         markbg      markbgcolor {} \
                     [mc "Marked line background"] \
                     [mc "choose background color of marked lines"] \
-        selbg       selectbgcolor {} \
-                    [mc "Selected text background"] \
-                    [mc "choose background color of selected text"] \
-        linkfg      linkfgcolor {} \
-                    [mc "Link text"] \
-                    [mc "choose color of link text"] \
     ]
 
     foreach {uielem colorvar idx label title} $coloruielems {