diff --git a/content/assets/stylesheets/includes/tiles.scss b/content/assets/stylesheets/includes/tiles.scss index 4a680ad..1ff4c7f 100644 --- a/content/assets/stylesheets/includes/tiles.scss +++ b/content/assets/stylesheets/includes/tiles.scss @@ -16,6 +16,34 @@ a.box { } } +.event-tile { + display: flex; + align-items: center; + justify-content: center; + padding: 1em; + filter: grayscale(30%); + + .event-content { + color: #4a4a4a; + height: 100%; + width: 100%; + background: rgba($tertiary, 0.2); + display: flex; + align-items: center; + justify-content: center; + + .event-text { + display: inline-block; + font-size: 1.1em; + } + + .is-divider { + margin: 0.5em; + } + } + +} + .centering { display: flex; diff --git a/content/assets/stylesheets/includes/variables.scss b/content/assets/stylesheets/includes/variables.scss index a049593..1f4f90a 100644 --- a/content/assets/stylesheets/includes/variables.scss +++ b/content/assets/stylesheets/includes/variables.scss @@ -13,8 +13,6 @@ $orange: $zeus-orange; $blue: $zeus-blue; $turquoise: #30D1B2; -$primary: $orange; - $family-sans-serif: 'Lato', sans-serif; $link-visited: $orange; @@ -30,5 +28,9 @@ $cammie-controls-color: rgba(0, 0, 0, 0.60); $event-padding: 10px; +$primary: $orange; +$secondary: $zeus-blue; +$tertiary: $box-colour; + // Default font size // $size-normal: 15px; diff --git a/content/assets/stylesheets/main.scss b/content/assets/stylesheets/main.scss index 0dfe242..6b5b8f2 100644 --- a/content/assets/stylesheets/main.scss +++ b/content/assets/stylesheets/main.scss @@ -3,6 +3,7 @@ @import "includes/variables"; @import "../../../node_modules/bulma/bulma"; +@import "../../../node_modules/bulma-divider/divider"; .nav-right { flex: none; diff --git a/layouts/partials/_events_tile.erb b/layouts/partials/_events_tile.erb index 6047772..a80f2a3 100644 --- a/layouts/partials/_events_tile.erb +++ b/layouts/partials/_events_tile.erb @@ -1,32 +1,30 @@ <% if @event[:banner] %> - <% elsif @event[:color] %> - <% else %> - + <% end %> -
-
-
-

- <%= @event[:title] %> -

+
+
+

+ <%= @event[:title] %> +

+ +
+ <%= @event[:description] %>
-
- - <%= fa :'clock-o' , fw: true %><%= @event[:time].strftime('%A %d %B %Y %H:%M') %> -
- <%= fa :'map-marker', fw: true %><%= @event[:location] %> -
+ +
+ +
+ <%= fa :'clock-o' , fw: true %><%= @event[:time].strftime('%A %d %B %Y %H:%M') %> +
+ <%= fa :'map-marker', fw: true %><%= @event[:location] %>
-
- <%= @event[:description] %> -
-
- <%= get_teaser(@event) %> -
+
diff --git a/package-lock.json b/package-lock.json index 880b372..eb81606 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,11 @@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.5.1.tgz", "integrity": "sha1-2ygxyUr+cyJQx7ElJ6e3kqTcnvg=" + }, + "bulma-divider": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/bulma-divider/-/bulma-divider-0.0.1.tgz", + "integrity": "sha1-qcW1TwzgKg6FjTOPTlggN4dRKks=" } } } diff --git a/package.json b/package.json index 8e2af6e..6f8370f 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "license": "MIT", "repository": "https://github.com/ZeusWPI/zeus.ugent.be", "dependencies": { - "bulma": "0.5.1" + "bulma": "0.5.1", + "bulma-divider": "~0.0.1" } }