Skip to content

Commit

Permalink
Work on the navbar and style the index.html.erb
Browse files Browse the repository at this point in the history
  • Loading branch information
Emmyn5600 committed May 4, 2021
1 parent c73a03f commit 30031a9
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.7.3'
ruby '2.7.2'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
gem 'rails', '~> 6.1.3', '>= 6.1.3.1'
Expand Down
9 changes: 9 additions & 0 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,12 @@
*/

@import "bulma";

.upcoming {
height: 40vh;
border: 3px solid #f7f1f1;
}

.navbar {
color: #f7f1f1;
}
6 changes: 6 additions & 0 deletions app/views/events/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,23 @@
<div class="columns">
<div class="column is-two-fifths">
<div class="subtitle is-5 mt-4">Upcoming Events:</div>
<div class="upcoming">
<ul>
<%= show_event_list(@upcoming_events) %>
</ul>
<button class="button is-primary is-light">Read More</button>
</div>
</div>
<div class="column"></div>

<div class="column is-two-fifths">
<div class="subtitle mt-4">Past Events:</div>
<div class="upcoming">
<ul>
<%= show_event_list(@past_events) %>
</ul>
<button class="button is-primary is-light">Read More</button>
</div>
</div>
</div>
<p class="button is-info is-light mt-6">
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</div>
<% end %>

<nav class="navbar is-info">
<nav class="navbar is-primary is-light">
<div class="navbar-brand">
<%= link_to root_path, class: "navbar-item" do %>
<h1 class="title is-5">Private Event</h1>
Expand Down

0 comments on commit 30031a9

Please sign in to comment.