jannik/web-jbeyerstedt
1
0
Fork 0
Code Releases Activity

[CSS, SITE] migrate to bootstrap v4-beta

Browse source
This commit is contained in:
Jannik Beyerstedt 2017-08-19 01:35:03 +02:00
parent f30049a8ac
commit a59227a733
31 changed files with 208 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

6
site/config/config.php
View file

@ -1,6 +1,6 @@
<?php
if(!function_exists('panel')) {
header("Content-Security-Policy: default-src 'self'; style-src 'self' 'nonce-nRfqpuKWNuYyUAFPTr6WVNZk9' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; frame-src https://www.youtube-nocookie.com; script-src 'self' 'unsafe-eval' 'nonce-nRfqpuKWNuYyUAFPTr6WVNZk9' 'unsafe-inline' https://jannikb.aquila.uberspace.de/piwik/; img-src 'self' https://jannikb.aquila.uberspace.de/piwik/");
header("Content-Security-Policy: default-src 'self'; style-src 'self' 'nonce-nRfqpuKWNuYyUAFPTr6WVNZk9' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; frame-src https://www.youtube-nocookie.com; script-src 'self' 'unsafe-eval' 'nonce-nRfqpuKWNuYyUAFPTr6WVNZk9' 'unsafe-inline' https://jannikb.aquila.uberspace.de/piwik/; img-src 'self' data: https://jannikb.aquila.uberspace.de/piwik/");
}
//header("X-Content-Type-Options: nosniff"); // enabled at server-side
//header("X-Frame-Options: deny"); // enabled at server-side
@ -45,8 +45,8 @@ c::set('plg_masonry.dir', 'asc'); // sortBy direction: asc, desc
c::set('plg_masonry.lightbox', 'swipebox');
// bastians columns.php plugin from https://github.com/getkirby/plugins/tree/master/columns
c::set('columns.container', 'row');
c::set('columns.item', 'col-sm-6 columns');
//c::set('columns.container', 'row');
//c::set('columns.item', 'col-sm-6 columns');
// enhanced sitemap by Jannik Beyerstedt:
c::set('smap_ignoreSite', array('sitemap', 'error', 'home', 'qr', 'secret', 'test'));

6
site/snippets/base/cont-footer.php
View file

@ -9,15 +9,15 @@
<footer class="section">
<div class="container">
<div class="row">
<div class="col-4 col-xxs-12">
<div class="col-sm-4 col-12">
<?php echo $site->footer_left()->kirbytext(); ?>
</div>
<div class="col-4 col-xxs-12 center">
<div class="col-sm-4 col-12 text-sm-center">
<?php echo $site->footer_center()->kirbytext(); ?>
</div>
<div class="col-4 col-xxs-12 right">
<div class="col-sm-4 col-12 text-sm-right">
<a href="https://github.com/jbeyerstedt"><img src="<?php echo $site->url()?>/assets/images/githubicon.png" alt="github icon"></a>
<img src="<?php echo $site->url()?>/assets/images/html5icon.png" alt="html5 icon">
<img src="<?php echo $site->url()?>/assets/images/css3icon.png" alt="css3 icon">

4
site/snippets/base/cont-header.php
View file

@ -21,7 +21,7 @@ if ($page->depth() == 1) {
?>
<input type="checkbox" id="nav-trigger" class="nav-trigger" />
<label class="hidden-sm-up" for="nav-trigger">Menü</label>
<label class="d-sm-none" for="nav-trigger">Menü</label>
<nav class="mobile">
<ul class="nav mobileNav">
@ -50,7 +50,7 @@ if ($page->depth() == 1) {
<?php endif; ?>
<nav aria-hidden="true">
<ul class="nav hidden-xs-down">
<ul class="nav d-none d-sm-block">
<?php if(!$subnav) : ?>
<?php foreach ($site->children()->visible() as $p) : ?>
<a href="<?php echo $p->url()?>" <?php echo ($page == $p || $page->parent() == $p)?'class="active"':'' ?>><li><?php echo $p->title() ?></li></a>

4
site/snippets/base/html-head.php
View file

@ -26,9 +26,9 @@ if( $page->isHomePage() ) {
<meta name="robots" content="<?php echo $page->meta_robots()->html() ?>">
<?php endif; ?>
<?php echo css('assets/css/foundation.css') ?>
<?php echo css('assets/css/foundation.css?v2') ?>
<?php echo css('assets/css/main.css') ?>
<?php echo css('assets/css/main.css?v2') ?>
<?php echo css('@auto') ?>

10
site/snippets/plg-carousel.php
View file

@ -49,8 +49,14 @@ if (!(false==$carouselFolder) && ($carouselFolder->hasImages())) : echo $preNorm
</div>
<?php endforeach ?>
</div>
<a class="left carousel-control" href="#myCarousel" data-slide="prev"><span class="glyphicon glyphicon-chevron-left"></span></a>
<a class="right carousel-control" href="#myCarousel" data-slide="next"><span class="glyphicon glyphicon-chevron-right"></span></a>
<a class="carousel-control-prev" href="#myCarousel" role="button" data-slide="prev">
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="carousel-control-next" href="#myCarousel" role="button" data-slide="next">
<span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
</div>
<?php else : echo $preAlt ?>

6
site/templates/projects.php
View file

@ -25,7 +25,7 @@ snippet('base/cont-header');
<?php if ($img = $c->images()->find($c->exrpt_img())) {
echo ThumbExt($img, ['width'=>400,'quality'=>70,'class'=>"card-img-top",'inline-size'=>false]);
} ?>
<div class="card-block">
<div class="card-body">
<h5 class="card-title"><?php echo $c->title()->html(); ?></h5>
<p class="card-text"><?php echo $c->exrpt_text()->kirbytext(); ?></p>
<a href="<?php echo $c->url(); ?>" class="card-link">mehr</a>
@ -33,8 +33,8 @@ snippet('base/cont-header');
</a>
</div></div>
<?php
echo ($i%2 == 0)?'<div class="clearfix hidden-lg-up"></div>':'';
echo ($i%4 == 0)?'<div class="clearfix hidden-md-down"></div>':''
echo ($i%2 == 0)?'<div class="clearfix d-block d-lg-none"></div>':'';
echo ($i%4 == 0)?'<div class="clearfix d-none d-lg-block"></div>':''
?>
<?php endforeach; ?>
</div></div>

4
site/templates/webdesign.php
View file

@ -16,11 +16,11 @@ snippet('base/cont-header');
<div class="container">
<div class="row featurette">
<div class="col-sm-9">
<div class="col-sm-9 col-12">
<h2 class="featurette-heading"><?php echo $page->featurette_headline()->html() ?></h2>
<p class="lead"><?php echo $page->featurette_text()->kirbytextRaw() ?></p>
</div>
<div class="col-sm-3">
<div class="col-sm-3 col-12">
<?php if ($img = $page->images()->find($page->featurette_img())) {
echo ThumbExt($img, ['width'=>235,'quality'=>70,'class'=>"img-fluid rounded",'alt'=>"Portrait",'inline-size'=>false]);
}?>