diff --git a/app/Dockerfile b/app/Dockerfile index 3da380b..1a12d43 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -1,28 +1,28 @@ FROM ubuntu:latest + MAINTAINER wes kerfoot "wjak56@gmail.com" RUN apt-get update -y -RUN apt-get install -y python3-pip python3-dev build-essential sassc jq curl -RUN curl -sL https://deb.nodesource.com/setup_11.x | bash -RUN apt-get install -y nodejs +RUN apt-get install -y curl +RUN curl -sL https://deb.nodesource.com/setup_13.x | bash +RUN apt-get update -y +RUN apt-get install -y python3-pip python3-dev build-essential sassc jq nodejs RUN npm install -g uglifycss uglifyjs COPY . ./src +COPY run.sh /run.sh +COPY blogPosts.json /blogPosts.json WORKDIR /src -RUN npm install -RUN pip3 install -r /src/requirements.txt -RUN mkdir -p ./build/styles ./build/scripts +RUN npm install && pip3 install -r /src/requirements.txt && \ + mkdir -p ./build/styles ./build/scripts && \ + npm run-script build_riotblog && \ + npm run-script build_editor -RUN npm run-script build_riotblog -RUN npm run-script build_editor -RUN sassc ./styles/riotblog.scss > ./styles/riotblog.intermediate.min.css -RUN cp ./styles/*.css ./build/styles/ -RUN uglifycss ./styles/*.css > ./build/styles/riotblog.min.css - -COPY run.sh /run.sh -COPY blogPosts.json /blogPosts.json +RUN sassc ./styles/riotblog.scss > ./styles/riotblog.intermediate.min.css && \ + cp ./styles/*.css ./build/styles/ && \ + uglifycss ./styles/*.css > ./build/styles/riotblog.min.css ENTRYPOINT ["/bin/bash", "/run.sh"] CMD ["/src/website.py"] diff --git a/app/styles/riotblog.scss b/app/styles/riotblog.scss index 3725ec2..107d936 100644 --- a/app/styles/riotblog.scss +++ b/app/styles/riotblog.scss @@ -66,7 +66,7 @@ html { font-weight: 400; color: black; @media (max-width: 600px) { - font-size: 1.6em; + font-size: 1.7em; } @media (max-width: 530px) { font-size: 1.3em; @@ -475,8 +475,8 @@ $bg-color: red; .post-card { @extend .shadow; - max-width: 80%; - @media(max-width: 400px) { + max-width: 85%; + @media(max-width: 500px) { max-width: 95%; } }