From c6992b8b7c3c812d1a3a83a50fc53d4f4b1dab04 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Tue, 2 Aug 2016 19:54:18 +0200 Subject: [PATCH 1/2] various stuff --- .../assets/stylesheets/includes/cammie.scss | 58 ++++++++++++++++++ .../assets/stylesheets/includes/general.scss | 24 ++++++++ .../stylesheets/includes/variables.scss | 6 ++ content/assets/stylesheets/main.scss | 45 ++------------ content/ical.ics.erb | 1 + data/bestuur.yaml | 24 ++++++++ layouts/partials/_navbar.erb | 59 +++++++++---------- lib/helpers/data.rb | 5 ++ lib/helpers_.rb | 1 + 9 files changed, 153 insertions(+), 70 deletions(-) create mode 100644 content/assets/stylesheets/includes/cammie.scss create mode 100644 content/assets/stylesheets/includes/general.scss create mode 100644 content/assets/stylesheets/includes/variables.scss create mode 100644 data/bestuur.yaml create mode 100644 lib/helpers/data.rb diff --git a/content/assets/stylesheets/includes/cammie.scss b/content/assets/stylesheets/includes/cammie.scss new file mode 100644 index 0000000..d12944c --- /dev/null +++ b/content/assets/stylesheets/includes/cammie.scss @@ -0,0 +1,58 @@ +#cammie { + object-fit: contain; + max-width: 100%; + height: auto; +} + +.fullpage { + min-width: 100%; + min-height: 100%; + display: flex; + flex-direction: column; + justify-content: center; + background-color: black; +} + +.ctrl { + background-color: $cammie-controls-color; + color: white; + position: absolute; + z-index: 100; + + // Chevron centering + display: flex; + justify-content: center; + align-items: center; + + &:hover { + background-color: $zeus_orange; + z-index: 200; + cursor: pointer; + } +} + +#left { + height: 100%; + width: 100px; + top: 0; + left: 0; +} + +#right { + height: 100%; + width: 100px; + top: 0; + right: 0; +} + +#up { + height: 100px; + width: 100%; + top: 0; +} + +#down { + height: 100px; + width: 100%; + bottom: 0; +} diff --git a/content/assets/stylesheets/includes/general.scss b/content/assets/stylesheets/includes/general.scss new file mode 100644 index 0000000..0cd7e50 --- /dev/null +++ b/content/assets/stylesheets/includes/general.scss @@ -0,0 +1,24 @@ +img { + max-width: 200px; +} + +.fa-ul { + list-style: none !important; + + .fa { + font-size: inherit; + } +} + +#navbar { + .nav-item { + transition: 0.2s; + + font-variant: small-caps; + font-size: 1.25em; + + &:hover { + transition: 0.2s; + } + } +} diff --git a/content/assets/stylesheets/includes/variables.scss b/content/assets/stylesheets/includes/variables.scss new file mode 100644 index 0000000..10f3021 --- /dev/null +++ b/content/assets/stylesheets/includes/variables.scss @@ -0,0 +1,6 @@ +$zeus_orange: #FF7F00; +$event-padding: 10px; +$navbar-border-color: #CCC; +$event-border-color: #DDD; + +$cammie-controls-color: rgba(0, 0, 0, 0.60); diff --git a/content/assets/stylesheets/main.scss b/content/assets/stylesheets/main.scss index 864ecb7..b17fd0b 100644 --- a/content/assets/stylesheets/main.scss +++ b/content/assets/stylesheets/main.scss @@ -10,45 +10,10 @@ $family-sans-serif: 'Open Sans', sans-serif; @import "old"; @import "../../../node_modules/bulma/bulma"; -.fa-inline { - font-size: inherit; - vertical-align: inherit; +.nav-right { + flex: none; } -// Issue 27 archive list styling - -.archive_list { -list-style-type: none; -font-family: family-sans-serif; -} - -.archive_list > li { -display: inline-block; -position: relative; - -padding: 2em; -border: 2px solid darkgrey; -border-radius: 8px; - - -font-size: 2em; -font-weight:bold; -} - -.archive_list > li:hover{ - border-color: rgb(66,66,66); -} - -.archive_list > li:first-child{ - margin-left:15%; - margin-right:25%; // momenteel hard-coded, betere opl zou dynamische herberekening zijn om meer future-proof te zijn - -} - -.archive_list_ref{ - border: 2px solid darkgrey; -} - -.archive_list_item{ - font-family: family-sans-serif; -} +@import "includes/variables"; +@import "includes/cammie"; +@import "includes/general"; diff --git a/content/ical.ics.erb b/content/ical.ics.erb index 2b4d96e..16afb87 100644 --- a/content/ical.ics.erb +++ b/content/ical.ics.erb @@ -1 +1,2 @@ <%= event_calendar %> +<%= data_from "hey" %> diff --git a/data/bestuur.yaml b/data/bestuur.yaml new file mode 100644 index 0000000..de39dc2 --- /dev/null +++ b/data/bestuur.yaml @@ -0,0 +1,24 @@ +- + rol: Voorzitter + naam: Wout Schellaert + mail: voorzitter@zeus.ugent.be +- + rol: Vice-voorzitter + naam: Isaura Claeys + mail: secretaris@zeus.ugent.be +- + rol: Penningmeester + naam: Jeroen De Clerck + mail: penning@zeus.ugent.be +- + rol: Systeembeheerders + naam: Rien Maertens & Lorin Werthen + mail: admin@zeus.ugent.be +- + rol: Event manager + naam: Eloïse Piret + mail: pr@zeus.ugent.be +- + rol: Projectmanager + naam: Feliciaan De Palmenaer + mail: project@zeus.ugent.be diff --git a/layouts/partials/_navbar.erb b/layouts/partials/_navbar.erb index cc69bd0..86ac7d2 100644 --- a/layouts/partials/_navbar.erb +++ b/layouts/partials/_navbar.erb @@ -1,37 +1,36 @@ diff --git a/lib/helpers/data.rb b/lib/helpers/data.rb new file mode 100644 index 0000000..bab537c --- /dev/null +++ b/lib/helpers/data.rb @@ -0,0 +1,5 @@ +module DataHelper + def data_from(identifier) + p `ls data` + end +end diff --git a/lib/helpers_.rb b/lib/helpers_.rb index 686ba03..254700f 100644 --- a/lib/helpers_.rb +++ b/lib/helpers_.rb @@ -7,3 +7,4 @@ include Nanoc::Helpers::Text include ArchiveHelper include IcalHelper include NavigationHelper +include DataHelper From 3f8eb79ab42274ef6eb1f7e3e4e898e8697a6782 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Tue, 2 Aug 2016 20:00:52 +0200 Subject: [PATCH 2/2] fix --- Rules | 1 + content/assets/stylesheets/main.scss | 2 +- content/assets/stylesheets/old.scss | 97 ---------------------------- 3 files changed, 2 insertions(+), 98 deletions(-) delete mode 100644 content/assets/stylesheets/old.scss diff --git a/Rules b/Rules index 57e2ea8..c0b3fa7 100644 --- a/Rules +++ b/Rules @@ -114,6 +114,7 @@ compile '/assets/scripts/**/*.coffee' do filter :coffeescript end +ignore '/assets/stylesheets/includes/**' compile '/assets/stylesheets/**/*.scss' do filter :sass, syntax: :scss end diff --git a/content/assets/stylesheets/main.scss b/content/assets/stylesheets/main.scss index b17fd0b..03a8ab5 100644 --- a/content/assets/stylesheets/main.scss +++ b/content/assets/stylesheets/main.scss @@ -7,7 +7,7 @@ $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"; .nav-right { diff --git a/content/assets/stylesheets/old.scss b/content/assets/stylesheets/old.scss deleted file mode 100644 index b849cca..0000000 --- a/content/assets/stylesheets/old.scss +++ /dev/null @@ -1,97 +0,0 @@ -$zeus_orange: #FF7F00; -$event-padding: 10px; -$navbar-border-color: #CCC; -$event-border-color: #DDD; - -$cammie-controls-color: rgba(0, 0, 0, 0.60); - -img { - max-width: 200px; -} - -.fa-ul { - list-style: none !important; - - .fa { - font-size: inherit; - } -} - -.header-top { - display: flex; - justify-content: space-between; - align-items: flex-end; - -} - -#navbar { - .nav-item { - transition: 0.2s; - - font-variant: small-caps; - font-size: 1.25em; - - &:hover { - transition: 0.2s; - } - } -} - -#cammie { - object-fit: contain; - max-width: 100%; - height: auto; -} - -.fullpage { - min-width: 100%; - min-height: 100%; - display: flex; - flex-direction: column; - justify-content: center; - background-color: black; -} - -.ctrl { - background-color: $cammie-controls-color; - color: white; - position: absolute; - z-index: 100; - - // Chevron centering - display: flex; - justify-content: center; - align-items: center; - - &:hover { - background-color: $zeus_orange; - z-index: 200; - cursor: pointer; - } -} - -#left { - height: 100%; - width: 100px; - top: 0; - left: 0; -} - -#right { - height: 100%; - width: 100px; - top: 0; - right: 0; -} - -#up { - height: 100px; - width: 100%; - top: 0; -} - -#down { - height: 100px; - width: 100%; - bottom: 0; -}