From 5249c1d5fac6a602d90e578e132ab4e155f3d663 Mon Sep 17 00:00:00 2001 From: myncke Date: Sat, 27 Aug 2016 00:36:10 +0200 Subject: [PATCH 01/40] 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 02/40] 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 03/40] 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 04/40] 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 05/40] 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 06/40] 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] %>

- From 38f735e7afacc092f3a1c1a5a4d2b80654e761e5 Mon Sep 17 00:00:00 2001 From: David Vandorpe Date: Mon, 29 Aug 2016 00:13:02 +0200 Subject: [PATCH 07/40] Reworked cammie grid --- .../assets/stylesheets/includes/cammie.scss | 77 ++++++++++--------- content/cammie.erb | 27 +++---- 2 files changed, 50 insertions(+), 54 deletions(-) diff --git a/content/assets/stylesheets/includes/cammie.scss b/content/assets/stylesheets/includes/cammie.scss index 50a2685..8450183 100644 --- a/content/assets/stylesheets/includes/cammie.scss +++ b/content/assets/stylesheets/includes/cammie.scss @@ -20,49 +20,50 @@ position: relative; height: 100%; #cammie-body { + display: flex; + justify-content: space-between; + flex-direction: column; position: relative; height: 100%; - } - .ctrl { - background-color: $cammie-controls-color; - color: white; - z-index: 100; - position: absolute; + transition: opacity 1s ease-in-out; + opacity: 0; - // Chevron centering - display: flex; - justify-content: center; - align-items: center; + &.display { + transition: opacity .5s ease-in-out; + opacity: 1; + } - &:hover { - background-color: $zeus_orange; - z-index: 200; - cursor: pointer; + .ctrl { + + background-color: $cammie-controls-color; + color: white; + &:hover { + background-color: $zeus_orange; + cursor: pointer; + } + } + + .row { + display: flex; + justify-content: space-between; + + // Space rows + &.top-row, &.middle-row, &.bottom-row { + flex-basis: 0; + } + &.top-row, &.bottom-row { + flex-grow: 1; + } + + &.middle-row { + flex-grow: 8; + } + + // Enlarge middle column + .center { + flex-grow: 8; + } } } - - .left { - height: 100%; - width: 50px; - left: 0; - } - - .right { - height: 100%; - width: 100px; - right: 0; - } - - .up { - height: 100px; - width: 100%; - top: 0; - } - - .down { - height: 100px; - width: 100%; - bottom: 0; - } } diff --git a/content/cammie.erb b/content/cammie.erb index 0495361..4ada9f2 100644 --- a/content/cammie.erb +++ b/content/cammie.erb @@ -30,29 +30,24 @@ title: Cammie -->
-
-
-
- diag up left -
+
+
+ diag up left
-
-
- up -
+
+ up
-
-
- diag up right -
+
+ diag up right
-
+ +
left
-
home?
+
 
right
-
+
diag down left
down
diag down right
From a2c7746161e98d1fb39b9f00c7af7e51ad3ed470 Mon Sep 17 00:00:00 2001 From: David Vandorpe Date: Mon, 29 Aug 2016 00:13:12 +0200 Subject: [PATCH 08/40] Only show cammie controls when moving mouse --- content/assets/scripts/cammie.coffee | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/content/assets/scripts/cammie.coffee b/content/assets/scripts/cammie.coffee index e69de29..e245013 100644 --- a/content/assets/scripts/cammie.coffee +++ b/content/assets/scripts/cammie.coffee @@ -0,0 +1,21 @@ +# Reworked version of the underscorejs debounce +debounce = (func, wait, initial = () -> ) -> + timeout = false + () -> + context = this + args = arguments + later = () -> + timeout = null + func.apply context, args + callNow = !timeout + clearTimeout timeout + timeout = setTimeout later, wait + initial.apply context, args if callNow + +$ "#cammie-body" + .mousemove debounce () -> + $ this + .removeClass 'display' + , 3000, () -> + $ this + .addClass 'display' \ No newline at end of file From 80f1602a147c38e68112bb794b2c2b1a52b69ff8 Mon Sep 17 00:00:00 2001 From: David Vandorpe Date: Mon, 29 Aug 2016 00:43:21 +0200 Subject: [PATCH 09/40] Cammie controls --- content/assets/scripts/cammie.coffee | 13 ++++++++++++- content/cammie.erb | 26 ++++++++++++++++++-------- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/content/assets/scripts/cammie.coffee b/content/assets/scripts/cammie.coffee index e245013..4896afa 100644 --- a/content/assets/scripts/cammie.coffee +++ b/content/assets/scripts/cammie.coffee @@ -12,10 +12,21 @@ debounce = (func, wait, initial = () -> ) -> timeout = setTimeout later, wait initial.apply context, args if callNow +# Display controls when moving mouse $ "#cammie-body" .mousemove debounce () -> $ this .removeClass 'display' , 3000, () -> $ this - .addClass 'display' \ No newline at end of file + .addClass 'display' + +# Cammie controls +$ '.ctrl' + .click -> + $context = $ this + $.ajax "//kelder.zeus.ugent.be/webcam/cgi/ptdc.cgi", + data: + command: 'set_relative_pos' + posX: $context.data 'x' + posY: $context.data 'y' \ No newline at end of file diff --git a/content/cammie.erb b/content/cammie.erb index 4ada9f2..22cfd34 100644 --- a/content/cammie.erb +++ b/content/cammie.erb @@ -31,26 +31,36 @@ title: Cammie
-
+
diag up left
-
+
up
-
+
diag up right
-
left
+
+ left +
 
