Merge pull request #56 from snap-cloud/bringingSexyBack

Bringing sexy back
snap-cloud · May 1, 2015 · c7600fd · c7600fd
2 parents c19726b + 34f9b8d
commit c7600fd
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/app/assets/stylesheets/project_listing.css b/app/assets/stylesheets/project_listing.css
@@ -45,8 +45,8 @@ div.center-text{
 
 div.image-with-border {
 	border-radius: 25px;
-	border: 2px solid #8AC007;
-	padding: 20px;
+	border: 2px solid #2d3e50;
+	padding: 0px;
 }
 
 div.overlay-top {

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -4,7 +4,7 @@
       <!-- FIXME: each page needs title... -->
     <title>Snap! Build Your Own Blocks</title>
     <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
-    <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> <!-- remove this line for the jquery error to go away -->
     <%= csrf_meta_tags %>
 
     <%= yield :head %>

diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
@@ -60,7 +60,7 @@
 	    	<!-- put a binary base64 encoded thumbnail as the play button -->
 	    		<img src="<%= @project.thumbnail %>" class="pure-img" >
     		</div>
-    		<i class="overlay-top icono-play" style="color: #6FBEF3"></i> Try it!
+    		<i class="overlay-top icono-play" style="color: #2d3e50"></i> Try it! <!--#6FBEF3 -->
     	</a>
     </div>
 

diff --git a/app/views/users/profile.html.erb b/app/views/users/profile.html.erb
@@ -7,12 +7,16 @@
 <h2 id="username"><%= @user.username %></h2>
 <% if not @user == current_user %>
 <a id="report-profile" class="pure-button" style="background: rgb(202,60,60);" href="/users/<%= @user.id %>/edit">
-  <div class="icono-flag">
+  <div>
+    <i class="icono-flag"></i>
+    Report
   </div>
 </a>
 <% else %>
 <a id="edit-profile" class="pure-button" style="background: rgb(202,60,60);" href="/users/<%= @user.id %>/edit">
-  <div class="icono-gear">
+  <div>
+    <i class="icono-gear"></i>
+    Edit
   </div>
 </a>
 <% end %>

diff --git a/features/step_definitions/project_steps.rb b/features/step_definitions/project_steps.rb
@@ -26,6 +26,12 @@
   page.should have_link(link, :href => url)
 end
 
+Then /^(?:|I) should see "(.*?)" before "(.*?)"$/ do |first, second|
+  assert page.include? first
+  assert page.include? second
+  assert page.index(first) < page.index(second)
+end
+
 Then /^(?:|I) should see the submit button "(.*?)"$/ do |input|
   page.should have_selector("input[type=submit][value='#{input}']")
 end