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

Merge pull request #13 from offen/autoprefixer

Add autoprefixer to css pipeline
This commit is contained in:
Hendrik Niefeld 2019-10-27 21:08:34 +01:00 committed by GitHub
commit c85ca0f3dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 29 deletions

1
.dockerignore Normal file
View File

@ -0,0 +1 @@
homepage/output

View File

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

View File

@ -5,7 +5,7 @@ ENV SITEURL=$siteurl
COPY ./homepage /code/homepage COPY ./homepage /code/homepage
RUN npm install svgo -g RUN npm install -g postcss-cli@^6.1.3 autoprefixer@^9.7.0 svgo@^1.3.0
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

@ -19,20 +19,12 @@ services:
- database:/data - database:/data
environment: environment:
OFFEN_APP_EVENTRETENTIONPERIOD: 4464h OFFEN_APP_EVENTRETENTIONPERIOD: 4464h
OFFEN_APP_DEVELOPMENT: '1'
OFFEN_APP_DISABLESECURECOOKIE: '1' OFFEN_APP_DISABLESECURECOOKIE: '1'
OFFEN_DATABASE_CONNECTIONSTRING: /data/offen.db OFFEN_DATABASE_CONNECTIONSTRING: /data/offen.db
OFFEN_SERVER_PORT: 8080 OFFEN_SERVER_PORT: 8080
OFFEN_SERVER_REVERSEPROXY: '1' OFFEN_SERVER_REVERSEPROXY: '1'
OFFEN_SECRETS_COOKIEEXCHANGE: 8jeKYbbnywoYIZznu4HffQ== OFFEN_SECRETS_COOKIEEXCHANGE: 8jeKYbbnywoYIZznu4HffQ==
OFFEN_SECRETS_EMAILSALT: eypctS7SVKM1Ureb61db5Q== OFFEN_SECRETS_EMAILSALT: eypctS7SVKM1Ureb61db5Q==
depends_on:
- server_database
server_database:
image: postgres:11.2
environment:
POSTGRES_PASSWORD: develop
homepage: homepage:
build: build:

View File

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

View File

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

View File

@ -132,9 +132,6 @@ CARDS
display: flex; display: flex;
} }
.card { .card {
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column; flex-direction: column;
width: 280px; width: 280px;
color: $black-mid; color: $black-mid;
@ -154,14 +151,9 @@ CARDS
@media only screen and (max-width: 960px) { @media only screen and (max-width: 960px) {
.card-deck, .card-deck,
.footer-card-deck { .footer-card-deck {
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column; flex-direction: column;
} }
.card-deck { .card-deck {
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center; justify-content: center;
} }
.card { .card {
@ -178,22 +170,15 @@ CARDS
@media only screen and (min-width: 961px) { @media only screen and (min-width: 961px) {
.card-deck, .card-deck,
.footer-card-deck { .footer-card-deck {
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-ms-flex-direction: row;
flex-direction: row; flex-direction: row;
} }
.card-deck { .card-deck {
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center; justify-content: center;
} }
.card:nth-child(2) { .card:nth-child(2) {
margin: 0 50px 0 50px; margin: 0 50px 0 50px;
} }
.footer-card-deck { .footer-card-deck {
-webkit-box-pack: justify;
-ms-flex-pack: justify;
justify-content: space-between; justify-content: space-between;
} }
.footer-card:nth-child(1), .footer-card:nth-child(1),
@ -379,8 +364,6 @@ BUTTONS
margin: 40px 0 0 0; margin: 40px 0 0 0;
} }
.btn { .btn {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0px; border-radius: 0px;
padding: 8px 30px; padding: 8px 30px;
text-align: center; text-align: center;

View File

@ -19,7 +19,7 @@
<meta name="twitter:card" content="summary_large_image"> <meta name="twitter:card" content="summary_large_image">
<link rel="canonical" href="{{ SITEURL }}/{{ page.save_as }}"> <link rel="canonical" href="{{ SITEURL }}/{{ page.save_as }}">
<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="libsass,cssmin", output="css/style.min.css", "css/normalize.css", "css/fonts.css", "css/style.scss" %} {% assets filters="libsass,postcss,cssmin", output="css/style.min.css", "css/normalize.css", "css/fonts.css", "css/style.scss" %}
<link rel="stylesheet" href="/{{ ASSET_URL }}"> <link rel="stylesheet" href="/{{ ASSET_URL }}">
{% endassets %} {% endassets %}
{% if OFFEN_ACCOUNT_ID and not page.no_stats %} {% if OFFEN_ACCOUNT_ID and not page.no_stats %}