Merge branch 'improve/filter_icons' of dev.gitlabhq.com:gitlab/gitlabhq

Gemfile

@@ -111,7 +111,7 @@ group :assets do
   gem "modernizr",        "2.6.2"
   gem "raphael-rails",    git: "https://github.com/gitlabhq/raphael-rails.git"
   gem 'bootstrap-sass',   "2.2.1.1"
-  gem "font-awesome-sass-rails", "~> 2.0.0"
+  gem "font-awesome-sass-rails", "~> 3.0.0"
   gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
 end
 

Gemfile.lock

@@ -174,7 +174,7 @@ GEM
       eventmachine (>= 0.12.0)
     ffaker (1.15.0)
     ffi (1.1.5)
-    font-awesome-sass-rails (2.0.0.0)
+    font-awesome-sass-rails (3.0.0.1)
       railties (>= 3.1.1)
       sass-rails (>= 3.1.1)
     foreman (0.60.2)
@@ -381,7 +381,7 @@ GEM
       rspec-mocks (~> 2.12.0)
     rubyntlm (0.1.1)
     rubyzip (0.9.9)
-    sass (3.2.3)
+    sass (3.2.5)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -488,7 +488,7 @@ DEPENDENCIES
   email_spec
   factory_girl_rails
   ffaker
-  font-awesome-sass-rails (~> 2.0.0)
+  font-awesome-sass-rails (~> 3.0.0)
   foreman
   gemoji (~> 1.2.1)
   git

app/assets/stylesheets/sections/events.scss

@@ -132,21 +132,25 @@
 .event_filter {
   position: absolute;
   width: 40px;
-  margin-left: -50px;
+  margin-left: -55px;
 
   .filter_icon {
-    float: left;
+    a {
-    border-left: 3px solid #4bc;
+      text-align:center;
-    padding: 7px;
+      border-left: 3px solid #29B;
       background: #f9f9f9;
       margin-bottom: 10px;
-    img {
+      float: left;
-      width: 20px;
+      padding: 9px 7px;
+      font-size: 18px;
+      width: 26px;
     }
 
     &.inactive {
+      a {
+        color: #DDD;
         border-left: 3px solid #EEE;
-      opacity: 0.5;
+      }
     }
   }
 }

app/helpers/events_helper.rb

@@ -30,8 +30,17 @@ module EventsHelper
 
     content_tag :div, class: "filter_icon #{inactive}" do
       link_to dashboard_path, class: 'has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do
-        image_tag "event_filter_#{key}.png"
+        content_tag :i, nil, class: icon_for_event[key]
       end
     end
   end
+
+  def icon_for_event
+    {
+      EventFilter.push     => "icon-upload-alt",
+      EventFilter.merged   => "icon-check",
+      EventFilter.comments => "icon-comments",
+      EventFilter.team     => "icon-user",
+    }
+  end
 end