Remove unused images. More use of font-awesome icons

Dmitriy Zaporozhets
1 parent c2982c9a
Showing 15 changed files with 28 additions and 15 deletions Show diff stats
Gemfile
Gemfile.lock
app/assets/images/diff_file_add.png
app/assets/images/diff_file_delete.png
app/assets/images/diff_file_info.png
app/assets/images/diff_file_notice.png
app/assets/images/event_filter_comments.png
app/assets/images/event_filter_merged.png
app/assets/images/event_filter_push.png
app/assets/images/event_filter_team.png
app/assets/images/event_mr_merged.png
app/assets/images/event_push.png
app/assets/images/list_view_icon.jpg
app/assets/stylesheets/sections/events.scss
app/helpers/events_helper.rb
@@ -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
  
@@ -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
@@ -132,21 +132,25 @@
 .event_filter {
   position: absolute;
   width: 40px;
-  margin-left: -50px;
+  margin-left: -55px;
  
   .filter_icon {
-    float: left;
-    border-left: 3px solid #4bc;
-    padding: 7px;
-    background: #f9f9f9;
-    margin-bottom: 10px;
-    img {
-      width: 20px;
+    a {
+      text-align:center;
+      border-left: 3px solid #29B;
+      background: #f9f9f9;
+      margin-bottom: 10px;
+      float: left;
+      padding: 9px 7px;
+      font-size: 18px;
+      width: 26px;
     }
  
     &.inactive {
-      border-left: 3px solid #EEE;
-      opacity: 0.5;
+      a {
+        color: #DDD;
+        border-left: 3px solid #EEE;
+      }
     }
   }
 }
@@ -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
...	...	@@ -111,7 +111,7 @@ group :assets do
111	111	gem "modernizr", "2.6.2"
112	112	gem "raphael-rails", git: "https://github.com/gitlabhq/raphael-rails.git"
113	113	gem 'bootstrap-sass', "2.2.1.1"
114		- gem "font-awesome-sass-rails", "~> 2.0.0"
	114	+ gem "font-awesome-sass-rails", "~> 3.0.0"
115	115	gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
116	116	end
117	117
...	...
...	...	@@ -174,7 +174,7 @@ GEM
174	174	eventmachine (>= 0.12.0)
175	175	ffaker (1.15.0)
176	176	ffi (1.1.5)
177		- font-awesome-sass-rails (2.0.0.0)
	177	+ font-awesome-sass-rails (3.0.0.1)
178	178	railties (>= 3.1.1)
179	179	sass-rails (>= 3.1.1)
180	180	foreman (0.60.2)
...	...	@@ -381,7 +381,7 @@ GEM
381	381	rspec-mocks (~> 2.12.0)
382	382	rubyntlm (0.1.1)
383	383	rubyzip (0.9.9)
384		- sass (3.2.3)
	384	+ sass (3.2.5)
385	385	sass-rails (3.2.5)
386	386	railties (~> 3.2.0)
387	387	sass (>= 3.1.10)
...	...	@@ -488,7 +488,7 @@ DEPENDENCIES
488	488	email_spec
489	489	factory_girl_rails
490	490	ffaker
491		- font-awesome-sass-rails (~> 2.0.0)
	491	+ font-awesome-sass-rails (~> 3.0.0)
492	492	foreman
493	493	gemoji (~> 1.2.1)
494	494	git
...	...
...	...	@@ -132,21 +132,25 @@
132	132	.event_filter {
133	133	position: absolute;
134	134	width: 40px;
135		- margin-left: -50px;
	135	+ margin-left: -55px;
136	136
137	137	.filter_icon {
138		- float: left;
139		- border-left: 3px solid #4bc;
140		- padding: 7px;
141		- background: #f9f9f9;
142		- margin-bottom: 10px;
143		- img {
144		- width: 20px;
	138	+ a {
	139	+ text-align:center;
	140	+ border-left: 3px solid #29B;
	141	+ background: #f9f9f9;
	142	+ margin-bottom: 10px;
	143	+ float: left;
	144	+ padding: 9px 7px;
	145	+ font-size: 18px;
	146	+ width: 26px;
145	147	}
146	148
147	149	&.inactive {
148		- border-left: 3px solid #EEE;
149		- opacity: 0.5;
	150	+ a {
	151	+ color: #DDD;
	152	+ border-left: 3px solid #EEE;
	153	+ }
150	154	}
151	155	}
152	156	}
...	...
...	...	@@ -30,8 +30,17 @@ module EventsHelper
30	30
31	31	content_tag :div, class: "filter_icon #{inactive}" do
32	32	link_to dashboard_path, class: 'has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do
33		- image_tag "event_filter_#{key}.png"
	33	+ content_tag :i, nil, class: icon_for_event[key]
34	34	end
35	35	end
36	36	end
	37	+
	38	+ def icon_for_event
	39	+ {
	40	+ EventFilter.push => "icon-upload-alt",
	41	+ EventFilter.merged => "icon-check",
	42	+ EventFilter.comments => "icon-comments",
	43	+ EventFilter.team => "icon-user",
	44	+ }
	45	+ end
37	46	end
...	...