marko/cwsvJudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor adjustment news layout, keep secrets out of commited files

Browse Source
This commit is contained in:
marko
2023-02-11 11:39:08 +01:00
parent ece0ef5025
commit 9c9f4f9a68
4 changed files with 68 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
homepage/cwsvJudo/.gitignore vendored
View File

@@ -1,2 +1,5 @@
build/* build/*
temp/* temp/*
# don't commit any secrets
Makefile.local

32
homepage/cwsvJudo/Makefile
View File

@@ -1,3 +1,7 @@
include Makefile.local
CSSO = node_modules/csso-cli/bin/csso
RES_LIST = 64 128 256 512 RES_LIST = 64 128 256 512
cssFiles = $(wildcard src/css/*.css) cssFiles = $(wildcard src/css/*.css)
@@ -46,7 +50,7 @@ build/css/cwsvJudo.css: $(cssFiles)
# cat $^ > $@ # cat $^ > $@
# cat $(cssFiles) | cleancss -o $@ # cat $(cssFiles) | cleancss -o $@
# cat $^ | ./node_modules/.bin/csso -o $@ # cat $^ | ./node_modules/.bin/csso -o $@
cat $^ | csso -o $@ cat $^ | $(CSSO) -o $@
build/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate build/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate
mkdir -p build mkdir -p build
@@ -84,7 +88,7 @@ build/.uploadMarker/%.php: build/%.php
mkdir -p build/.uploadMarker mkdir -p build/.uploadMarker
curl \ curl \
--upload-file $^ \ --upload-file $^ \
--user cwsvjudo:kodokan \ --user $(ftpUser):$(ftpPassword) \
ftp://cwsvjudo.bplaced.net/www/pages/responsive/$(patsubst build/%.php,%.php,$^) \ ftp://cwsvjudo.bplaced.net/www/pages/responsive/$(patsubst build/%.php,%.php,$^) \
--ftp-create-dirs --ftp-create-dirs
touch $@ touch $@
@@ -94,7 +98,7 @@ build/.uploadMarker/amp/%.php: build/amp/%.php
mkdir -p build/.uploadMarker/amp mkdir -p build/.uploadMarker/amp
curl \ curl \
--upload-file $^ \ --upload-file $^ \
--user cwsvjudo:kodokan \ --user $(ftpUser):$(ftpPassword) \
ftp://cwsvjudo.bplaced.net/www/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \ ftp://cwsvjudo.bplaced.net/www/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \
--ftp-create-dirs --ftp-create-dirs
touch $@ touch $@
@@ -105,7 +109,7 @@ build/.uploadMarker/phpLib/%.php: phpLib/%.php
mkdir -p build/.uploadMarker/phpLib/phpcount mkdir -p build/.uploadMarker/phpLib/phpcount
curl \ curl \
--upload-file $^ \ --upload-file $^ \
--user cwsvjudo:kodokan \ --user $(ftpUser):$(ftpPassword) \
ftp://cwsvjudo.bplaced.net/www/ressourcen/$(patsubst build/%.php,%.php,$^) \ ftp://cwsvjudo.bplaced.net/www/ressourcen/$(patsubst build/%.php,%.php,$^) \
--ftp-create-dirs --ftp-create-dirs
touch $@ touch $@
@@ -114,15 +118,7 @@ build/.uploadMarker/css/%.css: build/css/%.css
mkdir -p build/.uploadMarker/css mkdir -p build/.uploadMarker/css
curl \ curl \
--upload-file $^ \ --upload-file $^ \
<<<<<<< HEAD --user $(ftpUser):$(ftpPassword) \
--user cwsvjudo:kodokan \
=======
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:kodokan \
>>>>>>> master
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/ressourcen/$(patsubst build/%,%,$^) \ ftp://cwsvjudo.bplaced.net/www/ressourcen/$(patsubst build/%,%,$^) \
--ftp-create-dirs --ftp-create-dirs
touch $@ touch $@
@@ -132,15 +128,7 @@ build/.uploadMarker/config/%: config/%
mkdir -p build/.uploadMarker/config mkdir -p build/.uploadMarker/config
curl \ curl \
--upload-file $^ \ --upload-file $^ \
<<<<<<< HEAD --user $(ftpUser):$(ftpPassword) \
--user cwsvjudo:kodokan \
=======
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:kodokan \
>>>>>>> master
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/$(patsubst build/%,%,$^) \ ftp://cwsvjudo.bplaced.net/www/$(patsubst build/%,%,$^) \
--ftp-create-dirs --ftp-create-dirs
touch $@ touch $@

2
homepage/cwsvJudo/Makefile.local.template Normal file
View File

@@ -0,0 +1,2 @@
ftpUser = cwsvjudo
ftpPassword = ***

101
homepage/cwsvJudo/src/css/cwsvJudo-2018-news.css
View File

@@ -1,74 +1,79 @@
.newsArtikel{ .newsArtikel {
width: 100%; width: 100%;
background-color: #FFAE00; background-color: #ffae00;
box-shadow: 0 1px 2px 0 rgba(0,0,0,.5); box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.newsHeader{ .newsHeader {
display: flex; display: flex;
align-items: stretch; align-items: stretch;
justify-content: space-between; justify-content: space-between;
background-color: #FF8100; background-color: #ff8100;
} }
.newsDatum{ .newsDatum {
white-space: nowrap; white-space: nowrap;
align-self: center; align-self: center;
} }
.newsBetreff{ .newsBetreff {
margin: auto; margin: auto;
margin: auto; margin: auto;
margin-left: 1vw; margin-left: 1vw;
margin-right: 1vw; margin-right: 1vw;
text-align: end; text-align: end;
flex-grow: 1; flex-grow: 1;
} }
.newsBody{ .newsBody {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.newsBody > img{ .newsBody > img {
flex: 1; flex: 1;
} }
@media (min-width: 1280px) { @media (min-width: 1280px) {
.newsBody{ .newsBody {
flex-direction: row; flex-direction: row;
} }
} }
.newsPromoImage{ .newsPromoImage {
/* width: 33%;
/*
* float: left; * float: left;
*/ */
} }
.newsText{ .newsText {
flex: 3; flex: 3;
margin: 1vw; margin: 1vw;
} }
.newsText a { .newsText a {
float: none; float: none;
} }
.newsText amp-img, .newsText amp-img,
.newsText img{ .newsText img {
max-width: 100%; max-width: 100%;
height: auto; height: auto;
display: block; display: block;
margin: auto; margin: auto;
box-shadow: 0 1px 2px 0 rgba(0,0,0,.5); box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5);
}
.newsText video {
width: 100%;
height: auto;
} }
.newsText video, .newsText video,
.newsText amp-video{ .newsText amp-video {
max-width: 100%; max-width: 100%;
} }
.newsFooter{ .newsFooter {
background-color: #FF8100; background-color: #ff8100;
} }
.newsAutor::before{ .newsAutor::before {
content: "Msg\0000a0"; content: "Msg\0000a0";
} }