From 780b05c5d7d47b3f298f801df6cbe16a56746379 Mon Sep 17 00:00:00 2001 From: anthraxx Date: Fri, 5 Feb 2021 21:56:35 +0100 Subject: [PATCH] style: use archlinux-common-style with shared images and navbar --- .external/archlinux-common-style | 1 + .gitmodules | 3 +++ tracker/static/archlogo.8a05bc7f6cd1.svg | 1 + tracker/static/archlogo.a2d0ef2df27d.png | Bin 5359 -> 0 bytes tracker/static/favicon.ico | Bin 501 -> 54 bytes tracker/static/style.css | 3 ++- tracker/templates/base.html | 17 ++--------------- tracker/templates/navbar.html | 1 + 8 files changed, 10 insertions(+), 16 deletions(-) create mode 160000 .external/archlinux-common-style create mode 120000 tracker/static/archlogo.8a05bc7f6cd1.svg delete mode 100644 tracker/static/archlogo.a2d0ef2df27d.png mode change 100644 => 120000 tracker/static/favicon.ico create mode 120000 tracker/templates/navbar.html diff --git a/.external/archlinux-common-style b/.external/archlinux-common-style new file mode 160000 index 00000000..fe414724 --- /dev/null +++ b/.external/archlinux-common-style @@ -0,0 +1 @@ +Subproject commit fe41472481348017b99e31f205235cdcaa0d556f diff --git a/.gitmodules b/.gitmodules index 99a388c6..90450c8c 100644 --- 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 new file mode 120000 index 00000000..673add74 --- /dev/null +++ b/tracker/static/archlogo.8a05bc7f6cd1.svg @@ -0,0 +1 @@ +../../.external/archlinux-common-style/img/archlogo.8a05bc7f6cd1.svg \ No newline at end of file diff --git a/tracker/static/archlogo.a2d0ef2df27d.png b/tracker/static/archlogo.a2d0ef2df27d.png deleted file mode 100644 index 3d2cd40fb499b2b37651ea67ec6f3b4400e3d157..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5359 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 diff --git a/tracker/static/favicon.ico b/tracker/static/favicon.ico new file mode 120000 index 00000000..a5c5649e --- /dev/null +++ b/tracker/static/favicon.ico @@ -0,0 +1 @@ +../../.external/archlinux-common-style/img/favicon.ico \ No newline at end of file diff --git a/tracker/static/style.css b/tracker/static/style.css index 2c9fcba5..3049a3dd 100644 --- 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 index 54f5b86a..483fa1da 100644 --- a/tracker/templates/base.html +++ b/tracker/templates/base.html @@ -16,21 +16,8 @@ {%- endfor %} -
- -
- -
-
+ {%- macro navbar() %}{% include "navbar.html" %}{% endmacro %} + {{ navbar()|replace('\n', "\n\t\t") }}
    diff --git a/tracker/templates/navbar.html b/tracker/templates/navbar.html new file mode 120000 index 00000000..d64ce4c6 --- /dev/null +++ b/tracker/templates/navbar.html @@ -0,0 +1 @@ +../../.external/archlinux-common-style/html/navbar.html \ No newline at end of file