Merge branch 'ebassi/for-master' into 'master'

Ebassi/for master

See merge request GNOME/gtk!3324

1 files changed, 36 insertions, 35 deletions

diff --git a/.gitlab-ci/pages/index.html b/.gitlab-ci/pages/index.html
index 79f6e44358..440e18514d 100644
--- a/.gitlab-ci/pages/index.html
+++ b/.gitlab-ci/pages/index.html
@@ -39,40 +39,6 @@ SPDX-License-Identifier: LGPL-2.1-or-later
       </header>
 
       <div class="toggle-wrapper">
-        <h4 id="core-libraries" style="display:flex;">
-          Core libraries
-          <a href="#core-libraries" class="anchor"></a>
-        </h4>
-
-        <div class="docblock">
-          <h5 id="glib">GLib</h5>
-          <p>GLib provides the core application building blocks for libraries
-          and applications written in C. It provides common data types
-          used in GTK, the main loop implementation, and a large set of
-          utility functions for strings and general portability across
-          different platforms.</p>
-          <p><a href="https://developer.gnome.org/glib/" class="external">GLib API reference</a></p>
-        </div>
-
-        <div class="docblock">
-          <h5 id="gobject">GObject</h5>
-          <p>GObject provides the object system used by GTK.</p>
-          <p><a href="https://developer.gnome.org/gobject/" class="external">GObject API reference</a></p>
-        </div>
-
-        <div class="docblock">
-          <h5 id="gio">GIO</h5>
-          <p>GIO provides a portable, modern and easy-to-use file system
-          abstraction API for accessing local and remote files; a set of
-          low and high level abstractions over the <a href="https://www.freedesktop.org/wiki/Software/dbus/" class="external">DBus</a>
-          IPC specification; an application settings API; portable networking
-          abstractions; and additional utilities for writing asynchronous
-          operations without blocking the user interface of your application.</p>
-          <p><a href="https://developer.gnome.org/gio/" class="external">GIO API reference</a></p>
-        </div>
-      </div>
-
-      <div class="toggle-wrapper">
         <h4 id="user-interface">
           User interface
           <a href="#user-interface" class="anchor"></a>
@@ -89,7 +55,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later
         <div class="docblock">
           <h5 id="gdk">GSK</h5>
           <p>An intermediate layer which provides a rendering API implemented using Cairo, OpenGL or Vulkan.</p>
-          <p><a href="https://docs.gtk.org/gsk4/" class="external">GDK API reference</a></p>
+          <p><a href="https://docs.gtk.org/gsk4/" class="external">GSK API reference</a></p>
         </div>
 
         <div class="docblock">
@@ -120,6 +86,41 @@ SPDX-License-Identifier: LGPL-2.1-or-later
           <p><a href="https://www.cairographics.org/docs/" class="external">Cairo API reference</a></p>
         </div>
       </div>
+
+      <div class="toggle-wrapper">
+        <h4 id="core-libraries" style="display:flex;">
+          Core libraries
+          <a href="#core-libraries" class="anchor"></a>
+        </h4>
+
+        <div class="docblock">
+          <h5 id="glib">GLib</h5>
+          <p>GLib provides the core application building blocks for libraries
+          and applications written in C. It provides common data types
+          used in GTK, the main loop implementation, and a large set of
+          utility functions for strings and general portability across
+          different platforms.</p>
+          <p><a href="https://developer.gnome.org/glib/" class="external">GLib API reference</a></p>
+        </div>
+
+        <div class="docblock">
+          <h5 id="gobject">GObject</h5>
+          <p>GObject provides the object system used by GTK.</p>
+          <p><a href="https://developer.gnome.org/gobject/" class="external">GObject API reference</a></p>
+        </div>
+
+        <div class="docblock">
+          <h5 id="gio">GIO</h5>
+          <p>GIO provides a portable, modern and easy-to-use file system
+          abstraction API for accessing local and remote files; a set of
+          low and high level abstractions over the <a href="https://www.freedesktop.org/wiki/Software/dbus/" class="external">DBus</a>
+          IPC specification; an application settings API; portable networking
+          abstractions; and additional utilities for writing asynchronous
+          operations without blocking the user interface of your application.</p>
+          <p><a href="https://developer.gnome.org/gio/" class="external">GIO API reference</a></p>
+        </div>
+      </div>
+
     </section>
 
     <footer>