2
0
mirror of https://github.com/offen/website.git synced 2024-11-22 17:10:29 +01:00

Merge pull request #48 from offen/css-build

Use cssnano instead of cssmin for building css
This commit is contained in:
Frederik Ring 2020-02-23 15:59:41 +01:00 committed by GitHub
commit b9f9c44469
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 6 deletions

View File

@ -1,6 +1,6 @@
FROM nikolaik/python-nodejs:python3.7-nodejs12 FROM nikolaik/python-nodejs:python3.7-nodejs12
RUN npm install -g postcss-cli@^6.1.3 autoprefixer@^9.7.0 RUN npm install -g postcss-cli@^6.1.3 autoprefixer@^9.7.0 cssnano@^4.1.10
ENV PATH="/root/.local/bin:$PATH" ENV PATH="/root/.local/bin:$PATH"
ENV NODE_PATH="/usr/lib/node_modules" ENV NODE_PATH="/usr/lib/node_modules"

View File

@ -9,7 +9,7 @@ ARG offenaccountid
ENV OFFEN_ACCOUNT_ID=$offenaccountid ENV OFFEN_ACCOUNT_ID=$offenaccountid
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
RUN npm install -g postcss-cli@^6.1.3 autoprefixer@^9.7.0 svgo@^1.3.0 RUN npm install -g postcss-cli@^6.1.3 autoprefixer@^9.7.0 svgo@^1.3.0 cssnano@^4.1.10
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y libjpeg-progs optipng \ && apt-get install -y libjpeg-progs optipng \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

View File

@ -1,5 +1,8 @@
module.exports = { module.exports = {
plugins: [ plugins: [
require('autoprefixer') require('autoprefixer'),
require('cssnano')({
preset: 'default'
})
] ]
} }

View File

@ -1,6 +1,4 @@
pelican==4.0.1 pelican==4.0.1
markdown==3.1.1 markdown==3.1.1
git+git://github.com/miracle2k/webassets#d1f3455e383446ca4ab0c644f326ee937e68e809 git+git://github.com/miracle2k/webassets#d1f3455e383446ca4ab0c644f326ee937e68e809
cssmin==0.2.0
libsass==0.19.3
beautifulsoup4==4.8.1 beautifulsoup4==4.8.1

View File

@ -22,7 +22,7 @@
<link rel="canonical" href="{{ SITEURL }}/{{ href }}"> <link rel="canonical" href="{{ SITEURL }}/{{ href }}">
{% endif %} {% endif %}
<link rel="shortcut icon" type="image/x-icon" href="/theme/images/favicon.ico"> <link rel="shortcut icon" type="image/x-icon" href="/theme/images/favicon.ico">
{% assets filters="postcss,cssmin", output="css/style.min.css", "css/tachyons.min.css", "css/fix.css", "css/fonts.css" %} {% assets filters="postcss", output="css/style.min.css", "css/tachyons.min.css", "css/fix.css", "css/fonts.css" %}
<link rel="stylesheet" href="/{{ ASSET_URL }}"> <link rel="stylesheet" href="/{{ ASSET_URL }}">
{% endassets %} {% endassets %}
<link rel="preload" href="/theme/fonts/rubik-v9-latin-regular.woff2" as="font" crossorigin> <link rel="preload" href="/theme/fonts/rubik-v9-latin-regular.woff2" as="font" crossorigin>