neale/moth
neale
/
moth
mirror of https://github.com/dirtbags/moth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Actually use fonts, minimize build a bit

This commit is contained in:
Neale Pickett 2017-11-03 21:20:34 +00:00
parent 42aba8fca6
commit c3f58835b5
4 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Dockerfile.moth
View File

@ -1,17 +1,14 @@
FROM neale/eris FROM neale/eris
RUN apk --no-cache add lua5.2 RUN apk --no-cache add lua5.2 lua5.3
RUN apk --no-cache add lua5.3
RUN ln -s lua5.2 /usr/bin/lua RUN ln -s lua5.2 /usr/bin/lua
# Install MOTH. This could be less obtuse. # Install MOTH. This could be less obtuse.
COPY www /moth/www COPY www /moth/www/
COPY bin /moth/bin COPY bin /moth/bin/
RUN ln -s ../state/puzzles.json /moth/www/puzzles.json COPY src/moth-init /moth/init
RUN ln -s ../state/points.json /moth/www/points.json RUN ln -s ../state/puzzles.json /moth/www/puzzles.json && \
ln -s ../state/points.json /moth/www/points.json
COPY src/moth-init /usr/sbin/moth-init CMD ["/moth/init"]
WORKDIR /
CMD ["/usr/sbin/moth-init"]

5
Dockerfile.moth-devel
View File

@ -5,10 +5,7 @@ ENV http_proxy=${http_proxy}
RUN apk --no-cache add python3 py3-pillow RUN apk --no-cache add python3 py3-pillow
COPY tools/devel-server.py /moth/ COPY tools/devel-server.py tools/moth.py tools/mistune.py tools/answer_words.txt /moth/
COPY tools/moth.py /moth/
COPY tools/mistune.py /moth/
COPY tools/answer_words.txt /moth/
COPY www /moth/src/www COPY www /moth/src/www
COPY example-puzzles /moth/puzzles COPY example-puzzles /moth/puzzles
COPY docs /moth/docs COPY docs /moth/docs

2
www/fonts/maven_pro.css
View File

@ -1,4 +1,3 @@
/*
@font-face { @font-face {
font-family: 'Maven Pro'; font-family: 'Maven Pro';
src: url('maven_pro_black-webfont.eot'); src: url('maven_pro_black-webfont.eot');
@ -10,7 +9,6 @@
font-style: normal; font-style: normal;
} }
/*
@font-face { @font-face {
font-family: 'Maven Pro'; font-family: 'Maven Pro';

3
www/style.css
View File

@ -172,9 +172,8 @@ nav li + li:before {
} }
#sponsors img { #sponsors img {
max-width: 33%; max-width: 25%;
max-height: 5em; max-height: 5em;
margin: 1em;
} }