From 5249c1d5fac6a602d90e578e132ab4e155f3d663 Mon Sep 17 00:00:00 2001 From: myncke Date: Sat, 27 Aug 2016 00:36:10 +0200 Subject: [PATCH 1/6] first iteration event preview --- .../assets/stylesheets/includes/events.scss | 64 ++++++++++++++++++- content/events.erb | 44 +++++++++---- content/events/15-16/awk.md | 1 + 3 files changed, 96 insertions(+), 13 deletions(-) diff --git a/content/assets/stylesheets/includes/events.scss b/content/assets/stylesheets/includes/events.scss index f49e964..b517c6a 100644 --- a/content/assets/stylesheets/includes/events.scss +++ b/content/assets/stylesheets/includes/events.scss @@ -1,3 +1,63 @@ -.subevent { - margin-left: 20px; +.box.event-preview { + border-radius: 0px; + display: flex; + align-items: center; + box-shadow : none; + margin-bottom: 0px; + + border-top: 1px solid lighten(gray, 15%); + + .image-holder { + border-radius: 50%; + padding: 10px; + border: 1px solid lighten(gray, 30%); + width: 15%; + height: 15%; + } + + .image { + border-radius: 50%; + vertical-align: middle; + border: 1px solid gray; + } + + .info { + margin: 1.5em; + box-shadow : none; + + .title { + font-size: 1.7em; + font-weight: 500; + margin-bottom: 0; + a { + color: darken(gray, 20%); + } + a:hover { + border-bottom: none; + color: #FF7F00; + } + } + + .location { + font-size: .9em; + a { + color: lighten(gray, 10%); + } + } + + .description { + font-size: 1.7em; + font-weight: 200; + color: #FF7F00; + } + + .time { + font-size: 1.6em; + font-weight: 400; + } + + .subevent { + margin-left: 20px; + } + } } diff --git a/content/events.erb b/content/events.erb index 107c531..b91e179 100644 --- a/content/events.erb +++ b/content/events.erb @@ -9,17 +9,39 @@ title: Events <% all_events.each do |event| %> -
- - <%= event[:title] %> - - <% sub_events(event).each do |sub_event| %> -
- - <%= sub_event[:title] %> - +
+
+ +
+ +
+
+ + <%= event[:title] %> + +
+
+ + <%= event[:location] %> + +
+ +
+ <%= event[:description] %> +
+ +
+ <%= event[:time] %> +
+ + <% sub_events(event).each do |sub_event| %> +
+ + <%= sub_event[:title] %> + +
+ <% end %> +
- <% end %> -
<% end %>
diff --git a/content/events/15-16/awk.md b/content/events/15-16/awk.md index 3a49a7a..825debd 100644 --- a/content/events/15-16/awk.md +++ b/content/events/15-16/awk.md @@ -4,6 +4,7 @@ banner: https://zeus.ugent.be/wp-content/uploads/2016/02/awkles-768x1007.jpg created_at: 01-02-2016 time: 23-02-2016 location: Auditorium A1, Campus Sterre, Gebouw S9 +description: Dit is een description van het awk event! --- Op **dinsdag 23 februari 18:00** (na de les Scriptingtalen) in **Auditorium A1** organiseren we een **AWK-les** gegeven door **professor Peter Dawyndt**. From 8b56070d1f6b3360b9987cc4266abf2764e46e89 Mon Sep 17 00:00:00 2001 From: myncke Date: Sat, 27 Aug 2016 00:38:12 +0200 Subject: [PATCH 2/6] httpS --- content/events.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/events.erb b/content/events.erb index b91e179..32523a9 100644 --- a/content/events.erb +++ b/content/events.erb @@ -11,7 +11,7 @@ title: Events <% all_events.each do |event| %>
- +
From cdb214cc236410f281739f3c5389f01fc9e9c985 Mon Sep 17 00:00:00 2001 From: myncke Date: Sat, 27 Aug 2016 01:23:22 +0200 Subject: [PATCH 3/6] unsure about divider --- content/assets/stylesheets/includes/events.scss | 11 ++++++++++- content/events.erb | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/content/assets/stylesheets/includes/events.scss b/content/assets/stylesheets/includes/events.scss index b517c6a..38b79e1 100644 --- a/content/assets/stylesheets/includes/events.scss +++ b/content/assets/stylesheets/includes/events.scss @@ -1,3 +1,10 @@ +.divider { + align-items:flex-start; + border: 1px solid lighten(gray, 45%); + width: 67%; + margin: 0 30% 0 3%; +} + .box.event-preview { border-radius: 0px; display: flex; @@ -5,7 +12,9 @@ box-shadow : none; margin-bottom: 0px; - border-top: 1px solid lighten(gray, 15%); + // border-top: 1px solid lighten(gray, 40%); + + .image-holder { border-radius: 50%; diff --git a/content/events.erb b/content/events.erb index 32523a9..3680e46 100644 --- a/content/events.erb +++ b/content/events.erb @@ -9,6 +9,7 @@ title: Events
<% all_events.each do |event| %> +
From 7d74313176e9886da00f765754ef823ec8ac2e1f Mon Sep 17 00:00:00 2001 From: myncke Date: Sat, 27 Aug 2016 03:50:40 +0200 Subject: [PATCH 4/6] partial event preview --- content/events.erb | 41 ++++-------------------- content/events/15-16/bottlebats/intro.md | 1 + layouts/partials/_event_preview.erb | 34 ++++++++++++++++++++ 3 files changed, 42 insertions(+), 34 deletions(-) create mode 100644 layouts/partials/_event_preview.erb diff --git a/content/events.erb b/content/events.erb index 3680e46..9fd8f3c 100644 --- a/content/events.erb +++ b/content/events.erb @@ -10,39 +10,12 @@ title: Events <% all_events.each do |event| %> -
-
- -
- -
-
- - <%= event[:title] %> - -
-
- - <%= event[:location] %> - -
- -
- <%= event[:description] %> -
- -
- <%= event[:time] %> -
- - <% sub_events(event).each do |sub_event| %> -
- - <%= sub_event[:title] %> - -
- <% end %> -
-
+ <% if (sub_events(event)).empty? %> + <%= render '/partials/_event_preview.*', event: event %> + <% else %> + <% sub_events(event).each do |sub_event| %> + <%= render '/partials/_event_preview.*', event: sub_event %> + <% end %> + <% end %> <% end %>
diff --git a/content/events/15-16/bottlebats/intro.md b/content/events/15-16/bottlebats/intro.md index e610340..c410563 100644 --- a/content/events/15-16/bottlebats/intro.md +++ b/content/events/15-16/bottlebats/intro.md @@ -2,4 +2,5 @@ title: Bottle Bats Introductie time: 12-3-16 location: Grace Hopper +description: Dit is een description! --- diff --git a/layouts/partials/_event_preview.erb b/layouts/partials/_event_preview.erb new file mode 100644 index 0000000..f88d0c5 --- /dev/null +++ b/layouts/partials/_event_preview.erb @@ -0,0 +1,34 @@ +
+
+ +
+ +
+
+ + <%= @event[:title] %> + +
+
+ + <%= event[:location] %> + +
+ +
+ <%= event[:description] %> +
+ +
+ <%= event[:time] %> +
+ + <% sub_events(event).each do |sub_event| %> +
+ + <%= sub_event[:title] %> + +
+ <% end %> +
+
From 5fb12c99fc6b8773275bf5213ae373829e66a674 Mon Sep 17 00:00:00 2001 From: myncke Date: Sat, 27 Aug 2016 04:26:18 +0200 Subject: [PATCH 5/6] potentiele oplossing grouped events --- .../assets/stylesheets/includes/events.scss | 18 +++++++++++-- content/events.erb | 2 +- content/events/15-16/bottlebats/test.md | 6 +++++ layouts/partials/_event_preview.erb | 27 ++++++++++++------- 4 files changed, 41 insertions(+), 12 deletions(-) create mode 100644 content/events/15-16/bottlebats/test.md diff --git a/content/assets/stylesheets/includes/events.scss b/content/assets/stylesheets/includes/events.scss index 38b79e1..93e93df 100644 --- a/content/assets/stylesheets/includes/events.scss +++ b/content/assets/stylesheets/includes/events.scss @@ -33,6 +33,7 @@ .info { margin: 1.5em; box-shadow : none; + width: 60%; .title { font-size: 1.7em; @@ -64,9 +65,22 @@ font-size: 1.6em; font-weight: 400; } + } - .subevent { - margin-left: 20px; + .main-event { + border-left: 1px solid gray; + border-radius: 0px; + box-shadow: none; + height: 8em; + // display: flex; + // align-items: center; + + ul { + padding-left: .7em; + } + + .active { + color: #FF7F00; } } } diff --git a/content/events.erb b/content/events.erb index 9fd8f3c..01c0757 100644 --- a/content/events.erb +++ b/content/events.erb @@ -14,7 +14,7 @@ title: Events <%= render '/partials/_event_preview.*', event: event %> <% else %> <% sub_events(event).each do |sub_event| %> - <%= render '/partials/_event_preview.*', event: sub_event %> + <%= render '/partials/_event_preview.*', event: sub_event, main_event: event %> <% end %> <% end %> <% end %> diff --git a/content/events/15-16/bottlebats/test.md b/content/events/15-16/bottlebats/test.md new file mode 100644 index 0000000..9c05546 --- /dev/null +++ b/content/events/15-16/bottlebats/test.md @@ -0,0 +1,6 @@ +--- +title: test +time: 12-3-16 +location: Grace Hopper +description: Dit is een description! +--- diff --git a/layouts/partials/_event_preview.erb b/layouts/partials/_event_preview.erb index f88d0c5..7f35574 100644 --- a/layouts/partials/_event_preview.erb +++ b/layouts/partials/_event_preview.erb @@ -5,8 +5,8 @@
- - <%= @event[:title] %> + + <%= event[:title] %>
@@ -23,12 +23,21 @@ <%= event[:time] %>
- <% sub_events(event).each do |sub_event| %> -
- - <%= sub_event[:title] %> - -
- <% end %>
+ + <% if @main_event %> +
+

+ <%= main_event[:title] %> +

+ +
    + <% sub_events(main_event).each do |sub_event| %> +
  • " > + <%= sub_event[:title] %> +
    • + <% end %> +
+
+ <% end %>
From 875d2c6321083e374ede7b06f1aa88afb2a88905 Mon Sep 17 00:00:00 2001 From: myncke Date: Sat, 27 Aug 2016 04:31:55 +0200 Subject: [PATCH 6/6] spaces --- content/assets/stylesheets/includes/events.scss | 2 -- layouts/partials/_event_preview.erb | 10 +++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/content/assets/stylesheets/includes/events.scss b/content/assets/stylesheets/includes/events.scss index 93e93df..86462ab 100644 --- a/content/assets/stylesheets/includes/events.scss +++ b/content/assets/stylesheets/includes/events.scss @@ -14,8 +14,6 @@ // border-top: 1px solid lighten(gray, 40%); - - .image-holder { border-radius: 50%; padding: 10px; diff --git a/layouts/partials/_event_preview.erb b/layouts/partials/_event_preview.erb index 7f35574..dc3f208 100644 --- a/layouts/partials/_event_preview.erb +++ b/layouts/partials/_event_preview.erb @@ -14,15 +14,12 @@ <%= event[:location] %>
-
<%= event[:description] %>
-
<%= event[:time] %>
- <% if @main_event %> @@ -30,12 +27,11 @@

<%= main_event[:title] %>

-