From 3f5b6dc6703f506bb71d2dbe2e592ba9e599b7da Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Thu, 28 Jul 2016 17:56:33 +0200 Subject: [PATCH] pushing on master --- content/assets/scripts/eventpost.coffee | 14 --- content/assets/stylesheets/main.scss | 7 ++ content/assets/stylesheets/old.scss | 125 +----------------------- layouts/eventpost.erb | 31 +++--- layouts/generic.erb | 2 +- layouts/partials/_navbar.erb | 10 +- 6 files changed, 31 insertions(+), 158 deletions(-) delete mode 100644 content/assets/scripts/eventpost.coffee diff --git a/content/assets/scripts/eventpost.coffee b/content/assets/scripts/eventpost.coffee deleted file mode 100644 index be4bf36..0000000 --- a/content/assets/scripts/eventpost.coffee +++ /dev/null @@ -1,14 +0,0 @@ -sticky_relocate = -> - window_top = $(window).scrollTop() - div_top = $('#sticky-anchor').offset().top - - if window_top > div_top - $('#sticky').addClass('stick') - $('#sticky-anchor').height($('#sticky').outerHeight()) - else - $('#sticky').removeClass('stick') - $('#sticky-anchor').height(0) - -$ -> - $(window).scroll(sticky_relocate) - sticky_relocate() diff --git a/content/assets/stylesheets/main.scss b/content/assets/stylesheets/main.scss index 0e51b5b..089c009 100644 --- a/content/assets/stylesheets/main.scss +++ b/content/assets/stylesheets/main.scss @@ -1,9 +1,16 @@ $zeus-orange: #FF7F00; + $orange: $zeus-orange; $primary: $orange; +$link-visited: $orange; @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,700); $family-sans-serif: 'Open Sans', sans-serif; @import "old"; @import "../../../node_modules/bulma/bulma"; + +.fa-inline { + font-size: inherit; + vertical-align: inherit; +} diff --git a/content/assets/stylesheets/old.scss b/content/assets/stylesheets/old.scss index 3c19a70..b849cca 100644 --- a/content/assets/stylesheets/old.scss +++ b/content/assets/stylesheets/old.scss @@ -17,26 +17,6 @@ img { } } -#logos { - display: inline-block; - color: black; - - a, a:hover, a:visited, a:link, a:active { - text-decoration: none; - color: currentColor; - } - - .logo-link { - margin-left: 10px; - transition: 0.2s; - - &:hover { - color: $zeus_orange; - transition: 0.2s; - } - } -} - .header-top { display: flex; justify-content: space-between; @@ -45,95 +25,24 @@ img { } #navbar { - a { - padding: 8px; + .nav-item { transition: 0.2s; font-variant: small-caps; font-size: 1.25em; - &, &:hover, &:visited, &:link, &:active { - text-decoration: none; - } &:hover { - background-color: $zeus_orange; transition: 0.2s; - color: white; } } } -/*#all-events { - margin-left: -10px; - margin-right: -10px; - - .event { - border: 2px solid $event-border-color; - position: relative; - - overflow: hidden; - - height: 200px; - margin: $event-padding; - - &:after { - content: '\A'; - position: absolute; - width: 100%; height:100%; - top:0; left:0; - background:rgba(0,0,0,0.6); - opacity: 0; - transition: all 0.5s; - -webkit-transition: all 0.5s; - } - &:hover:after { - opacity: 1; - } - } -}*/ - - -#event-banner { - position: fixed; - min-width: 100%; -} - -#event-description { - padding: 20px; -} - -#event-info { - padding-top: 20px; -} - -#event-content { - position: absolute; - top: 400px; - background-color: white; - height: 100vh; - - border-top: 2px solid $navbar-border-color; -} - -#event-title { - text-align: center; - font-size: 50px; - line-height: 50px; -} - -#sticky.stick { - position: fixed; - top: 0; - z-index: 10000; - width: 100%; - background-color: white; -} - #cammie { object-fit: contain; max-width: 100%; height: auto; } + .fullpage { min-width: 100%; min-height: 100%; @@ -186,33 +95,3 @@ img { width: 100%; bottom: 0; } - - -.project-card { - background-color: #2D5CB4; - color: white; - height: 300px; - - margin-top: 5px; - margin-bottom: 5px; - - display: flex; - justify-content: space-between; - - .project-title { - background: #1e3c72; /* fallback for old browsers */ - background: -webkit-linear-gradient(to left, #1e3c72 , #2a5298); /* Chrome 10-25, Safari 5.1-6 */ - background: linear-gradient(to left, #1e3c72 , #2a5298); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ - - font-size: 4em; - padding: 20px; - flex-grow: 1; - } - - .project-description { - background-color: #1e3c72; - text-align: right; - padding: 20px; - width: 700px; - } -} diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb index 18c5d08..9989788 100644 --- a/layouts/eventpost.erb +++ b/layouts/eventpost.erb @@ -5,10 +5,7 @@ <% end %> - -
+
<%= render '/partials/_navbar.*' %>
@@ -29,17 +26,21 @@
- -
- <%= yield %> -
-
-
    -
  • <%= item[:time] %>
    • -
  • <%= item[:location] %>
    • -
+ +
+
+
+
    +
  • <%= item[:time] %>
    • +
  • <%= item[:location] %>
    • +
+
+
+ +
+ <%= yield %> +
+
- - diff --git a/layouts/generic.erb b/layouts/generic.erb index d10ffd5..92a3da4 100644 --- a/layouts/generic.erb +++ b/layouts/generic.erb @@ -10,7 +10,7 @@

- Made with by Zeus WPI + Made with by Zeus WPI

diff --git a/layouts/partials/_navbar.erb b/layouts/partials/_navbar.erb index 69494d6..d856c7c 100644 --- a/layouts/partials/_navbar.erb +++ b/layouts/partials/_navbar.erb @@ -4,19 +4,19 @@ - + About - + Archief - + Projecten - + Cammie - + Zoeken