From 9c9f4f9a6843e323ad7a3ea844ed86642a9c076c Mon Sep 17 00:00:00 2001 From: marko Date: Sat, 11 Feb 2023 11:39:08 +0100 Subject: [PATCH] minor adjustment news layout, keep secrets out of commited files --- homepage/cwsvJudo/.gitignore | 3 + homepage/cwsvJudo/Makefile | 32 ++---- homepage/cwsvJudo/Makefile.local.template | 2 + .../cwsvJudo/src/css/cwsvJudo-2018-news.css | 101 +++++++++--------- 4 files changed, 68 insertions(+), 70 deletions(-) create mode 100644 homepage/cwsvJudo/Makefile.local.template diff --git a/homepage/cwsvJudo/.gitignore b/homepage/cwsvJudo/.gitignore index 5ba50b7..be243a0 100644 --- a/homepage/cwsvJudo/.gitignore +++ b/homepage/cwsvJudo/.gitignore @@ -1,2 +1,5 @@ build/* temp/* + +# don't commit any secrets +Makefile.local \ No newline at end of file diff --git a/homepage/cwsvJudo/Makefile b/homepage/cwsvJudo/Makefile index 958e9c9..a2671fb 100644 --- a/homepage/cwsvJudo/Makefile +++ b/homepage/cwsvJudo/Makefile @@ -1,3 +1,7 @@ +include Makefile.local + +CSSO = node_modules/csso-cli/bin/csso + RES_LIST = 64 128 256 512 cssFiles = $(wildcard src/css/*.css) @@ -46,7 +50,7 @@ build/css/cwsvJudo.css: $(cssFiles) # cat $^ > $@ # cat $(cssFiles) | cleancss -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 mkdir -p build @@ -84,7 +88,7 @@ build/.uploadMarker/%.php: build/%.php mkdir -p build/.uploadMarker curl \ --upload-file $^ \ - --user cwsvjudo:kodokan \ + --user $(ftpUser):$(ftpPassword) \ ftp://cwsvjudo.bplaced.net/www/pages/responsive/$(patsubst build/%.php,%.php,$^) \ --ftp-create-dirs touch $@ @@ -94,7 +98,7 @@ build/.uploadMarker/amp/%.php: build/amp/%.php mkdir -p build/.uploadMarker/amp curl \ --upload-file $^ \ - --user cwsvjudo:kodokan \ + --user $(ftpUser):$(ftpPassword) \ ftp://cwsvjudo.bplaced.net/www/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \ --ftp-create-dirs touch $@ @@ -105,7 +109,7 @@ build/.uploadMarker/phpLib/%.php: phpLib/%.php mkdir -p build/.uploadMarker/phpLib/phpcount curl \ --upload-file $^ \ - --user cwsvjudo:kodokan \ + --user $(ftpUser):$(ftpPassword) \ ftp://cwsvjudo.bplaced.net/www/ressourcen/$(patsubst build/%.php,%.php,$^) \ --ftp-create-dirs touch $@ @@ -114,15 +118,7 @@ build/.uploadMarker/css/%.css: build/css/%.css mkdir -p build/.uploadMarker/css curl \ --upload-file $^ \ -<<<<<<< HEAD - --user cwsvjudo:kodokan \ -======= -<<<<<<< HEAD - --user cwsvjudo:***REMOVED*** \ -======= - --user cwsvjudo:kodokan \ ->>>>>>> master ->>>>>>> master + --user $(ftpUser):$(ftpPassword) \ ftp://cwsvjudo.bplaced.net/www/ressourcen/$(patsubst build/%,%,$^) \ --ftp-create-dirs touch $@ @@ -132,15 +128,7 @@ build/.uploadMarker/config/%: config/% mkdir -p build/.uploadMarker/config curl \ --upload-file $^ \ -<<<<<<< HEAD - --user cwsvjudo:kodokan \ -======= -<<<<<<< HEAD - --user cwsvjudo:***REMOVED*** \ -======= - --user cwsvjudo:kodokan \ ->>>>>>> master ->>>>>>> master + --user $(ftpUser):$(ftpPassword) \ ftp://cwsvjudo.bplaced.net/www/$(patsubst build/%,%,$^) \ --ftp-create-dirs touch $@ diff --git a/homepage/cwsvJudo/Makefile.local.template b/homepage/cwsvJudo/Makefile.local.template new file mode 100644 index 0000000..c9f24ab --- /dev/null +++ b/homepage/cwsvJudo/Makefile.local.template @@ -0,0 +1,2 @@ +ftpUser = cwsvjudo +ftpPassword = *** diff --git a/homepage/cwsvJudo/src/css/cwsvJudo-2018-news.css b/homepage/cwsvJudo/src/css/cwsvJudo-2018-news.css index 3f72c6b..29d2c84 100644 --- a/homepage/cwsvJudo/src/css/cwsvJudo-2018-news.css +++ b/homepage/cwsvJudo/src/css/cwsvJudo-2018-news.css @@ -1,74 +1,79 @@ -.newsArtikel{ - width: 100%; - background-color: #FFAE00; - box-shadow: 0 1px 2px 0 rgba(0,0,0,.5); - display: flex; - flex-direction: column; +.newsArtikel { + width: 100%; + background-color: #ffae00; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5); + display: flex; + flex-direction: column; } -.newsHeader{ - display: flex; - align-items: stretch; - justify-content: space-between; - background-color: #FF8100; +.newsHeader { + display: flex; + align-items: stretch; + justify-content: space-between; + background-color: #ff8100; } -.newsDatum{ - white-space: nowrap; - align-self: center; +.newsDatum { + white-space: nowrap; + align-self: center; } -.newsBetreff{ - margin: auto; - margin: auto; - margin-left: 1vw; - margin-right: 1vw; - text-align: end; - flex-grow: 1; +.newsBetreff { + margin: auto; + margin: auto; + margin-left: 1vw; + margin-right: 1vw; + text-align: end; + flex-grow: 1; } -.newsBody{ - display: flex; - flex-direction: column; - align-items: center; +.newsBody { + display: flex; + flex-direction: column; + align-items: center; } -.newsBody > img{ - flex: 1; +.newsBody > img { + flex: 1; } @media (min-width: 1280px) { - .newsBody{ - flex-direction: row; - } + .newsBody { + flex-direction: row; + } } -.newsPromoImage{ -/* +.newsPromoImage { + width: 33%; + /* * float: left; */ } -.newsText{ - flex: 3; - margin: 1vw; +.newsText { + flex: 3; + margin: 1vw; } .newsText a { - float: none; + float: none; } .newsText amp-img, -.newsText img{ - max-width: 100%; - height: auto; - display: block; - margin: auto; - box-shadow: 0 1px 2px 0 rgba(0,0,0,.5); +.newsText img { + max-width: 100%; + height: auto; + display: block; + margin: auto; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5); +} +.newsText video { + width: 100%; + height: auto; } .newsText video, -.newsText amp-video{ - max-width: 100%; +.newsText amp-video { + max-width: 100%; } -.newsFooter{ - background-color: #FF8100; +.newsFooter { + background-color: #ff8100; } -.newsAutor::before{ - content: "Msg\0000a0"; +.newsAutor::before { + content: "Msg\0000a0"; }