changing icons one by one

UFPE · Apr 26, 2015 · 1193781 · 1193781
1 parent 3a47609
commit 1193781
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/app/assets/images/trashcan.png b/app/assets/images/trashcan.png
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -15,7 +15,7 @@
 
  html, body {
  	/*font-family: 'Patrick Hand';*/
- 	font-family: Helvetica;
+ 	font-family: 'Droid Serif', Times, serif;
  	margin: 0px;
  	padding: 0px;
  }
@@ -28,6 +28,8 @@
  	margin: 10px;
  	padding: 0px;
  	text-align: center;
+ 	font-family: 'Open Sans';
+ 	font-weight: 700;
  }
 
 a {
@@ -65,7 +67,6 @@ li#navbar {
 }
 
  #header {
- 	font-family: 'Patrick Hand';
  	width: 100%;
  	position: relative;
  	background-color: #EBF4FA;

diff --git a/app/views/collections/edit.html.haml b/app/views/collections/edit.html.haml
@@ -2,7 +2,7 @@
 =render :partial=> 'form', locals: {collection: @collection}
 %p 
   Delete this collection? 
-  =link_to 'trash_can_icon', collection_path(@collection), method: :delete, :confirm => 'Delete this collection?'
+  =link_to(image_tag('trashcan.png', width: 21),  collection_path(@collection), method: :delete, :confirm => 'Delete this collection?')
 %p 
   Export this collection: 
   =link_to 'export button', export_path(:id => @collection) 

diff --git a/app/views/collections/finalize_upload.html.haml b/app/views/collections/finalize_upload.html.haml
@@ -11,7 +11,7 @@
             =render :partial=> 'form', locals: {collection: collection}
             %p 
               Delete this collection? 
-              =link_to 'trash_can_icon', collection_path(collection), method: :delete, :confirm => 'Delete this collection?'
+              =link_to 'assets/images/trashcan.png', collection_path(collection), method: :delete, :confirm => 'Delete this collection?'
             %p 
               Export this collection: 
               =link_to 'export button', export_path(:id => collection) 

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -1,5 +1,5 @@
 
-%link{:href => 'http://fonts.googleapis.com/css?family=Patrick+Hand|Delius|Handlee', :rel => 'stylesheet', :type => 'text/css'}
+%link{:href => 'http://fonts.googleapis.com/css?family=Droid+Serif|Open+Sans:400,800,700', :rel => 'stylesheet', :type => 'text/css'}
 
 %html
   %head
@@ -19,7 +19,7 @@
             %ul#navbar
               %li#navbar= link_to " Log Out", logout_path, method: :post
               %li#navbar= link_to 'My Dashboard', profile_path, method: :get
-              %li#navbar Welcome, #{@current_user.name} user!             
+              %li#navbar Welcome, #{@current_user.name}!             
           - else  
             %ul#navbar
               %li#navbar= link_to " Log Out", logout_path, method: :post

diff --git a/public/trashcan.png b/public/trashcan.png