-
right
+
+ right +
-
diag down left
-
down
-
diag down right
+
+ diag down left +
+
+ down +
+
+ diag down right +
From 57873aeafb9e0e6259ce1d1644f4ef7bca58720a Mon Sep 17 00:00:00 2001 From: David Vandorpe Date: Mon, 29 Aug 2016 15:03:14 +0200 Subject: [PATCH 10/40] Fix up button --- content/cammie.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/cammie.erb b/content/cammie.erb index 22cfd34..2025de2 100644 --- a/content/cammie.erb +++ b/content/cammie.erb @@ -34,7 +34,7 @@ title: Cammie
diag up left
-
+
up
From dfdf87d2ac2aa52c4786a86f8e6fb13386bbbe8f Mon Sep 17 00:00:00 2001 From: David Vandorpe Date: Mon, 29 Aug 2016 15:10:08 +0200 Subject: [PATCH 11/40] Put cammie controls in separate div --- content/assets/scripts/cammie.coffee | 2 +- .../assets/stylesheets/includes/cammie.scss | 73 ++++++++++--------- content/cammie.erb | 56 +++++++------- 3 files changed, 68 insertions(+), 63 deletions(-) diff --git a/content/assets/scripts/cammie.coffee b/content/assets/scripts/cammie.coffee index 4896afa..cfb7288 100644 --- a/content/assets/scripts/cammie.coffee +++ b/content/assets/scripts/cammie.coffee @@ -13,7 +13,7 @@ debounce = (func, wait, initial = () -> ) -> initial.apply context, args if callNow # Display controls when moving mouse -$ "#cammie-body" +$ "#cammie-ctrls" .mousemove debounce () -> $ this .removeClass 'display' diff --git a/content/assets/stylesheets/includes/cammie.scss b/content/assets/stylesheets/includes/cammie.scss index 8450183..0c82ffa 100644 --- a/content/assets/stylesheets/includes/cammie.scss +++ b/content/assets/stylesheets/includes/cammie.scss @@ -20,49 +20,52 @@ position: relative; height: 100%; #cammie-body { - display: flex; - justify-content: space-between; - flex-direction: column; - position: relative; height: 100%; - - transition: opacity 1s ease-in-out; - opacity: 0; - - &.display { - transition: opacity .5s ease-in-out; - opacity: 1; - } - - .ctrl { - - background-color: $cammie-controls-color; - color: white; - &:hover { - background-color: $zeus_orange; - cursor: pointer; - } - } - - .row { + #cammie-ctrls { display: flex; justify-content: space-between; + flex-direction: column; + position: relative; + height: 100%; - // Space rows - &.top-row, &.middle-row, &.bottom-row { - flex-basis: 0; - } - &.top-row, &.bottom-row { - flex-grow: 1; + transition: opacity 1s ease-in-out; + opacity: 0; + + &.display { + transition: opacity .5s ease-in-out; + opacity: 1; } - &.middle-row { - flex-grow: 8; + .ctrl { + + background-color: $cammie-controls-color; + color: white; + &:hover { + background-color: $zeus_orange; + cursor: pointer; + } } - // Enlarge middle column - .center { - flex-grow: 8; + .row { + display: flex; + justify-content: space-between; + + // Space rows + &.top-row, &.middle-row, &.bottom-row { + flex-basis: 0; + } + &.top-row, &.bottom-row { + flex-grow: 1; + } + + &.middle-row { + flex-grow: 8; + } + + // Enlarge middle column + .center { + flex-grow: 8; + } } } } diff --git a/content/cammie.erb b/content/cammie.erb index 2025de2..96addc2 100644 --- a/content/cammie.erb +++ b/content/cammie.erb @@ -30,36 +30,38 @@ title: Cammie -->
-
-
- diag up left +
+
+
+ diag up left +
+
+ up +
+
+ diag up right +
-
- up -
-
- diag up right -
-
-
-
- left +
+
+ left +
+
 
