fix: Rebase missmatches

Author: d3xter666

packages/documentation/docs/images/UI5_logo_wide_dark.png

@@ -4,9 +4,13 @@ next:
   link: '/pages/GettingStarted'
 ---
 
-![UI5 logo](./images/UI5_logo_wide.png) { .light-only }
+<script setup>
+import { useData } from 'vitepress'
+import VPButton from "vitepress/dist/client/theme-default/components/VPButton.vue"
+const { isDark } = useData()
+</script>
 
-![UI5 logo](./images/UI5_logo_wide_dark.png) { .dark-only }
+<img :src="isDark ? '/ui5-cli/stable/images/O_UI5_H_noBG.png' : '/ui5-cli/stable/images/UI5_logo_wide.png'" alt="UI5 logo" style="max-width: 100%; height: auto;">
 
 # UI5 CLI
 
@@ -26,34 +30,9 @@ Read the announcement blog post: **[SAP Community: UI5 CLI 4.0](https://communit
 And checkout the **[Migrate to v4](./updates/migrate-v4)** documentation.
 :::
 
-<script setup>
-import VPButton from "vitepress/dist/client/theme-default/components/VPButton.vue"
-</script>
-
-<VPButton class="no-decoration" text="🚀 Get Started" href="./pages/GettingStarted"/>
-
-<style>
-.no-decoration {
-    text-decoration: inherit;
-}
-
-/* Theme-based image visibility */
-.light-only {
-    display: block;
-}
-
-.dark-only {
-    display: none;
-}
-
-html.dark .light-only {
-    display: none;
-}
-
-html.dark .dark-only {
-    display: block;
-}
-</style>
+<div style="margin: 2rem 0;">
+  <VPButton class="no-decoration" text="🚀 Get Started" href="./pages/GettingStarted"/>
+</div>
 
 ## Main Features
 
@@ -101,7 +80,7 @@ Added framework libraries sap.ui.core sap.m themelib_sap_fiori_3 as dependencies
 #### 🏄 Development Server
 
 Start a local development server to work on your project.  
-*Also see the [Server Documentation](./pages/Server)*
+*Also see the [Server Documentation](./Server)*
 
 ```
 ❯ ui5 serve
@@ -140,7 +119,7 @@ All available APIs are documented in the [UI5 CLI API Reference](https://ui5.git
 
 #### ESM
 
-```js linenums="1
+```js
 import {graphFromPackageDependencies} from "@ui5/project/graph";
 
 async function buildApp(projectPath, destinationPath) {
@@ -158,7 +137,7 @@ async function buildApp(projectPath, destinationPath) {
 
 #### CommonJS
 
-```js linenums="1
+```js
 async function buildApp(projectPath, destinationPath) {
     const {graphFromPackageDependencies} = 
         await import("@ui5/project/graph");

packages/documentation/docs/index.md

@@ -2,21 +2,17 @@
 
 The [UI5 Builder](https://github.com/SAP/ui5-builder) module takes care of building your project.
 
-Based on a project's type, the UI5 Builder defines a series of build steps to execute; these are also called "tasks".
-
-For every type there is a set of default tasks. You can disable single tasks using the `--exclude-task` [CLI parameter](./CLI#ui5-build), and you can include tasks using the `--include-task` parameter.
-
 <script setup>
 import VPButton from "vitepress/dist/client/theme-default/components/VPButton.vue"
 </script>
 
-<VPButton class="api-button" text="📚 API Reference" href="https://ui5.github.io/cli/v4/api/index.html" target="_blank"/>
+Based on a project's type, the UI5 Builder defines a series of build steps to execute; these are also called "tasks".
 
-<style>
-.api-button {
-  margin: 1rem 0;
-}
-</style>
+For every type there is a set of default tasks. You can disable single tasks using the `--exclude-task` [CLI parameter](./CLI#ui5-build), and you can include tasks using the `--include-task` parameter.
+
+<div style="margin: 1rem 0;">
+  <VPButton class="no-decoration" text="📚 API Reference" href="https://ui5.github.io/cli/v4/api/index.html"/>
+</div>
 
 ## Tasks
 Tasks are specific build steps to be executed during build phase.
@@ -197,4 +193,9 @@ sap.ui.define([], () => {
 });
 ```
 
-:::
+:::
+<style>
+.no-decoration {
+    text-decoration: inherit;
+}
+</style>

packages/documentation/docs/pages/Builder.md

@@ -6,13 +6,9 @@ The [UI5 FS](https://github.com/SAP/ui5-fs) provides a UI5-specific file system
 import VPButton from "vitepress/dist/client/theme-default/components/VPButton.vue"
 </script>
 
-<VPButton class="api-button" text="📚 API Reference" href="https://ui5.github.io/cli/v4/api/" target="_blank"/>
-
-<style>
-.api-button {
-  margin: 1rem 0;
-}
-</style>
+<div style="margin: 1rem 0;">
+  <VPButton class="no-decoration" text="📚 API Reference" href="https://ui5.github.io/cli/v4/api/"/>
+</div>
 
 ## Overview
 
@@ -51,3 +47,9 @@ They implement the same API for **retrieving** resources as adapters (`byPath` a
 * [ReaderCollectionPrioritized](https://ui5.github.io/cli/v4/api/@ui5_fs_ReaderCollectionPrioritized.html): Contains a list of readers which are searched in-order. This allows one reader to "overlay" resources of another
 * [DuplexCollection](https://ui5.github.io/cli/v4/api/@ui5_fs_DuplexCollection.html): Contains a single reader and a single "writer". It therefore also implements the Adapter API for **persisting** resources (`write()`). When retrieving resources, the writer is prioritized over the reader
 * [WriterCollection](https://ui5.github.io/cli/v4/api/@ui5_fs_WriterCollection.html): Contains a set of writers and a mapping for each of them. When writing a resource, the writer is chosen based on the resource's virtual path.
+
+<style>
+.no-decoration {
+    text-decoration: inherit;
+}
+</style>

packages/documentation/docs/pages/FileSystem.md

@@ -65,7 +65,7 @@ ui5 use sapui5@latest
 :::
 You can choose between the OpenUI5 and the SAPUI5 framework.
 
-Don't know which one to choose? Check out our [documentation on the differences between OpenUI5 and SAPUI5](./FAQ##whats-the-difference-between-openui5-and-sapui5).
+Don't know which one to choose? Check out our [documentation on the differences between OpenUI5 and SAPUI5](./FAQ#what-s-the-difference-between-openui5-and-sapui5).
 
 1. Add required libraries
 ```sh

packages/documentation/docs/pages/GettingStarted.md

@@ -2,6 +2,10 @@
 
 The [UI5 Project](https://github.com/SAP/ui5-project) module provides functionality to build a UI5 project. Also see [Development Overview: Project Dependencies](./Overview#project-dependencies).
 
+<script setup>
+import VPButton from "vitepress/dist/client/theme-default/components/VPButton.vue"
+</script>
+
 ## Types
 Types define how a project can be configured and how it is built. A type orchestrates a set of tasks and defines the order in which they get applied during build phase. Furthermore, it takes care of formatting and validating the project-specific configuration.
 
@@ -63,14 +67,13 @@ In the table below you can find the available combinations of project type & out
 ^2^ Theme libraries in most cases have more than one namespace.  
 ^3^ Modules have explicit path mappings configured and no namespace concept.  
 
-<script setup>
-import VPButton from "vitepress/dist/client/theme-default/components/VPButton.vue"
-</script>
 
-<VPButton class="api-button" text="📚 API Reference" href="https://ui5.github.io/cli/v4/api/@ui5_project_build_ProjectBuilder.html" target="_blank"/>
+<div style="margin: 1rem 0;">
+  <VPButton class="no-decoration" text="📚 API Reference" href="https://ui5.github.io/cli/v4/api/@ui5_project_build_ProjectBuilder.html"/>
+</div>
 
 <style>
-.api-button {
-  margin: 1rem 0;
+.no-decoration {
+    text-decoration: inherit;
 }
 </style>

packages/documentation/docs/pages/Project.md

@@ -6,13 +6,9 @@ The [UI5 Server](https://github.com/SAP/ui5-server) module provides server capab
 import VPButton from "vitepress/dist/client/theme-default/components/VPButton.vue"
 </script>
 
-<VPButton class="api-button" text="📚 API Reference" href="https://ui5.github.io/cli/v4/api/module-@ui5_server.html" target="_blank"/>
-
-<style>
-.api-button {
-  margin: 1rem 0;
-}
-</style>
+<div style="margin: 1rem 0;">
+  <VPButton class="no-decoration" text="📚 API Reference" href="https://ui5.github.io/cli/v4/api/module-@ui5_server.html"/>
+</div>
 
 ## Standard Middleware
 
@@ -86,4 +82,10 @@ Follow the given instructions and enter your password to install the generated c
 ::: tip
 If Chrome unintentionally redirects an HTTP-URL to HTTPS, you need to delete the HSTS mapping in [chrome://net-internals/#hsts](chrome://net-internals/#hsts) by entering the domain name (e.g. localhost) and pressing "delete".
 
-:::
+:::
+
+<style>
+.no-decoration {
+    text-decoration: inherit;
+}
+</style>

packages/documentation/docs/pages/Server.md

@@ -91,7 +91,7 @@ A custom middleware implementation needs to return a function with the following
 
 #### ESM
 
-```js linenums="1
+```js
 /**
  * Custom UI5 Server middleware API
  * 
@@ -129,7 +129,7 @@ export default function({log, middlewareUtil, options, resources}) {
 
 #### CommonJS
 
-```js linenums="1
+```js
 /**
  * Custom UI5 Server middleware API
  * 
@@ -169,7 +169,7 @@ module.exports = function({log, middlewareUtil, options, resources}) {
 
 #### ESM
 
-```js linenums="1
+```js
 import MarkdownIt from "markdown-it";
 
 export default async function({log, middlewareUtil, options, resources}) {
@@ -203,7 +203,7 @@ Live demo of the above example: [openui5-sample-app with custom middleware](http
 
 #### CommonJS
 
-```js linenums="1
+```js
 module.exports = async function({log, middlewareUtil, options, resources}) {
     const MarkdownIt = require("markdown-it");
     const md = new MarkdownIt();

packages/documentation/docs/pages/extensibility/CustomServerMiddleware.md

@@ -109,7 +109,7 @@ A custom task implementation needs to return a function with the following signa
 
 #### ESM
 
-```js linenums="1
+```js
 /**
  * Custom task API
  *
@@ -149,7 +149,7 @@ export default async function({dependencies, log, options, taskUtil, workspace})
 
 #### CommonJS
 
-```js linenums="1
+```js
 /**
  * Custom task API
  *
@@ -208,7 +208,7 @@ If this callback is not provided, UI5 CLI will make an assumption as to whether
 
 #### ESM
 
-```js linenums="1
+```js
 /**
  * Callback function to define the list of required dependencies
  *
@@ -249,7 +249,7 @@ export async function determineRequiredDependencies({availableDependencies, getD
 
 #### CommonJS
 
-```js linenums="1
+```js
 /**
  * Callback function to define the list of required dependencies
  *
@@ -300,7 +300,7 @@ result by writing them into the provided `workspace`.
 
 #### ESM
 
-```js linenums="1
+```js
 import path from "node:path";
 import renderMarkdown from "./renderMarkdown.js";
 
@@ -331,7 +331,7 @@ export default async function({dependencies, log, options, taskUtil, workspace})
 
 #### CommonJS
 
-```js linenums="1
+```js
 const path = require("node:path");
 const renderMarkdown = require("./renderMarkdown.js");
 
@@ -375,7 +375,7 @@ APIs to retrieve additional information about the project currently being built
 
 #### ESM
 
-```js linenums="1
+```js
 import path from "node:path";
 
 /*
@@ -425,7 +425,7 @@ export default async function({dependencies, log, options, taskUtil, workspace})
 
 #### CommonJS
 
-```js linenums="1"
+```js
 const path = require("node:path");
 
 /*