update sasscompile

This commit is contained in:
L3D 2019-06-20 17:42:28 +02:00
parent cd81728707
commit 9ba6bf45b2
Signed by: l3d
GPG key ID: CD08445BFF4313D1
5 changed files with 72 additions and 23 deletions

View file

@ -7,10 +7,9 @@ cache:
- $HOME/.cache/pip - $HOME/.cache/pip
before_install: before_install:
- git lfs pull - git lfs pull
- make install-sassc
install: install:
- "pip install Lektor" - "pip install Lektor"
- make sass - make build
script: "lektor build" script: "lektor build"
before_deploy: "echo 'c3woc.de ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC5NslYj+wtriBuKIxJfDRm9E2hnlstWR8durQ6pKvVvP7wjcoXIyAxe41GvJ9SoEhSjF7oVlzlw+zAkzl5WOZ4=' > ~/.ssh/known_hosts" before_deploy: "echo 'c3woc.de ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC5NslYj+wtriBuKIxJfDRm9E2hnlstWR8durQ6pKvVvP7wjcoXIyAxe41GvJ9SoEhSjF7oVlzlw+zAkzl5WOZ4=' > ~/.ssh/known_hosts"
deploy: deploy:

View file

@ -3,28 +3,32 @@ LEKTOR_SERVER_FLAGS=-h 127.0.0.1
all: build all: build
sass: sass:
./sassc/bin/sassc -t compressed ./assets/sass/main.scss ./assets/css/main.min.css
./sassc/bin/sassc -t compressed ./assets/sass/ie9.scss ./assets/css/ie9.min.css
lektor clean --yes lektor clean --yes
lektor build lektor server -f jsminify
sass-uncompressed:
./sassc/bin/sassc ./assets/sass/main.scss ./assets/css/main.css
./sassc/bin/sassc ./assets/sass/ie9.scss ./assets/css/ie9.css
lektor clean --yes
lektor build
.ONESHELL:
install: install:
if hash apt 2>/dev/null; then sudo apt update; sudo apt install imagemagick python3 python3-pip -y; elif hash pacman 2>/dev/null; then sudo pacman -Sy graphicsmagick glibc lib32-glibc python python-pip --noconfirm; elif hash dnf 2>/dev/null; then sudo dnf install -y ImageMagick python3 python3-pip; else echo -e "Please install Imagemagick, Python3 and Pip!"; fi if hash apt-get 2>/dev/null; then
sudo apt-get update -qq >/dev/null && sudo apt-get install -qq apt-utils imagemagick python3-pip python3-setuptools gcc
elif hash pacman 2>/dev/null; then
sudo pacman -Syu imagemagick python-pip glibc lib32-glibc gcc --noconfirm
elif hash dnf 2>/dev/null; then
sudo dnf install -y ImageMagick python3-pip gcc
else
echo -e "Please install Imagemagick, python3-pip and gcc"
fi
pip install lektor --user pip install lektor --user
make install-sassc # pip3 install wheel --user
lektor plugin flush-cache
install-sassc: install-sassc:
if [ ! -d './sassc' ]; then git clone https://github.com/sass/sassc.git sassc; . sassc/script/bootstrap ; make -C sassc -j4 ; fi lektor plugin flush-cache
lektor clean --yes
lektor build -f jsminify
build: sass build:
lektor build lektor clean --yes
lektor build -f jsminify
server: server:
lektor server $(LEKTOR_SERVER_FLAGS) lektor server $(LEKTOR_SERVER_FLAGS)

View file

@ -2,6 +2,7 @@
name = c3woc-webseite name = c3woc-webseite
url = https://podcast.c3woc.de/ url = https://podcast.c3woc.de/
url_style = absolute url_style = absolute
excluded_assets = sass, sass/*, *.scss
[servers.c3woc] [servers.c3woc]
name = c3woc name = c3woc
@ -22,3 +23,5 @@ name = Englisch
locale = en_US locale = en_US
url_prefix = /en/ url_prefix = /en/
[packages]
lektor-scsscompile = 1.0.1

3
configs/scsscompile.ini Normal file
View file

@ -0,0 +1,3 @@
source_dir = assets/sass/
output_dir = assets/css/
output_style = compressed

View file

@ -1,12 +1,52 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
{%- set baseurl = "https://podcast.c3woc.de/" %}{% {%- set baseurl = "https://podcast.c3woc.de/" %}{%
set search = "eisen" %} set search = "eisen" %}
<feed xmlns="http://www.w3.org/2005/Atom"> <rss xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd" version="2.0">
<title type="text">{% <channel>
if bag('translate', this.alt, 'hefeed') %}{{ bag('translate', this.alt, 'hefeed') }}{% <title type="text">
else %}Das heisse Eisen{% endif %}</title> {%- if bag('translate', this.alt, 'hefeed') -%}
<id>{{ baseurl }}podcast-he.xml</id> {{ bag('translate', this.alt, 'hefeed') }}
<updated>{{ none|datetimeformat('YYYY-MM-ddThh:mm:ss') }}Z</updated> {%- else -%}
Das heisse Eisen
{%- endif -%}</title>
<link>{{ baseurl }}</link>
<id>{{ baseurl }}podcast-he.xml</id>
<description>Der Waffelpodcast: 'Das heisse Eisen'. Mit Venty und L3D.</description>
<generator>Von Hand als jinja2 template geschrieben</generator>
<language>de</language>
<copyright>L3D</copyright>
<updated>{{ none|datetimeformat('YYYY-MM-ddThh:mm:ss') }}Z</updated>
<pubDate>Wed, 07 Mar 2007 16:48:22 +0100</pubDate>
<lastBuildDate>Wed, 07 Mar 2007 16:48:22 +0100</lastBuildDate>
<itunes:author>Martin Ebnoether</itunes:author>
<itunes:subtitle>Ventys Podcast</itunes:subtitle>
<itunes:summary>Das ist der Podcast von Ventilator</itunes:summary>
<itunes:keywords>Venty, Ventilator, Semmel, Podcast</itunes:keywords>
<itunes:explicit>no</itunes:explicit>
<itunes:owner>
<itunes:name>Martin Ebnoether</itunes:name>
<itunes:email>ventilator@semmel.ch</itunes:email>
</itunes:owner>
<itunes:new-feed-url>http://www.semmel.ch/podcast/der-podcast.xml</itunes:new-feed-url>
<itunes:block>no</itunes:block>
<itunes:category text="Society &amp; Culture">
<itunes:category text="Personal Journals"/>
</itunes:category>
<item>
<title>Folge 001 - Start mit Hindernissen!</title>
<link>http://www.semmel.ch/podcast/Podcast-Folge-001.mp3</link>
<author>ventilator@semmel.ch</author>
<pubDate>Wed, 22 Nov 2006 21:23:17 +0100</pubDate>
<enclosure url="http://www.semmel.ch/podcast/Podcast-Folge-001.mp3" length="2307405" type="audio/mpeg"/>
<guid isPermaLink="false">Venty-001</guid>
<itunes:explicit>no</itunes:explicit>
</item>
<link href="{{ baseurl }}{{ search }}/" /> <link href="{{ baseurl }}{{ search }}/" />
<link href="{{ baseurl }}podcast-he.xml" rel="self" /> <link href="{{ baseurl }}podcast-he.xml" rel="self" />
<author> <author>