Resolve conflicts from main

Author: reakaleek

src/Elastic.Markdown/Assets/fonts.css renamed to src/Elastic.Markdown/Assets/global/fonts.css

@@ -0,0 +1,10 @@
+#default-search::-webkit-search-cancel-button {
+	@apply pr-2;
+	-webkit-appearance: none;
+	height: 16px;
+	width: 16px;
+	margin-left: .4em;
+	background-image: url("data:image/svg+xml;utf8,<svg aria-hidden='true' xmlns='http://www.w3.org/2000/svg' fill='%23ffffff' viewBox='0 0 24 24'><path stroke='%23ffffff' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M6 18 17.94 6M18 18 6.06 6'/></svg>");
+	cursor: pointer;
+	background-repeat: no-repeat;
+}

src/Elastic.Markdown/Assets/theme.css renamed to src/Elastic.Markdown/Assets/global/theme.css

@@ -0,0 +1,31 @@
+#pages-nav {
+	&::-webkit-scrollbar-track {
+		background-color: transparent;
+	}
+	&:hover::-webkit-scrollbar-thumb {
+		background-color: var(--color-gray-light);
+	}
+	&::-webkit-scrollbar {
+		width: 8px;
+		height: 8px;
+	}
+	&::-webkit-scrollbar-thumb {
+		border-radius: 4px;
+	}
+
+	scrollbar-gutter: stable;
+}
+
+
+#pages-nav li.current {
+	position: relative;
+	&::before {
+		content: "";
+		position: absolute;
+		top: 50%;
+		left: -1px;
+		width: calc(var(--spacing) * 6);
+		height: 1px;
+		background-color: var(--color-gray-200);
+	}
+}

src/Elastic.Markdown/Assets/layout/header.css

@@ -0,0 +1,7 @@
+.side-nav-link-text {
+  	font-family: "Mier B", "Inter", sans-serif;
+	font-size: var(--text-sm);
+	color: var(--color-ink);
+	line-height: 1.2em;
+	letter-spacing: -0.02em;
+}

src/Elastic.Markdown/Assets/layout/pages-nav.css

@@ -1,5 +1,5 @@
-import {initNav} from "./pages-nav";
-import {initHighlight} from "./hljs";
+import {initNav} from "./layout/pages-nav";
+import {initHighlight} from "./markdown/codeblock";
 
 initNav();
 initHighlight();

src/Elastic.Markdown/Assets/pages-nav.ts renamed to src/Elastic.Markdown/Assets/layout/pages-nav.ts

@@ -1,5 +1,5 @@
-import {mergeHTMLPlugin} from "./hljs-merge-html-plugin";
 import hljs from "highlight.js";
+import {mergeHTMLPlugin} from "./hljs-merge-html-plugin";
 
 hljs.registerLanguage('apiheader', function() {
 	return {