From 3b2878637d40b890e54de214e903a530dfaa65d9 Mon Sep 17 00:00:00 2001 From: Leo Maroni Date: Thu, 3 May 2018 17:49:57 +0200 Subject: [PATCH] Some style things and go to materialize 1.0.0-rc.1 --- _includes/header.html | 9 ++++++++- _layouts/page.html | 4 ++-- _layouts/post.html | 6 +++--- _scss/_general.scss | 8 ++++++++ _scss/_header.scss | 1 - _scss/_main-section.scss | 8 -------- _scss/_typography.scss | 4 ++++ assets/js/kontakt.js | 15 +++++++-------- assets/js/page.js | 5 +++++ der-verein.html | 2 +- impressum.html | 2 +- links.html | 17 +---------------- 12 files changed, 40 insertions(+), 41 deletions(-) diff --git a/_includes/header.html b/_includes/header.html index 6954c5a..c69e883 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,7 +1,8 @@ -
+
\ No newline at end of file diff --git a/_layouts/page.html b/_layouts/page.html index 7dcd895..2a46fcc 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -7,10 +7,10 @@ {{ site.title }} {% feed_meta %} - + - + diff --git a/_layouts/post.html b/_layouts/post.html index 75638d5..90424ff 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -3,11 +3,11 @@ - + {{ site.title }} {% feed_meta %} - + @@ -19,7 +19,7 @@ {% include footer.html %} - + \ No newline at end of file diff --git a/_scss/_general.scss b/_scss/_general.scss index 6e92e7b..29ea6d9 100644 --- a/_scss/_general.scss +++ b/_scss/_general.scss @@ -6,4 +6,12 @@ body { main { flex: 1 0 auto; +} +.card { + .card-action { + background-color: #212121 !important; + a { + color: $ff_yellow !important; + } + } } \ No newline at end of file diff --git a/_scss/_header.scss b/_scss/_header.scss index 7ffc5f6..87a1250 100644 --- a/_scss/_header.scss +++ b/_scss/_header.scss @@ -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; diff --git a/_scss/_main-section.scss b/_scss/_main-section.scss index 9e4f22e..ef1caf3 100644 --- a/_scss/_main-section.scss +++ b/_scss/_main-section.scss @@ -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 { diff --git a/_scss/_typography.scss b/_scss/_typography.scss index 61ad422..a2446a7 100644 --- a/_scss/_typography.scss +++ b/_scss/_typography.scss @@ -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; } diff --git a/assets/js/kontakt.js b/assets/js/kontakt.js index 5146094..8a4e485 100644 --- a/assets/js/kontakt.js +++ b/assets/js/kontakt.js @@ -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(); + } -}) \ No newline at end of file +}); \ No newline at end of file diff --git a/assets/js/page.js b/assets/js/page.js index e69de29..0089def 100644 --- a/assets/js/page.js +++ b/assets/js/page.js @@ -0,0 +1,5 @@ +$(function () { + $('.collapsible').collapsible(); + $('.sidenav').sidenav(); + +}) \ No newline at end of file diff --git a/der-verein.html b/der-verein.html index 3de081d..e2af64f 100644 --- a/der-verein.html +++ b/der-verein.html @@ -33,7 +33,7 @@ permalink: /der-verein/

Protokolle der Mitgliedsversammlungen

Hier findenst du die Protokolle der letzten Migliedsversammlungen

-
    +
    • 05.03.2018 - Gründrungsversammlung
      diff --git a/impressum.html b/impressum.html index 5bedca1..2fbc06f 100644 --- a/impressum.html +++ b/impressum.html @@ -31,7 +31,7 @@ permalink: /impressum/
      Registergericht: Amtsgericht Siegburg
      - Registernummer: VR 1234 + Registernummer: VR 3592

      Haftung für Inhalte

      diff --git a/links.html b/links.html index 061a014..6949b66 100644 --- a/links.html +++ b/links.html @@ -7,7 +7,7 @@ permalink: '/links/'

      Links

      -
      +
      @@ -21,19 +21,4 @@ permalink: '/links/'
      -
      -
      -
      - -
      -
      - Karte -

      Das ist die zentrale Karte, wo die Freifunk-Knoten der Communities angezeigt werden.

      -
      -
      - Zur Karte -
      -
      -
      -