diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile index 00be903..b6e4d3d 100644 --- a/homepage/redesign2018/markdownExperiment/Makefile +++ b/homepage/redesign2018/markdownExperiment/Makefile @@ -82,11 +82,11 @@ upload: $(uploadMarker) build/.uploadMarker/%.php: build/%.php mkdir -p build/.uploadMarker - curl \ - --upload-file $^ \ - --user cwsvjudo:Dee4oquu \ - ftp://cwsvjudo.square7.net/pages/responsive/$(patsubst build/%.php,%.php,$^) \ - --ftp-create-dirs +# curl \ +# --upload-file $^ \ +# --user cwsvjudo:Dee4oquu \ +# ftp://cwsvjudo.square7.net/pages/responsive/$(patsubst build/%.php,%.php,$^) \ +# --ftp-create-dirs curl \ --upload-file $^ \ --user cwsvjudo:***REMOVED*** \ @@ -97,11 +97,11 @@ build/.uploadMarker/%.php: build/%.php build/.uploadMarker/amp/%.php: build/amp/%.php mkdir -p build/.uploadMarker/amp - curl \ - --upload-file $^ \ - --user cwsvjudo:Dee4oquu \ - ftp://cwsvjudo.square7.net/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \ - --ftp-create-dirs +# curl \ +# --upload-file $^ \ +# --user cwsvjudo:Dee4oquu \ +# ftp://cwsvjudo.square7.net/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \ +# --ftp-create-dirs curl \ --upload-file $^ \ --user cwsvjudo:***REMOVED*** \ @@ -113,11 +113,11 @@ build/.uploadMarker/amp/%.php: build/amp/%.php build/.uploadMarker/phpLib/%.php: phpLib/%.php mkdir -p build/.uploadMarker/phpLib/cwsvJudo mkdir -p build/.uploadMarker/phpLib/phpcount - curl \ - --upload-file $^ \ - --user cwsvjudo:Dee4oquu \ - ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%.php,%.php,$^) \ - --ftp-create-dirs +# curl \ +# --upload-file $^ \ +# --user cwsvjudo:Dee4oquu \ +# ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%.php,%.php,$^) \ +# --ftp-create-dirs curl \ --upload-file $^ \ --user cwsvjudo:***REMOVED*** \ @@ -127,11 +127,11 @@ build/.uploadMarker/phpLib/%.php: phpLib/%.php build/.uploadMarker/css/%.css: build/css/%.css mkdir -p build/.uploadMarker/css - curl \ - --upload-file $^ \ - --user cwsvjudo:Dee4oquu \ - ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%,%,$^) \ - --ftp-create-dirs +# curl \ +# --upload-file $^ \ +# --user cwsvjudo:Dee4oquu \ +# ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%,%,$^) \ +# --ftp-create-dirs curl \ --upload-file $^ \ --user cwsvjudo:***REMOVED*** \ diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css index ebf4d44..f09eeec 100644 --- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css +++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css @@ -3,6 +3,7 @@ */ @font-face { font-family: Orbitron-Medium; + font-display: fallback; src: url(http://cwsvjudo.bplaced.net/ressourcen/fonts/Orbitron-Medium.otf); } diff --git a/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py b/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py index 62f417d..c529732 100644 --- a/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py +++ b/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py @@ -63,6 +63,7 @@ if __name__ == "__main__": video_file_path = sys.argv[1] durationInSec = duration(video_file_path) - rateInKbPerSec = (10 * 1024 * 1024 * 8)/( durationInSec * 1000 ) +# rateInKbPerSec = (10 * 1024 * 1024 * 8)/( durationInSec * 1000 ) + rateInKbPerSec = (10 * 1000 * 1000 * 8)/( durationInSec * 1000 ) #print( duration(video_file_path) ) # 10.008 print( int(min(500, rateInKbPerSec)) )