+
+ right +
-
 
-
- right -
-
-
-
- diag down left -
-
- down -
-
- diag down right +
+
+ diag down left +
+
+ down +
+
+ diag down right +
From 5d80f013839575904cddddc8fc3ad499cf08d185 Mon Sep 17 00:00:00 2001 From: David Vandorpe Date: Mon, 29 Aug 2016 15:36:23 +0200 Subject: [PATCH 12/40] Use generic layout for cammie --- Rules | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Rules b/Rules index b894eac..80bce75 100644 --- a/Rules +++ b/Rules @@ -45,16 +45,6 @@ compile '/feed.xml' do write '/feed.xml' end -# -# CAMMIE -# -compile '/cammie.*' do - layout '/default.*' - filter :erb - - filter :relativize_paths, type: :html -end - # # ARCHIVES # From 6408c84f69d08483c085e94e856b03c095f0becf Mon Sep 17 00:00:00 2001 From: David Vandorpe Date: Mon, 29 Aug 2016 15:37:50 +0200 Subject: [PATCH 13/40] Fix cammie feed --- content/assets/stylesheets/includes/cammie.scss | 11 +++++++++-- content/cammie.erb | 5 ++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/content/assets/stylesheets/includes/cammie.scss b/content/assets/stylesheets/includes/cammie.scss index 0c82ffa..18dbd53 100644 --- a/content/assets/stylesheets/includes/cammie.scss +++ b/content/assets/stylesheets/includes/cammie.scss @@ -20,13 +20,20 @@ position: relative; height: 100%; #cammie-body { - height: 100%; + //background-image: url("//kelder.zeus.ugent.be/webcam/video/mjpg.cgi?profileid=2"); + // background-size: cover; + + position: relative; + #cammie-ctrls { display: flex; justify-content: space-between; flex-direction: column; - position: relative; + position: absolute; + top: 0; + z-index: 5; height: 100%; + width: 100%; transition: opacity 1s ease-in-out; opacity: 0; diff --git a/content/cammie.erb b/content/cammie.erb index 96addc2..57caef8 100644 --- a/content/cammie.erb +++ b/content/cammie.erb @@ -5,9 +5,7 @@ title: Cammie
-
- <%= render '/partials/_navbar.*' %> -
+
+
From 8d5e5d79f93d33ce8408c4b2a9638e45277e42a7 Mon Sep 17 00:00:00 2001 From: David Vandorpe Date: Mon, 29 Aug 2016 15:49:27 +0200 Subject: [PATCH 14/40] Cammie arrows --- .../assets/stylesheets/includes/cammie.scss | 10 ++++++++ content/cammie.erb | 24 +++++++++---------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/content/assets/stylesheets/includes/cammie.scss b/content/assets/stylesheets/includes/cammie.scss index 18dbd53..f62857d 100644 --- a/content/assets/stylesheets/includes/cammie.scss +++ b/content/assets/stylesheets/includes/cammie.scss @@ -45,12 +45,21 @@ .ctrl { + // Center arrows + display: flex; + justify-content: space-around; + align-items: center; + background-color: $cammie-controls-color; color: white; &:hover { background-color: $zeus_orange; cursor: pointer; } + + &.diag i { + transform: rotate(45deg); + } } .row { @@ -61,6 +70,7 @@ &.top-row, &.middle-row, &.bottom-row { flex-basis: 0; } + &.top-row, &.bottom-row { flex-grow: 1; } diff --git a/content/cammie.erb b/content/cammie.erb index 57caef8..c6b04de 100644 --- a/content/cammie.erb +++ b/content/cammie.erb @@ -31,35 +31,35 @@ title: Cammie
-
- diag up left +
+ <%= fa 'chevron-circle-left' %>
- up + <%= fa 'chevron-circle-up' %>
-
- diag up right +
+ <%= fa 'chevron-circle-up' %>
- left + <%= fa 'chevron-circle-left' %>
 
- right + <%= fa 'chevron-circle-right' %>
-
- diag down left +
+ <%= fa 'chevron-circle-down' %>
- down + <%= fa 'chevron-circle-down' %>
-
- diag down right +
+ <%= fa 'chevron-circle-right' %>
From 58a85c72b017358bb30b433e1edb40fd8e308e38 Mon Sep 17 00:00:00 2001 From: David Vandorpe Date: Tue, 30 Aug 2016 18:16:19 +0200 Subject: [PATCH 15/40] Three fixed buttons --- content/assets/stylesheets/includes/cammie.scss | 16 +++++++++++++++- content/cammie.erb | 16 +++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/content/assets/stylesheets/includes/cammie.scss b/content/assets/stylesheets/includes/cammie.scss index f62857d..bd72efd 100644 --- a/content/assets/stylesheets/includes/cammie.scss +++ b/content/assets/stylesheets/includes/cammie.scss @@ -21,7 +21,7 @@ height: 100%; #cammie-body { //background-image: url("//kelder.zeus.ugent.be/webcam/video/mjpg.cgi?profileid=2"); - // background-size: cover; + // background-size: cover; position: relative; @@ -77,6 +77,20 @@ &.middle-row { flex-grow: 8; + + .center { + .ctrl-half { + width: 100%; + height: 50%; + display: flex; + justify-content: space-around; + align-items: center; + + .ctrl { + padding: 15px; + } + } + } } // Enlarge middle column diff --git a/content/cammie.erb b/content/cammie.erb index c6b04de..1fb694c 100644 --- a/content/cammie.erb +++ b/content/cammie.erb @@ -46,7 +46,21 @@ title: Cammie
<%= fa 'chevron-circle-left' %>
-
 
+
+
+
+ Kleine tafel +
+
+ Grote tafel +
+
+
+
+ Zetel +
+
+
<%= fa 'chevron-circle-right' %>
From 25faaaf01ae13ef6d6c200e35b5261bc7b226b13 Mon Sep 17 00:00:00 2001 From: David Vandorpe Date: Tue, 30 Aug 2016 18:28:14 +0200 Subject: [PATCH 16/40] Coffeescript for absolute controls --- content/assets/scripts/cammie.coffee | 2 +- content/cammie.erb | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/content/assets/scripts/cammie.coffee b/content/assets/scripts/cammie.coffee index cfb7288..912d754 100644 --- a/content/assets/scripts/cammie.coffee +++ b/content/assets/scripts/cammie.coffee @@ -27,6 +27,6 @@ $ '.ctrl' $context = $ this $.ajax "//kelder.zeus.ugent.be/webcam/cgi/ptdc.cgi", data: - command: 'set_relative_pos' + command: $context.data 'command' posX: $context.data 'x' posY: $context.data 'y' \ No newline at end of file diff --git a/content/cammie.erb b/content/cammie.erb index 1fb694c..e279be8 100644 --- a/content/cammie.erb +++ b/content/cammie.erb @@ -31,48 +31,48 @@ title: Cammie
-
+
<%= fa 'chevron-circle-left' %>
-
+
<%= fa 'chevron-circle-up' %>
-
+
<%= fa 'chevron-circle-up' %>
-
+
<%= fa 'chevron-circle-left' %>
-
+
Kleine tafel
-
+
Grote tafel
-
+
Zetel
-
+
<%= fa 'chevron-circle-right' %>
-
+
<%= fa 'chevron-circle-down' %>
-
+
<%= fa 'chevron-circle-down' %>
-
+
<%= fa 'chevron-circle-right' %>
From 9f553db2c6e6bcefa3c30eb6ee6d8cd42f83349c Mon Sep 17 00:00:00 2001 From: David Vandorpe Date: Tue, 30 Aug 2016 18:30:19 +0200 Subject: [PATCH 17/40] Border radius on absolute controls --- content/assets/stylesheets/includes/cammie.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/content/assets/stylesheets/includes/cammie.scss b/content/assets/stylesheets/includes/cammie.scss index bd72efd..4435745 100644 --- a/content/assets/stylesheets/includes/cammie.scss +++ b/content/assets/stylesheets/includes/cammie.scss @@ -88,6 +88,7 @@ .ctrl { padding: 15px; + border-radius: 5px; } } } From 62115f72ecc206abc9e8873b5af092e6e9340508 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Tue, 30 Aug 2016 21:45:27 +0200 Subject: [PATCH 18/40] simplify stuff --- .../assets/stylesheets/includes/cammie.scss | 126 +++++------------- content/cammie.erb | 86 ++++-------- 2 files changed, 63 insertions(+), 149 deletions(-) diff --git a/content/assets/stylesheets/includes/cammie.scss b/content/assets/stylesheets/includes/cammie.scss index 4435745..d8f6030 100644 --- a/content/assets/stylesheets/includes/cammie.scss +++ b/content/assets/stylesheets/includes/cammie.scss @@ -1,103 +1,51 @@ -#cammie-container { - display: flex; - justify-content: center; - +#cammie-body { position: relative; - width: 100%; -} + #cammie-ctrls { + display: flex; + justify-content: space-between; + flex-direction: column; + height: 100%; + width: 100%; -.fullpage { - min-width: 100%; - min-height: 100%; - display: flex; - flex-direction: column; - justify-content: center; - background-color: black; -} + transition: opacity 1s ease-in-out; + z-index: 5; + opacity: 0; -#cammie-section { - position: relative; - height: 100%; - #cammie-body { - //background-image: url("//kelder.zeus.ugent.be/webcam/video/mjpg.cgi?profileid=2"); - // background-size: cover; + position: absolute; + top: 0; + left: 0; - position: relative; + .columns { + margin: 0; + } - #cammie-ctrls { - display: flex; - justify-content: space-between; - flex-direction: column; - position: absolute; - top: 0; - z-index: 5; + .center { + flex: 1; + } + + &.display { + transition: opacity .5s ease-in-out; + opacity: 1; + } + + .ctrl { height: 100%; - width: 100%; - transition: opacity 1s ease-in-out; - opacity: 0; + // Center arrows + display: flex; + justify-content: space-around; + align-items: center; - &.display { - transition: opacity .5s ease-in-out; - opacity: 1; + background-color: $cammie-controls-color; + color: white; + &:hover { + background-color: $zeus_orange; + cursor: pointer; } - .ctrl { - - // Center arrows - display: flex; - justify-content: space-around; - align-items: center; - - background-color: $cammie-controls-color; - color: white; - &:hover { - background-color: $zeus_orange; - cursor: pointer; - } - - &.diag i { - transform: rotate(45deg); - } - } - - .row { - display: flex; - justify-content: space-between; - - // Space rows - &.top-row, &.middle-row, &.bottom-row { - flex-basis: 0; - } - - &.top-row, &.bottom-row { - flex-grow: 1; - } - - &.middle-row { - flex-grow: 8; - - .center { - .ctrl-half { - width: 100%; - height: 50%; - display: flex; - justify-content: space-around; - align-items: center; - - .ctrl { - padding: 15px; - border-radius: 5px; - } - } - } - } - - // Enlarge middle column - .center { - flex-grow: 8; - } + &.diag i { + transform: rotate(45deg); } } } diff --git a/content/cammie.erb b/content/cammie.erb index e279be8..6a02aed 100644 --- a/content/cammie.erb +++ b/content/cammie.erb @@ -2,94 +2,60 @@ navigable: true title: Cammie --- - -
- - - - - +
-
-
+
+
<%= fa 'chevron-circle-left' %>
<%= fa 'chevron-circle-up' %>
-
+
<%= fa 'chevron-circle-up' %>
-
-
+
+
<%= fa 'chevron-circle-left' %>
-
-
-
- Kleine tafel -
-
- Grote tafel -
-
-
-
- Zetel -
-
+
+
-
+
<%= fa 'chevron-circle-right' %>
-
-
+ +
+
<%= fa 'chevron-circle-down' %>
<%= fa 'chevron-circle-down' %>
-
+
<%= fa 'chevron-circle-right' %>
- -
- -
+
From af3e8938214215b70170acfa34579d49676824b2 Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Tue, 30 Aug 2016 22:01:23 +0200 Subject: [PATCH 19/40] prettier index --- .../assets/stylesheets/includes/tiles.scss | 23 ++++++++++------ .../stylesheets/includes/variables.scss | 15 +++++++++-- content/assets/stylesheets/main.scss | 6 +---- content/index.erb | 26 ++++++++----------- layouts/partials/_tile.erb | 2 +- 5 files changed, 41 insertions(+), 31 deletions(-) diff --git a/content/assets/stylesheets/includes/tiles.scss b/content/assets/stylesheets/includes/tiles.scss index 14a3d75..e65d302 100644 --- a/content/assets/stylesheets/includes/tiles.scss +++ b/content/assets/stylesheets/includes/tiles.scss @@ -1,11 +1,18 @@ -.notification.is-info, -.notification.is-success, -.notification.is-primary { - .content { - color: white; - h1 { - color: white; - font-weight: bold; +a.box { + color: #000; +} + +.box { + background-color: $box-colour; + + &.highlighted { + background-color: $highlighted-box-colour; + color: $highlighted-text-colour; + + .content { + h1 { + color: white; + } } } } diff --git a/content/assets/stylesheets/includes/variables.scss b/content/assets/stylesheets/includes/variables.scss index 10f3021..f8b9d48 100644 --- a/content/assets/stylesheets/includes/variables.scss +++ b/content/assets/stylesheets/includes/variables.scss @@ -1,6 +1,17 @@ -$zeus_orange: #FF7F00; -$event-padding: 10px; +// Colours +$zeus-orange: #FF7F00; $navbar-border-color: #CCC; $event-border-color: #DDD; +$orange: $zeus-orange; +$primary: $orange; + +$link-visited: inherit; + +$box-colour: #EEE; +$highlighted-box-colour: $zeus-orange; +$highlighted-text-colour: white; +$highlighted-link-colour: #222324; $cammie-controls-color: rgba(0, 0, 0, 0.60); + +$event-padding: 10px; diff --git a/content/assets/stylesheets/main.scss b/content/assets/stylesheets/main.scss index a00ff64..09da219 100644 --- a/content/assets/stylesheets/main.scss +++ b/content/assets/stylesheets/main.scss @@ -1,8 +1,5 @@ -$zeus-orange: #FF7F00; -$orange: $zeus-orange; -$primary: $orange; -$link-visited: $orange; +@import "includes/variables"; @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,700); $family-sans-serif: 'Open Sans', sans-serif; @@ -14,7 +11,6 @@ $family-sans-serif: 'Open Sans', sans-serif; flex: none; } -@import "includes/variables"; @import "includes/cammie"; @import "includes/events"; @import "includes/tiles"; diff --git a/content/index.erb b/content/index.erb index 35b85b6..b1bea41 100644 --- a/content/index.erb +++ b/content/index.erb @@ -1,40 +1,36 @@
-
- <%= render '/partials/_tile.*', article: all_events[0] %> -
+ <%= render '/partials/_tile.*', article: all_events[0] %>
-
- <%= render '/partials/_tile.*', article: all_events[1] %> -
+ <%= render '/partials/_tile.*', article: all_events[1], htmlclass: "highlighted" %>
-
+
IDK LOL
-
+
<%= fa 'wikipedia-w' %>
-
+
<%= fa 'video-camera' %>
-
+
<%= fa 'github' %>
-
+
<%= fa 'facebook-official' %>
@@ -42,7 +38,7 @@
-
+

<%= sorted_articles.first[:title] %>

<%= sorted_articles.first[:description] %> @@ -51,7 +47,7 @@
-
+

Numero uno: @werthen

@@ -68,12 +64,12 @@
-
+
GITHUB
-
+
GITHUB
diff --git a/layouts/partials/_tile.erb b/layouts/partials/_tile.erb index a45783b..49cb075 100644 --- a/layouts/partials/_tile.erb +++ b/layouts/partials/_tile.erb @@ -1,4 +1,4 @@ - +
From 564d71285e2952619e874868955588fd193fd88b Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Tue, 30 Aug 2016 22:48:58 +0200 Subject: [PATCH 20/40] degeneralize box --- .../assets/stylesheets/includes/tiles.scss | 18 +-- content/index.erb | 134 +++++++++--------- 2 files changed, 78 insertions(+), 74 deletions(-) diff --git a/content/assets/stylesheets/includes/tiles.scss b/content/assets/stylesheets/includes/tiles.scss index e65d302..4e95000 100644 --- a/content/assets/stylesheets/includes/tiles.scss +++ b/content/assets/stylesheets/includes/tiles.scss @@ -2,16 +2,18 @@ a.box { color: #000; } -.box { - background-color: $box-colour; +#homepage { + .box { + background-color: $box-colour; - &.highlighted { - background-color: $highlighted-box-colour; - color: $highlighted-text-colour; + &.highlighted { + background-color: $highlighted-box-colour; + color: $highlighted-text-colour; - .content { - h1 { - color: white; + .content { + h1 { + color: white; + } } } } diff --git a/content/index.erb b/content/index.erb index b1bea41..3b4d8c5 100644 --- a/content/index.erb +++ b/content/index.erb @@ -1,76 +1,78 @@ -
-
- <%= render '/partials/_tile.*', article: all_events[0] %> -
-
-
- <%= render '/partials/_tile.*', article: all_events[1], htmlclass: "highlighted" %> +
+
+
+ <%= render '/partials/_tile.*', article: all_events[0] %>
-
-
- IDK LOL +
+
+ <%= render '/partials/_tile.*', article: all_events[1], htmlclass: "highlighted" %>
-
-
-
-
- <%= fa 'wikipedia-w' %> +
+
+ IDK LOL
-
-
- <%= fa 'video-camera' %> -
-
-
-
-
-
- <%= fa 'github' %> -
-
-
-
- <%= fa 'facebook-official' %> -
-
-
-
-
-
-
-
-

<%= sorted_articles.first[:title] %>

- <%= sorted_articles.first[:description] %> -
-
-
-
-
-
-

- Numero uno: @werthen -

-

- Numero dos: @myncke -

-

- Numero tres: @iepoev -

-

- Numero quatro: @becousae -

-
-
-
-
-
- GITHUB +
+
+
+ <%= fa 'wikipedia-w' %>
-
+
+
+ <%= fa 'video-camera' %> +
+
+
+
+
+
+ <%= fa 'github' %> +
+
+
+
+ <%= fa 'facebook-official' %> +
+
+
+
+
+
+
+
+

<%= sorted_articles.first[:title] %>

+ <%= sorted_articles.first[:description] %> +
+
+
+
+
- GITHUB +

+ Numero uno: @werthen +

+

+ Numero dos: @myncke +

+

+ Numero tres: @iepoev +

+

+ Numero quatro: @becousae +

+
+
+
+
+
+ GITHUB +
+
+
+
+ GITHUB +
From dda4155be4111dd5e53b4e4870fe851340338853 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Tue, 30 Aug 2016 23:20:15 +0200 Subject: [PATCH 21/40] fix #48 --- Rules | 2 +- content/assets/images/zeuslogo.svg | 31 +++++++++++++++++++ content/assets/images/zeuslogo_white.svg | 31 +++++++++++++++++++ .../assets/stylesheets/includes/general.scss | 2 ++ layouts/eventpost.erb | 2 +- layouts/partials/_navbar.erb | 2 +- 6 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 content/assets/images/zeuslogo.svg create mode 100644 content/assets/images/zeuslogo_white.svg diff --git a/Rules b/Rules index 80bce75..cb85b5a 100644 --- a/Rules +++ b/Rules @@ -132,7 +132,7 @@ compile '/assets/stylesheets/**/*.scss' do filter :sass, syntax: :scss end -passthrough '/assets/images/*.{png}' +passthrough '/assets/images/*.{png,svg}' # # diff --git a/content/assets/images/zeuslogo.svg b/content/assets/images/zeuslogo.svg new file mode 100644 index 0000000..aa9a674 --- /dev/null +++ b/content/assets/images/zeuslogo.svg @@ -0,0 +1,31 @@ + +image/svg+xml \ No newline at end of file diff --git a/content/assets/images/zeuslogo_white.svg b/content/assets/images/zeuslogo_white.svg new file mode 100644 index 0000000..211ad45 --- /dev/null +++ b/content/assets/images/zeuslogo_white.svg @@ -0,0 +1,31 @@ + +image/svg+xml diff --git a/content/assets/stylesheets/includes/general.scss b/content/assets/stylesheets/includes/general.scss index 7fe4317..7116cd9 100644 --- a/content/assets/stylesheets/includes/general.scss +++ b/content/assets/stylesheets/includes/general.scss @@ -16,6 +16,8 @@ html, body { #logo-link { #logo { + padding-top: 10px; + padding-left: 10px; width: 100px; } } diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb index 4573d95..9777c74 100644 --- a/layouts/eventpost.erb +++ b/layouts/eventpost.erb @@ -7,7 +7,7 @@
- <%= render '/partials/_navbar.*' %> + <%= render '/partials/_navbar.*', white: true %>
diff --git a/layouts/partials/_navbar.erb b/layouts/partials/_navbar.erb index 47c499f..38cf10d 100644 --- a/layouts/partials/_navbar.erb +++ b/layouts/partials/_navbar.erb @@ -2,7 +2,7 @@
- +
From 9eb426cb466bfaee22466e68ddded66ff43b4165 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Tue, 30 Aug 2016 23:37:32 +0200 Subject: [PATCH 22/40] back to index.html --- Rules | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Rules b/Rules index cb85b5a..bb85efe 100644 --- a/Rules +++ b/Rules @@ -157,7 +157,11 @@ route '/events/**/*', rep: :ical do end route '/**/*.{erb,html,md}' do - "#{item.identifier.without_ext}.html" + if item.identifier.without_ext.to_s =~ %r{/index$} + "#{item.identifier.without_ext}.html" + else + "#{item.identifier.without_ext}/index.html" + end end route '/**/*' do From d9da84fdcab3452b7b257a08c5a38185e74d38e9 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Tue, 30 Aug 2016 23:42:36 +0200 Subject: [PATCH 23/40] fix internal links --- content/404.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/404.erb b/content/404.erb index 6d3a384..5e07c0f 100644 --- a/content/404.erb +++ b/content/404.erb @@ -2,7 +2,7 @@ title: 404 - Page not found --- - +

- Page not found - From 4ca8db7d0f4f2615f5b05731265512bbe6578170 Mon Sep 17 00:00:00 2001 From: David Vandorpe Date: Tue, 30 Aug 2016 23:53:43 +0200 Subject: [PATCH 24/40] Use buttons for absolute navigation Fixes #49 --- content/cammie.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/content/cammie.erb b/content/cammie.erb index 6a02aed..1ca2771 100644 --- a/content/cammie.erb +++ b/content/cammie.erb @@ -45,15 +45,15 @@ title: Cammie

From d2feb994461d5bd04e60b1680a508ea8d90743dc Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Fri, 2 Sep 2016 00:05:38 +0200 Subject: [PATCH 25/40] improve navbar and eventpage styling --- .../stylesheets/includes/eventpage.scss | 13 ++++++ .../assets/stylesheets/includes/general.scss | 11 +++-- content/assets/stylesheets/main.scss | 1 + layouts/eventpost.erb | 46 +++++++++++-------- layouts/partials/_navbar.erb | 5 +- lib/helpers/assets.rb | 4 ++ 6 files changed, 57 insertions(+), 23 deletions(-) create mode 100644 content/assets/stylesheets/includes/eventpage.scss diff --git a/content/assets/stylesheets/includes/eventpage.scss b/content/assets/stylesheets/includes/eventpage.scss new file mode 100644 index 0000000..1aeb2e1 --- /dev/null +++ b/content/assets/stylesheets/includes/eventpage.scss @@ -0,0 +1,13 @@ +.google-maps { + position: relative; + height: 400px; + overflow: hidden; + + iframe { + position: absolute; + top: 0; + left: 0; + width: 100% !important; + height: 400px; + } +} diff --git a/content/assets/stylesheets/includes/general.scss b/content/assets/stylesheets/includes/general.scss index 7116cd9..a7b40a3 100644 --- a/content/assets/stylesheets/includes/general.scss +++ b/content/assets/stylesheets/includes/general.scss @@ -1,7 +1,3 @@ -html, body { - height: 100%; - width: 100%; -} .fa-ul { list-style: none !important; @@ -10,10 +6,17 @@ html, body { } } +.has-text-justified { + text-align: justify; +} + #navbar { align-items: flex-end; + #inline-logo { + min-width: 38.703px; + } #logo-link { #logo { padding-top: 10px; diff --git a/content/assets/stylesheets/main.scss b/content/assets/stylesheets/main.scss index 09da219..d536382 100644 --- a/content/assets/stylesheets/main.scss +++ b/content/assets/stylesheets/main.scss @@ -16,4 +16,5 @@ $family-sans-serif: 'Open Sans', sans-serif; @import "includes/tiles"; @import "includes/blogpost"; @import "includes/general"; +@import "includes/eventpage"; @import "includes/404"; diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb index 9777c74..a1ff1cf 100644 --- a/layouts/eventpost.erb +++ b/layouts/eventpost.erb @@ -5,42 +5,52 @@ <% end %> -
+
- <%= render '/partials/_navbar.*', white: true %> + <%= render '/partials/_navbar.*', zeus_logo_color: :white %>
-

+

+ <%= item[:title] %> -

-

+ +

+

+ <%= item[:description] %> +

+

  • <%= fa 'clock-o', li: true %><%= item[:time] %>
  • <%= fa 'globe', li: true %><%= item[:location] %>
-

+

-
- -
+
<%= yield %>
+
+
+
+
+ Nadat u het auditorium (A3) verlaten hebt, ga links door de glazen deur. Vervolgens hebt u recht voor u opnieuw een glazen deur, ga ook door deze deur. Vervolgens wandelt u helemaal tot het einde van de gang. U komt dan aan de ingang uit van het pc-lokaal Zuse in S9 +
+
+
+
+ +
+
diff --git a/layouts/partials/_navbar.erb b/layouts/partials/_navbar.erb index 38cf10d..358ae2c 100644 --- a/layouts/partials/_navbar.erb +++ b/layouts/partials/_navbar.erb @@ -2,12 +2,15 @@
- +