From 95c55691c1dc4c135bb66804c25a40c3acf1b0ed Mon Sep 17 00:00:00 2001 From: marko Date: Sun, 8 Jul 2018 20:33:17 +0200 Subject: [PATCH] =?UTF-8?q?-=20Zitat=20in=20den=20Header=20geholt=20-=20cs?= =?UTF-8?q?s=20etwas=20aufger=C3=A4umt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit geändert: Makefile geändert: css/cwsvJudo-2018-header.css geändert: css/cwsvJudo-2018-wkKalender.css geändert: css/cwsvJudo-2018.css geändert: pandocTemplate/cwsvJudo.html5.pandocTemplate geändert: phpLib/cwsvJudo/miscAssis.php geändert: phpLib/cwsvJudo/wkKalender.php --- .../redesign2018/markdownExperiment/Makefile | 2 +- .../css/cwsvJudo-2018-header.css | 17 +++++++++++++---- .../css/cwsvJudo-2018-wkKalender.css | 4 ---- .../markdownExperiment/css/cwsvJudo-2018.css | 6 +++++- .../cwsvJudo.html5.pandocTemplate | 8 ++++---- .../phpLib/cwsvJudo/miscAssis.php | 16 ++++++++++++++++ .../phpLib/cwsvJudo/wkKalender.php | 3 +-- 7 files changed, 40 insertions(+), 16 deletions(-) diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile index ceb16a8..f38968b 100644 --- a/homepage/redesign2018/markdownExperiment/Makefile +++ b/homepage/redesign2018/markdownExperiment/Makefile @@ -47,7 +47,7 @@ build/css/cwsvJudo.css: $(cssFiles) mkdir -p $(dir $@) # cat $(cssFiles) > $@ # cat $(cssFiles) | cleancss -o $@ - cat $^ | csso -o $@ + cat $^ | ./node_modules/.bin/csso -o $@ build/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate mkdir -p build diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-header.css b/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-header.css index d313d20..c6b7edd 100644 --- a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-header.css +++ b/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-header.css @@ -8,7 +8,6 @@ flex-direction: row; font-family: "Orbitron-Medium", Impact, Charcoal, sans-serif; font-size: 1.5em; -/* align-items: stretch;*/ align-items: center; text-align: center; background-color: #FF8100; @@ -30,19 +29,22 @@ padding-top: .2em;/* wg. Orbitron */ } +.cwsvHeader > span:first-of-type > span:nth-child(2){ + font-size: .5em; +} /* \0000a0 ist unicode für   * \00202F ist unicode für  */ -.cwsvHeader > span:first-of-type::before{ +.cwsvHeader > span:first-of-type > span:first-of-type::before{ content: 'CWSV\0000a0e.\00202FV. - '; } @media (min-width: 640px){ - .cwsvHeader > span:first-of-type::before{ + .cwsvHeader > span:first-of-type > span:first-of-type::before{ content: 'Chemnitzer WSV\0000a0e.\00202FV. - '; } } @media (min-width: 1280px){ - .cwsvHeader > span:first-of-type::before{ + .cwsvHeader > span:first-of-type > span:first-of-type::before{ content: 'Chemnitzer Freizeit- und Wohngebietssportverein\0000a0e.\00202FV. - '; } } @@ -53,3 +55,10 @@ display: initial; } } + +.cwsvHeader > span:first-of-type{ + display: flex; + flex-direction: column; + align-items: flex-start; + text-align: start; +} diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-wkKalender.css b/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-wkKalender.css index 9f88d8c..46d879c 100644 --- a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-wkKalender.css +++ b/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-wkKalender.css @@ -327,10 +327,6 @@ } -.displayNone{ - display: none; -} - /*abgeschaut*/ .shadow-z-1 { box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 1px 2px 0 rgba(0, 0, 0, 0.24); diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018.css b/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018.css index 08eaa53..f997542 100644 --- a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018.css +++ b/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018.css @@ -160,6 +160,10 @@ body{ clear: both; } -.fontsizeXXS{ +.displayNone{ + display: none; +} + +.fontSizeXxSmall{ font-size: xx-small; } diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate index d975109..436af02 100644 --- a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate +++ b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate @@ -55,8 +55,6 @@ $endif$ $if(quotes)$ $endif$ $if(highlighting-css)$ @@ -109,8 +107,10 @@ $endfor$ title="Judo im Chemnitzer WSV" alt="Judo im Chemnitzer WSV - Promo" src="http://cwsvjudo.bplaced.net/ressourcen/graphiken/banner/bannerlogo.1.jpg" /> - Judo - + + Judo + + 0 && $str == round($str)); } +function getCwsvJudoDbConn(){ +global $cwsvJudoConfig; +// Datenbankverbindung bereit stellen + try{ + $db_connection = new PDO( + 'mysql:host='.$cwsvJudoConfig["db"]["host"].';dbname='.$cwsvJudoConfig["db"]["name"], + $cwsvJudoConfig["db"]["user"], + $cwsvJudoConfig["db"]["password"] + ); + } + catch(PDOException $db_error){ + echo( "Error whilst getting a dbConnection!: " . $db_error->getMessage() ); + } +return $db_connection; +} + /// Eine als String gegebene Liste kommagetrennter key=value Paare in /// ein assoziatives Array überführen function getKeyValueArray($aKeyValueStringList){ diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php index d18401f..b10df91 100644 --- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php +++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php @@ -252,7 +252,6 @@ return "}"; } - function wkTableHtml(){ global $cwsvJudoConfig; // Datenbankverbindung bereit stellen @@ -354,7 +353,7 @@ function wkTableHtml(){ $siteData['mainContent'] .= wkList2htmlWkTable($ergebnis); $siteData['mainContent'] .= - "
Alle Angaben ohne Gewähr! Fehler und Ergänzungen dürfen gerne gemeldet werden.
". + "
Alle Angaben ohne Gewähr! Fehler und Ergänzungen dürfen gerne gemeldet werden.
". "Link zum Archiv mit allen Ausschreibungen."; /* @todo: Wettkampfselektor wieder ergänzen