Skip to content

Commit f3f9768

Browse files
committed
1 parent 5bee260 commit f3f9768

16 files changed

+36
-280
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "archlinux_common_style"]
2+
path = archlinux_common_style
3+
url = https://gitlab.archlinux.org/archlinux/archlinux-common-style.git

archlinux_common_style

Submodule archlinux_common_style added at c87b01e

settings.py

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@
7070
STATIC_ROOT = path.join(DEPLOY_PATH, 'collected_static')
7171

7272
# Look for more static files in these locations
73-
STATICFILES_DIRS = (
73+
STATICFILES_DIRS = [
7474
path.join(DEPLOY_PATH, 'sitestatic'),
75-
)
75+
]
7676

7777
# Static files backend that allows us to use far future Expires headers
7878
STATICFILES_STORAGE = 'main.storage.MinifiedStaticFilesStorage'
@@ -125,6 +125,8 @@
125125
'django_countries',
126126
'django_extensions',
127127

128+
'archlinux_common_style.django',
129+
128130
'main',
129131
'mirrors',
130132
'news',
@@ -244,7 +246,6 @@
244246
'DIRS': [
245247
path.join(DEPLOY_PATH, 'templates')
246248
],
247-
'APP_DIRS': True,
248249
'OPTIONS': {
249250
'debug': DEBUG,
250251
'context_processors': [
@@ -255,6 +256,16 @@
255256
'csp.context_processors.nonce',
256257
'main.context_processors.mastodon_link',
257258
],
259+
"loaders": [
260+
(
261+
"django.template.loaders.cached.Loader",
262+
[
263+
"django.template.loaders.filesystem.Loader",
264+
"django.template.loaders.app_directories.Loader",
265+
"archlinux_common_style.django.template_loader.Loader",
266+
],
267+
),
268+
],
258269
}
259270
}
260271
]

sitestatic/archnavbar/archlogo.png

-5.23 KB
Binary file not shown.

sitestatic/archnavbar/archlogo.svg

Lines changed: 0 additions & 194 deletions
This file was deleted.

sitestatic/archnavbar/archnavbar.css

Lines changed: 0 additions & 25 deletions
This file was deleted.

sitestatic/archweb.css

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,6 @@
66
* 11px = 0.6875em
77
*/
88

9-
/*
10-
* ARCH GLOBAL NAVBAR
11-
* We're forcing all generic selectors with !important
12-
* to help prevent other stylesheets from interfering.
13-
*/
14-
15-
/* container for the entire bar */
16-
#archnavbar { min-height: 40px !important; padding: 10px 15px !important; background: #333 !important; border-bottom: 5px #08c solid !important; }
17-
#archnavbarlogo { float: left !important; margin: 0 !important; padding: 0 !important; height: 40px !important; width: 190px !important; background: url('archnavbar/archlogo.png') no-repeat !important; }
18-
@media (-webkit-min-device-pixel-ratio: 1.2), (min--moz-device-pixel-ratio: 1.2), (-o-min-device-pixel-ratio: 2/1) {
19-
#archnavbarlogo { float: left !important; margin: 0 !important; padding: 0 !important; height: 40px !important; width: 190px !important; background: url(archnavbar/archlogo.svg) no-repeat !important;background-size:100% !important;
20-
}
21-
}
22-
23-
/* move the heading text offscreen */
24-
#archnavbarlogo h1 { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; }
25-
26-
/* make the link the same size as the logo */
27-
#archnavbarlogo a { display: block !important; height: 40px !important; width: 190px !important; }
28-
29-
/* display the list inline, float it to the right and style it */
30-
#archnavbarlist { display: block !important; list-style: none !important; margin: 0 !important; padding: 0 !important; font-size: 0px !important; text-align: right !important; }
31-
#archnavbarlist li { display: inline-block !important; font-size: 14px !important; font-family: sans-serif !important; line-height: 14px !important; padding: 14px 15px 0px !important; }
32-
33-
/* style the links */
34-
#archnavbarlist li a { color: #999; font-weight: bold !important; text-decoration: none !important; }
35-
#archnavbarlist li a:hover { color: white !important; text-decoration: underline !important; }
36-
37-
/* END ARCH GLOBAL NAVBAR */
38-
399
/* simple reset */
4010
* {
4111
margin: 0;
@@ -1149,9 +1119,9 @@ ul.signoff-list {
11491119
}
11501120

11511121
/* highlight current website in the navbar */
1152-
#archnavbar.anb-home ul li#anb-home a,
1153-
#archnavbar.anb-packages ul li#anb-packages a,
1154-
#archnavbar.anb-download ul li#anb-download a {
1122+
header.anb-home ul li#anb-home a,
1123+
header.anb-packages ul li#anb-packages a,
1124+
header.anb-download ul li#anb-download a {
11551125
color: white !important;
11561126
}
11571127

sitestatic/favicon.png

-7.74 KB
Binary file not shown.
-2.04 KB
Binary file not shown.
-2.99 KB
Binary file not shown.

0 commit comments

Comments
 (0)