Skip to content

Commit 2efed99

Browse files
committed
update to pelican 4.8
Older pelican versions don't work with current Python 3.10+. Have to refresh the theme settings in the process.
1 parent 1562382 commit 2efed99

22 files changed

+629
-232
lines changed

Makefile

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ help:
4747
@echo ' make publish generate using production settings '
4848
@echo ' make serve [PORT=8000] serve site at http://localhost:8000'
4949
@echo ' make serve-global [SERVER=0.0.0.0] serve (as root) to $(SERVER):80 '
50-
@echo ' make devserver [PORT=8000] start/restart develop_server.sh '
51-
@echo ' make stopserver stop local server '
50+
@echo ' make devserver [PORT=8000] start/restart local server '
5251
@echo ' make ssh_upload upload the web site via SSH '
5352
@echo ' make rsync_upload upload the web site via rsync+ssh '
5453
@echo ' make dropbox_upload upload the web site via Dropbox '
@@ -62,13 +61,13 @@ help:
6261
@echo ' '
6362

6463
html:
65-
$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
64+
$(PELICAN) $(INPUTDIR) --output $(OUTPUTDIR) --settings $(CONFFILE) $(PELICANOPTS)
6665

6766
clean:
6867
[ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR)
6968

7069
regenerate:
71-
$(PELICAN) -r $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
70+
$(PELICAN) -r $(INPUTDIR) --output $(OUTPUTDIR) --settings $(CONFFILE) $(PELICANOPTS)
7271

7372
serve:
7473
ifdef PORT
@@ -87,17 +86,13 @@ endif
8786

8887
devserver:
8988
ifdef PORT
90-
$(BASEDIR)/develop_server.sh restart $(PORT)
89+
$(PELICAN) --autoreload --listen --port $(PORT)
9190
else
92-
$(BASEDIR)/develop_server.sh restart
91+
$(PELICAN) --autoreload --listen
9392
endif
9493

95-
stopserver:
96-
$(BASEDIR)/develop_server.sh stop
97-
@echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'
98-
9994
publish:
100-
$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
95+
$(PELICAN) $(INPUTDIR) --output $(OUTPUTDIR) --settings $(PUBLISHCONF) $(PELICANOPTS)
10196
cp gh-pages-README.md $(OUTPUTDIR)/README.md
10297

10398
ssh_upload: publish
@@ -122,7 +117,7 @@ github: publish
122117
ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) $(OUTPUTDIR)
123118
git push origin $(GITHUB_PAGES_BRANCH)
124119

125-
.PHONY: html help clean regenerate serve serve-global devserver stopserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github
120+
.PHONY: html help clean regenerate serve serve-global devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github
126121

127122
# Everything below here is custom to libgd.
128123

develop_server.sh

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

libgd/static/css/fonts.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
@font-face {
2+
font-family: 'Yanone Kaffeesatz';
3+
font-style: normal;
4+
font-weight: 400;
5+
src:
6+
local('Yanone Kaffeesatz Regular'),
7+
local('YanoneKaffeesatz-Regular'),
8+
/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */
9+
url('../fonts/Yanone_Kaffeesatz_400.woff') format('woff'),
10+
/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */
11+
url('../fonts/Yanone_Kaffeesatz_400.woff2') format('woff2');
12+
}

libgd/static/css/libgd.css

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
* LibGD overrides.
3+
*/
4+
@import url("main.css");
5+
6+
#banner nav {
7+
margin: 2em auto 0 auto;
8+
}
9+
10+
#banner nav a:link, #banner nav a:visited {
11+
padding: 5px 1em;
12+
}
13+
14+
#logomin {
15+
float: right;
16+
}
17+
18+
/* This is ~768px with 16pt font. */
19+
@media only screen and (max-width: 50em) {
20+
#banner nav {
21+
margin-top: 0;
22+
}
23+
#logomin {
24+
width: 25%;
25+
}
26+
}

0 commit comments

Comments
 (0)