Skip to content

Commit 02016b6

Browse files
julioestjulioest
committed
fix: copy website assets properly in CI
- Inline logo styles to resolve build dependencies - Update CI workflow for correct asset copying - Generate landing page website with all required styles
1 parent f936346 commit 02016b6

File tree

3 files changed

+52
-14
lines changed

3 files changed

+52
-14
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,7 @@ jobs:
627627
mkdir -p ../../build/website
628628
cp index.html ../../build/website/index.html
629629
cp styles.css ../../build/website/styles.css
630+
cp -r assets ../../build/website/assets
630631
631632
- name: Generate Antora UI
632633
working-directory: docs/ui

‎docs/website/index.html‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
</head>
2626

2727
<body>
28-
<nav class="nav container-fluid" role="navigation" aria-label="Main navigation">
28+
<nav class="nav container-fluid" aria-label="Main navigation">
2929
<div class="nav-section">
30-
<a href="/" class="logo-link" aria-label="MrDocs Home"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1080 1080">
30+
<a href="/" class="logo-link" aria-label="MrDocs Home"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1080 1080" aria-hidden="true">
3131
<defs>
3232
<style>
3333
.st0{fill:#fff}
@@ -63,11 +63,11 @@
6363
</div>
6464
<div class="nav-section">
6565
<ul role="menubar">
66-
<li role="none"><a href="#features" class="secondary" role="menuitem">Features</a></li>
67-
<li role="none"><a href="./docs/" class="secondary" role="menuitem">Docs</a></li>
66+
<li><a href="#features" class="secondary">Features</a></li>
67+
<li><a href="./docs/" class="secondary">Docs</a></li>
6868
<li>
6969
<a href="https://www.github.com/cppalliance/mrdocs" class="contrast" aria-label=" GitHub repository">
70-
<svg aria-hidden="true" focusable="false" role="img" xmlns="http://www.w3.org/2000/svg"
70+
<svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg"
7171
viewBox="0 0 496 512" height="16px">
7272
<path fill="currentColor"
7373
d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"></path>
@@ -83,8 +83,8 @@
8383
<h1>Mr.Docs</h1>
8484
<p>Mr.Docs is a C++ documentation generator for your projects.</p>
8585
<div class="header-cta">
86-
<a href="docs/" class="secondary" role="button" aria-label="Documentation">Get started</a>
87-
<a href="docs/mrdocs/install.html" class="contrast outline" role="button" aria-label="Download">Download</a>
86+
<a href="docs/" class="secondary" role="button">Get started</a>
87+
<a href="docs/mrdocs/install.html" class="contrast outline" role="button">Download</a>
8888
</div>
8989
<div class="banner-snippet">
9090
<small><code>No workarounds: A tool that fully understands C++</code></small>
@@ -118,7 +118,7 @@ <h3>Mr.Docs understands C++ so you can focus on keeping the code simple.</h3>
118118

119119
<div class="grid principles-features">
120120
<div>
121-
<svg aria-hidden="true" focusable="false" role="img" xmlns="http://www.w3.org/2000/svg"
121+
<svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg"
122122
viewBox="0 0 640 512" height="16px">
123123
<path fill="currentColor"
124124
d="M278.9 511.5l-61-17.7c-6.4-1.8-10-8.5-8.2-14.9L346.2 8.7c1.8-6.4 8.5-10 14.9-8.2l61 17.7c6.4 1.8 10 8.5 8.2 14.9L293.8 503.3c-1.9 6.4-8.5 10.1-14.9 8.2zm-114-112.2l43.5-46.4c4.6-4.9 4.3-12.7-.8-17.2L117 256l90.6-79.7c5.1-4.5 5.5-12.3.8-17.2l-43.5-46.4c-4.5-4.8-12.1-5.1-17-.5L3.8 247.2c-5.1 4.7-5.1 12.8 0 17.5l144.1 135.1c4.9 4.6 12.5 4.4 17-.5zm327.2.6l144.1-135.1c5.1-4.7 5.1-12.8 0-17.5L492.1 112.1c-4.8-4.5-12.4-4.3-17 .5L431.6 159c-4.6 4.9-4.3 12.7.8 17.2L523 256l-90.6 79.7c-5.1 4.5-5.5 12.3-.8 17.2l43.5 46.4c4.5 4.9 12.1 5.1 17 .6z">
@@ -128,7 +128,7 @@ <h4>Single Source of Truth</h4>
128128
<p>Mr. Docs takes a specially formatted comment, called a Javadoc, which precedes a C++ declaration and renders it to form a reference as part of documentation.</p>
129129
</div>
130130
<div>
131-
<svg aria-hidden="true" focusable="false" role="img" xmlns="http://www.w3.org/2000/svg"
131+
<svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg"
132132
viewBox="0 0 640 512" height="16px">
133133
<path fill="currentColor"
134134
d="M278.9 511.5l-61-17.7c-6.4-1.8-10-8.5-8.2-14.9L346.2 8.7c1.8-6.4 8.5-10 14.9-8.2l61 17.7c6.4 1.8 10 8.5 8.2 14.9L293.8 503.3c-1.9 6.4-8.5 10.1-14.9 8.2zm-114-112.2l43.5-46.4c4.6-4.9 4.3-12.7-.8-17.2L117 256l90.6-79.7c5.1-4.5 5.5-12.3.8-17.2l-43.5-46.4c-4.5-4.8-12.1-5.1-17-.5L3.8 247.2c-5.1 4.7-5.1 12.8 0 17.5l144.1 135.1c4.9 4.6 12.5 4.4 17-.5zm327.2.6l144.1-135.1c5.1-4.7 5.1-12.8 0-17.5L492.1 112.1c-4.8-4.5-12.4-4.3-17 .5L431.6 159c-4.6 4.9-4.3 12.7.8 17.2L523 256l-90.6 79.7c-5.1 4.5-5.5 12.3-.8 17.2l43.5 46.4c4.5 4.9 12.1 5.1 17 .6z">
@@ -138,7 +138,7 @@ <h4>It understands C++</h4>
138138
<p>Mr. Docs understands C++: Overload sets, private APIs, Concepts and constraints, unspecified return types, aliases, constants, SFINAE, hidden base classes, niebloids, and coroutines.</p>
139139
</div>
140140
<div>
141-
<svg aria-hidden="true" focusable="false" role="img" xmlns="http://www.w3.org/2000/svg"
141+
<svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg"
142142
viewBox="0 0 640 512" height="16px">
143143
<path fill="currentColor"
144144
d="M278.9 511.5l-61-17.7c-6.4-1.8-10-8.5-8.2-14.9L346.2 8.7c1.8-6.4 8.5-10 14.9-8.2l61 17.7c6.4 1.8 10 8.5 8.2 14.9L293.8 503.3c-1.9 6.4-8.5 10.1-14.9 8.2zm-114-112.2l43.5-46.4c4.6-4.9 4.3-12.7-.8-17.2L117 256l90.6-79.7c5.1-4.5 5.5-12.3.8-17.2l-43.5-46.4c-4.5-4.8-12.1-5.1-17-.5L3.8 247.2c-5.1 4.7-5.1 12.8 0 17.5l144.1 135.1c4.9 4.6 12.5 4.4 17-.5zm327.2.6l144.1-135.1c5.1-4.7 5.1-12.8 0-17.5L492.1 112.1c-4.8-4.5-12.4-4.3-17 .5L431.6 159c-4.6 4.9-4.3 12.7.8 17.2L523 256l-90.6 79.7c-5.1 4.5-5.5 12.3-.8 17.2l43.5 46.4c4.5 4.9 12.1 5.1 17 .6z">
@@ -148,7 +148,7 @@ <h4>Multiple output formats</h4>
148148
<p>Choose from multiple output formats: Asciidoc, HTML, or XML.</p>
149149
</div>
150150
<div>
151-
<svg aria-hidden="true" focusable="false" role="img" xmlns="http://www.w3.org/2000/svg"
151+
<svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg"
152152
viewBox="0 0 640 512" height="16px">
153153
<path fill="currentColor"
154154
d="M278.9 511.5l-61-17.7c-6.4-1.8-10-8.5-8.2-14.9L346.2 8.7c1.8-6.4 8.5-10 14.9-8.2l61 17.7c6.4 1.8 10 8.5 8.2 14.9L293.8 503.3c-1.9 6.4-8.5 10.1-14.9 8.2zm-114-112.2l43.5-46.4c4.6-4.9 4.3-12.7-.8-17.2L117 256l90.6-79.7c5.1-4.5 5.5-12.3.8-17.2l-43.5-46.4c-4.5-4.8-12.1-5.1-17-.5L3.8 247.2c-5.1 4.7-5.1 12.8 0 17.5l144.1 135.1c4.9 4.6 12.5 4.4 17-.5zm327.2.6l144.1-135.1c5.1-4.7 5.1-12.8 0-17.5L492.1 112.1c-4.8-4.5-12.4-4.3-17 .5L431.6 159c-4.6 4.9-4.3 12.7.8 17.2L523 256l-90.6 79.7c-5.1 4.5-5.5 12.3-.8 17.2l43.5 46.4c4.5 4.9 12.1 5.1 17 .6z">
@@ -523,7 +523,7 @@ <h3>Parameters</h3>
523523
</div>
524524
</div>
525525
</section>
526-
<section id="star" data-theme="light" aria-label="Star Mr.Docs on GitHub">
526+
<section id="star" data-theme="light">
527527
<div class="container">
528528
<p>Give us a Star on GitHub:
529529
<iframe src="https://ghbtns.com/github-btn.html?user=cppalliance&amp;repo=mrdocs&amp;type=star&amp;count=true&amp;size=large"
@@ -587,4 +587,4 @@ <h3>Parameters</h3>
587587
</script>
588588
</body>
589589

590-
</html>
590+
</html>

‎docs/website/styles.css‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@charset "UTF-8";
2-
@import "../shared/logo.css";
32

43
:root {
54
--font-family: system-ui, -apple-system, "Segoe UI", "Roboto", "Ubuntu", "Cantarell", "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
@@ -2789,6 +2788,44 @@ html {
27892788
background-attachment: fixed;
27902789
}
27912790

2791+
/* ===========================
2792+
Shared Logo Styles
2793+
=========================== */
2794+
2795+
/* Logo Styles */
2796+
.nav .logo-link, .navbar-brand .navbar-item:first-child {
2797+
display: flex;
2798+
align-items: center;
2799+
gap: 0.25rem;
2800+
text-decoration: none;
2801+
}
2802+
2803+
.nav .logo-link:hover {
2804+
opacity: 0.8;
2805+
text-decoration: none;
2806+
}
2807+
2808+
.nav .logo-link svg, .navbar-brand .navbar-item:first-child svg {
2809+
height: 48px;
2810+
width: auto;
2811+
flex-shrink: 0;
2812+
}
2813+
2814+
.nav .logo-text, .navbar-brand .navbar-item:first-child .logo-text {
2815+
font-weight: 700;
2816+
color: #fff;
2817+
white-space: nowrap;
2818+
}
2819+
2820+
@media (max-width: 576px) {
2821+
.nav .logo-link svg {
2822+
height: 28px;
2823+
}
2824+
2825+
.nav .logo-link {
2826+
gap: 0.5rem;
2827+
}
2828+
}
27922829

27932830
nav {
27942831
background-color: rgba(0, 0, 0, 0.2);

0 commit comments

Comments
 (0)