style: use archlinux-common-style with shared images and navbar

archlinux · Feb 5, 2021 · 780b05c · 780b05c
1 parent 64ce2c0
commit 780b05c
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 16 deletions.
diff --git a/.external/archlinux-common-style b/.external/archlinux-common-style
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule ".external/normalize.css"]
 	path = .external/normalize.css
 	url = https://github.com/necolas/normalize.css
+[submodule ".external/archlinux-common-style"]
+	path = .external/archlinux-common-style
+	url = https://gitlab.archlinux.org/archlinux/archlinux-common-style.git
diff --git a/tracker/static/archlogo.8a05bc7f6cd1.svg b/tracker/static/archlogo.8a05bc7f6cd1.svg
@@ -0,0 +1 @@
+../../.external/archlinux-common-style/img/archlogo.8a05bc7f6cd1.svg
diff --git a/tracker/static/archlogo.a2d0ef2df27d.png b/tracker/static/archlogo.a2d0ef2df27d.png
diff --git a/tracker/static/favicon.ico b/tracker/static/favicon.ico
diff --git a/tracker/static/favicon.ico b/tracker/static/favicon.ico
@@ -0,0 +1 @@
+../../.external/archlinux-common-style/img/favicon.ico
diff --git a/tracker/static/style.css b/tracker/static/style.css
@@ -101,7 +101,8 @@ select {
 }
 
 #logo {
-	background: rgba(0, 0, 0, 0) url("archlogo.a2d0ef2df27d.png") no-repeat scroll 0 0 !important;
+	background: rgba(0, 0, 0, 0) url("archlogo.8a05bc7f6cd1.svg") no-repeat scroll 0 0 !important;
+	background-size: 100% !important;
 	height: 40px !important;
 	margin: 0 !important;
 	padding: 0 !important;

diff --git a/tracker/templates/base.html b/tracker/templates/base.html
@@ -16,21 +16,8 @@
 		{%- endfor %}
 	</head>
 	<body>
-		<div id="archnavbar">
-			<div id="logo"><a href="https://archlinux.org" title="Return to the main page">Arch Linux</a></div>
-			<div id="archnavbarmenu">
-				<ul id="archnavbarlist">
-					<li id="anb-home"><a href="https://archlinux.org" title="Arch news, packages, projects and more">Home</a></li>
-					<li id="anb-packages"><a href="https://archlinux.org/packages/" title="Arch Package Database">Packages</a></li>
-					<li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>
-					<li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>
-					<li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and track bugs">Bugs</a></li>
-					<li id="anb-security"><a href="https://security.archlinux.org/" title="Arch Linux Security Tracker">Security</a></li>
-					<li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>
-					<li id="anb-download"><a href="https://archlinux.org/download/" title="Get Arch Linux">Download</a></li>
-				</ul>
-			</div>
-		</div>
+		{%- macro navbar() %}{% include "navbar.html" %}{% endmacro %}
+		{{ navbar()|replace('\n', "\n\t\t") }}
 		<div class="content">
 			<div class="navbar">
 				<ul>

diff --git a/tracker/templates/navbar.html b/tracker/templates/navbar.html
@@ -0,0 +1 @@
+../../.external/archlinux-common-style/html/navbar.html