- <%= @event[:title] %> -
++ <%= @event[:title] %> +
+ +- <%= fa :'map-marker', fw: true %><%= @event[:location] %> - + + + +
+ <%= fa :'map-marker', fw: true %><%= @event[:location] %>
diff --git a/content/assets/stylesheets/includes/events.scss b/content/assets/stylesheets/includes/events.scss index b49f710..2486bad 100644 --- a/content/assets/stylesheets/includes/events.scss +++ b/content/assets/stylesheets/includes/events.scss @@ -6,13 +6,6 @@ padding:20px; padding-top:0px; - .image-holder { - padding: 10px; - border: 1px solid lighten(gray, 30%); - width: 15%; - height: 15%; - } - .image { vertical-align: baseline; border: 1px solid gray; 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/_event_preview.erb b/layouts/partials/_event_preview.erb deleted file mode 100644 index 9878855..0000000 --- a/layouts/partials/_event_preview.erb +++ /dev/null @@ -1,39 +0,0 @@ -
- <%= main_event[:title] %> -
-