Some style things and go to materialize 1.0.0-rc.1

This commit is contained in:
Leo Maroni 2018-05-03 17:49:57 +02:00
parent 687fcbeec8
commit 3b2878637d
12 changed files with 40 additions and 41 deletions

View File

@ -1,7 +1,8 @@
<header class="navbar-fixed">
<header>
<nav>
<div class="nav-wrapper">
<a href="/" class="brand-logo">Freifunk Rhein-Sieg e.V.</a>
<a href="#" data-target="nav-mobile" class="sidenav-trigger"><i class="material-icons">menu</i></a>
<ul class="right hide-on-med-and-down">
<li class="navitem"><a href="{{ site.baseurl }}{% link der-verein.html %}">Der Verein</a></li>
<li class="navitem"><a href="{{ site.baseurl }}{% link mitmachen_unterstuetzen.html %}">Mitmachen / Unterst&uuml;tzen</a></li>
@ -9,5 +10,11 @@
<li class="navitem"><a href="{{ site.baseurl }}{% link kontakt.html %}">Kontakt</a></li>
</ul>
</div>
<ul class="sidenav" id="nav-mobile">
<li class="navitem"><a href="{{ site.baseurl }}{% link der-verein.html %}">Der Verein</a></li>
<li class="navitem"><a href="{{ site.baseurl }}{% link mitmachen_unterstuetzen.html %}">Mitmachen / Unterst&uuml;tzen</a></li>
<li class="navitem"><a href="{{ site.baseurl }}{% link links.html %}">Links</a></li>
<li class="navitem"><a href="{{ site.baseurl }}{% link kontakt.html %}">Kontakt</a></li>
</ul>
</nav>
</header>

View File

@ -7,10 +7,10 @@
<title>{{ site.title }}</title>
{% feed_meta %}
<link rel="stylesheet" href='{{ "/assets/css/page.css" | relative_url }}'>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css" integrity="sha256-e22BQKCF7bb/h/4MFJ1a4lTRR2OuAe8Hxa/3tgU5Taw=" crossorigin="anonymous" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-rc.1/css/materialize.min.css" integrity="sha256-qj3p6P1fJIV+Ndv7RW1ovZI2UhOuboj9GcODzcNFIN8=" crossorigin="anonymous" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js" integrity="sha256-uWtSXRErwH9kdJTIr1swfHFJn/d/WQ6s72gELOHXQGM=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-rc.1/js/materialize.min.js" integrity="sha256-SrBfGi+Zp2LhAvy9M1bWOCXztRU9Ztztxmu5BcYPcPE=" crossorigin="anonymous"></script>
<script src="{{ '/assets/js/page.js' | relative_url }}"></script>
</head>
<body>

View File

@ -3,11 +3,11 @@
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>{{ site.title }}</title>
{% feed_meta %}
<link rel="stylesheet" href='{{ "/css/post.css" | relative_url }}'>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css" integrity="sha256-e22BQKCF7bb/h/4MFJ1a4lTRR2OuAe8Hxa/3tgU5Taw=" crossorigin="anonymous" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-rc.1/css/materialize.min.css" integrity="sha256-qj3p6P1fJIV+Ndv7RW1ovZI2UhOuboj9GcODzcNFIN8=" crossorigin="anonymous" />
<!--Icons-->
<script async defer src="https://use.fontawesome.com/releases/v5.0.8/js/all.js"></script>
@ -19,7 +19,7 @@
</main>
{% include footer.html %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js" integrity="sha256-uWtSXRErwH9kdJTIr1swfHFJn/d/WQ6s72gELOHXQGM=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-rc.1/js/materialize.min.js" integrity="sha256-SrBfGi+Zp2LhAvy9M1bWOCXztRU9Ztztxmu5BcYPcPE=" crossorigin="anonymous"></script>
<script src="{{ '/js/post.js' | relative_url }}"></script>
</body>
</html>

View File

@ -7,3 +7,11 @@ body {
main {
flex: 1 0 auto;
}
.card {
.card-action {
background-color: #212121 !important;
a {
color: $ff_yellow !important;
}
}
}

View File

@ -3,7 +3,6 @@ header {
background-color: $ff_magenta;
.nav-wrapper {
padding: 0 25px;
width: 100vw;
.brand-logo {
@media screen and (max-width: 991px){
text-align: center;

View File

@ -64,9 +64,6 @@ main {
.card-title > a {
color: $black !important;
}
.card-action > a {
color: $ff_magenta !important;
}
}
#unterstuetzer {
img {
@ -80,11 +77,6 @@ main {
color: $black !important;
}
}
.card-action {
a {
color: $ff_magenta !important;
}
}
}
}
#kontakt {

View File

@ -1,3 +1,7 @@
@import url('https://fonts.googleapis.com/css?family=Roboto:100,300,400');
body {
font-family: 'Roboto', sans-serif;
}
.thin-text {
font-weight: 100;
}

View File

@ -8,19 +8,18 @@ function getParameterByName(name, url) {
return decodeURIComponent(results[2].replace(/\+/g, " "));
}
$(function () {
const param_rcp = getParameterByName('rcp')
var param_rcp = getParameterByName('rcp');
if(param_rcp !== "" && param_rcp !== null && param_rcp !== undefined) {
const rcp_option = $('#recipient>option[value=' + param_rcp + ']');
console.log(param_rcp)
var rcp_option = $('#recipient>option[value=' + param_rcp + ']');
if(rcp_option.length === 1) {
console.log(rcp_option)
rcp_option.attr('selected', true);
$('#recipient_option_choose').removeAttr('selected');
$('select').material_select();
$('select').formSelect();
} else {
$('select').material_select();
$('select').formSelect();
}
} else {
$('select').material_select();
$('select').formSelect();
}
})
});

View File

@ -0,0 +1,5 @@
$(function () {
$('.collapsible').collapsible();
$('.sidenav').sidenav();
})

View File

@ -33,7 +33,7 @@ permalink: /der-verein/
<section class="row">
<h4>Protokolle der Mitgliedsversammlungen</h4>
<p>Hier findenst du die Protokolle der letzten Migliedsversammlungen</p>
<ul class="collapsible" data-collapsible="accordion">
<ul class="collapsible">
<li>
<div class="collapsible-header">05.03.2018 - Gr&uuml;ndrungsversammlung</div>
<div class="collapsible-body">

View File

@ -31,7 +31,7 @@ permalink: /impressum/
<br>
Registergericht: Amtsgericht Siegburg
<br>
Registernummer: VR 1234
Registernummer: VR 3592
</p>
<h4>Haftung f&uuml;r Inhalte</h4>
<p>

View File

@ -7,7 +7,7 @@ permalink: '/links/'
<div class="center">
<h2 class="thin-text">Links</h2>
</div>
<div class="col s12 m6">
<div class="col s12 m6 offset-m3">
<div class="card">
<div class="card-image">
<img src="{{ '/assets/img/page_links/link_to_firmware-downloader.png' | relative_url }}">
@ -21,19 +21,4 @@ permalink: '/links/'
</div>
</div>
</div>
<div class="col s12 m6">
<div class="card">
<div class="card-image">
<img src="{{ '/assets/img/page_links/link_to_firmware-downloader.png' | relative_url }}">
</div>
<div class="card-content">
<span class="card-title"><a target="_blank" href="#">Karte</a></span>
<p>Das ist die zentrale Karte, wo die Freifunk-Knoten der Communities angezeigt werden.</p>
</div>
<div class="card-action">
<a target="_blank" href="#">Zur Karte</a>
</div>
</div>
</div>
</section>
</div>