Skip to content

Commit

Permalink
pulling from sprint_2
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan committed Jun 1, 2016
1 parent ddd8d24 commit 46b0298
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 26 deletions.
5 changes: 5 additions & 0 deletions app/assets/stylesheets/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,8 @@ body, h1,h2,h3,h4,h5 {font-family: 'Marvel';}
text-align: center;
}
}

.userimg {
max-width: 100%;
max-height: 100%;
}
45 changes: 19 additions & 26 deletions app/views/users/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,38 +1,31 @@
<div class="row">
<div class="large-6 columns large centered">
<% if current_user==@user %>
<% end %> <h3> <%= @user.username %> </h3>
</div>

</div>


<div class="row">
<div class="large-6 columns large-centered">
<div class="row">
<div class="small-3 columns">
<%= cl_image_tag (@user.gravatar.url), :width => 100, :height => 100, :crop => :fill, :gravity => :face %>
</div>
<div class="small-9 columns">
<h5>Joined On: <small><%= @user.created_at.strftime("%m/%d/%Y") %></small></h5>
<h5>Email: <small><%= @user.email %></small></h5>
</div>
</div>
</div>
</div>


<div class="row align-center">
<div class="column small-12 small-centered large-5 larged-centered medium-8 medium-centered">
<div class="callout">

<%= @user.username %> <br>
<%= cl_image_tag (@user.gravatar.url), :width => 100, :height => 100, :crop => :fill, :gravity => :face %>

<h5>Joined On: <small><%= @user.created_at.strftime("%m/%d/%Y") %></small></h5>
<h5>Email: <small><%= @user.email %></small></h5>

<div class="row">

Humor?<%= rating_for @user, "Humor",disabled_after_rate:true, enable_half:true, readonly:true, imdb_avg: true %>
Skill Level?<%= rating_for @user, "Skill_level",disabled_after_rate:true, enable_half:true, readonly:true, imdb_avg: true %>
Sociability?<%= rating_for @user, "Sociability",disabled_after_rate:true, enable_half:true, readonly:true, imdb_avg: true %>
</div>

</div>

</div>
</div>


<div class="row">
<div class="large-6 medium-8 small-12 large-centered medium-centered columns">
<h4 class="text-center">MESSAAGES</h4>
</div>

<div class="row">
Humor?<%= rating_for @user, "Humor",disabled_after_rate:true, enable_half:true, readonly:true, imdb_avg: true %>
Skill Level?<%= rating_for @user, "Skill_level",disabled_after_rate:true, enable_half:true, readonly:true, imdb_avg: true %>
Sociability?<%= rating_for @user, "Sociability",disabled_after_rate:true, enable_half:true, readonly:true, imdb_avg: true %>
</div>

0 comments on commit 46b0298

Please sign in to comment.