fixes #956 integrate font-awesome

Stephen Crosby
1 parent f624fb84
Showing 32 changed files with 83 additions and 55 deletions Show diff stats
Gemfile
Gemfile.lock
app/assets/stylesheets/application.css.erb
app/assets/stylesheets/errbit.css.erb
app/assets/stylesheets/images/content-fade.png
app/assets/stylesheets/images/error-badge-bg.png
app/assets/stylesheets/images/header.png
app/assets/stylesheets/images/icons/add.png
app/assets/stylesheets/images/icons/briefcase.png
app/assets/stylesheets/images/icons/bullet-red-sm.png
app/assets/stylesheets/images/icons/cross.png
app/assets/stylesheets/images/icons/edit.png
app/assets/stylesheets/images/icons/github.png
app/assets/stylesheets/images/icons/ical.png
app/assets/stylesheets/images/icons/required.png
app/assets/stylesheets/images/icons/right-arrow.png
app/assets/stylesheets/images/icons/trash.png
app/assets/stylesheets/images/icons/unlink_github.png
app/assets/stylesheets/images/icons/up.png
app/assets/stylesheets/images/icons/user.png
@@ -8,29 +8,27 @@ gem &#39;actionmailer&#39;, RAILS_VERSION
 gem 'actionpack', RAILS_VERSION
 gem 'railties', RAILS_VERSION
-gem 'mongoid', '5.0.0'
-gem 'mongoid_rails_migrations'
-
+gem 'actionmailer_inline_css'
+gem 'decent_exposure'
 gem 'devise'
+gem 'dotenv-rails'
+gem 'draper'
+gem 'errbit_plugin'
+gem 'errbit_github_plugin'
+gem 'font-awesome-rails'
 gem 'haml'
 gem 'htmlentities'
-gem 'rack-ssl', :require => 'rack/ssl'   # force SSL
-
-gem 'useragent'
-gem 'decent_exposure'
-gem 'actionmailer_inline_css'
 gem 'kaminari', '>= 0.14.1'
+gem 'mongoid', '5.0.0'
+gem 'mongoid_rails_migrations'
+gem 'rack-ssl', :require => 'rack/ssl'   # force SSL
 gem 'rack-ssl-enforcer', :require => false
 gem 'rails_autolink'
+gem 'useragent'
+
 # Please don't update hoptoad_notifier to airbrake.
 # It's for internal use only, and we monkeypatch certain methods
 gem 'hoptoad_notifier', "~> 2.4"
-gem 'draper'
-
-gem 'errbit_plugin'
-gem 'errbit_github_plugin'
-
-gem 'dotenv-rails'
 # Notification services
 # ---------------------------------------
@@ -136,6 +136,8 @@ GEM
     flowdock (0.6.0)
       httparty (~> 0.7)
       multi_json
+    font-awesome-rails (4.2.0.0)
+      railties (>= 3.2, < 5.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     haml (4.0.6)
@@ -436,6 +438,7 @@ DEPENDENCIES
   errbit_plugin
   fabrication
   flowdock
+  font-awesome-rails
   haml
   hipchat
   hoi
@@ -3,5 +3,6 @@
  *= require jquery.alerts
  *= require errbit
  *= require notification_service_icons
+ *= require font-awesome
  *= require_self
  */
@@ -93,9 +93,10 @@ a.action  { float: right; font-size: 0.9em;}
   padding: 0 14px;
   line-height: 30px;
 }
-#header #session-links #sign-out {
-  background: transparent url(<%= asset_path "images/icons/bullet-red-sm.png" %>) 12px 50% no-repeat;
-  padding-left: 29px;
+#header #session-links #sign-out i {
+  color: #cc0033;
+  font-size: 11px;
+  margin-right: 3px;
 }
 #header #session-links a:hover {
   text-decoration: none;
@@ -133,10 +134,12 @@ a.action  { float: right; font-size: 0.9em;}
   color: #333;
 }
+#nav-bar li i {
+  margin-right: 5px;
+}
 #nav-bar li a {
   color: #666;
-  display: block;
-  padding: 0 20px 0 40px;
+  padding: 0 20px;
   font-size: 14px;
   font-weight: bold;
   line-height: 37px;
@@ -146,9 +149,6 @@ a.action  { float: right; font-size: 0.9em;}
   background: transparent 10px 6px no-repeat;
 }
 #nav-bar li a:hover { color: #666;}
-#nav-bar li.apps a { background-image: url(<%= asset_path "images/icons/briefcase.png" %>); }
-#nav-bar li.errs a { background-image: url(<%= asset_path "images/icons/error.png" %>); }
-#nav-bar li.users a { background-image: url(<%= asset_path "images/icons/user.png" %>); }
 #nav-bar li:not(.active):hover {
   box-shadow: 0 0 3px #69c;
   -moz-box-shadow: 0 0 3px #69c;
@@ -215,8 +215,7 @@ a.action  { float: right; font-size: 0.9em;}
 }
 #action-bar span a {
   color: #666;
-  display: block;
-  padding: 0 20px 0 40px;
+  padding: 0 20px;
   font-size: 14px; font-weight: bold; line-height: 39px; text-decoration: none;
   text-shadow: 1px 1px 0px #FFF; -webkit-text-shadow: 1px 1px 0px #FFF;
   background: transparent 10px 8px no-repeat;
@@ -227,17 +226,11 @@ a.action  { float: right; font-size: 0.9em;}
   -moz-box-shadow: 0 0 3px #69c;
   -webkit-box-shadow: 0 0 3px #69c;
 }
-#action-bar a.add {
-  background-image: url(<%= asset_path "images/icons/add.png" %>);
-}
-
-#action-bar .calendar_link {
-  background: url(<%= asset_path "images/icons/ical.png" %>) no-repeat scroll 12px 6px transparent;
-  padding-left: 47px;
+#action-bar a i {
+  margin-right: 5px;
 }
-#action-bar span.github a { background: url(<%= asset_path "images/icons/github.png" %>) no-repeat 6px 5px; }
-#action-bar span.unlink_github a { background: url(<%= asset_path "images/icons/unlink_github.png" %>) no-repeat 6px 5px; }
+#action-bar span.github a:before { font-family: FontAwesome; content: "\f09b"; margin-right: 8px; position: relative; top: 4px; font-size: 26px; }
 /* Content */
 #content {
@@ -306,7 +299,7 @@ form label {
 }
 form label.inline { display: inline; }
 form .checkbox label { display: inline; }
-form .required label { padding-right: 20px; background: transparent url(<%= asset_path "images/icons/required.png" %>) right 50% no-repeat; }
+form .required label:after { font-family: FontAwesome; content: "\f069"; color: #cc0033; margin-left: 5px; font-weight: normal; }
 form .field_with_errors label { color: #900; }
 form input[type=text], form input[type=password], form input[type=email] {
   width: 96%; padding: 0.8em;
@@ -365,10 +358,13 @@ form div.buttons input, form div.buttons button {
   -webkit-text-shadow: 1px 1px 0px #FFF;
   border: none;
 }
-form div.buttons button.sign_in {
-  padding-left: 40px;
-  background: transparent url(<%= asset_path "images/icons/right-arrow.png" %>) 3px 3px no-repeat;
+
+.sign_in:before {
+  font-family: FontAwesome;
+  content: "\f061";
+  margin-right: 8px;
 }
+
 form strong.option {
   display: block;
   margin: 0.7em 0;
@@ -650,7 +646,7 @@ td.count, td.issue_link {
   padding: 0.1em 0.7em;
   margin-top: 3px;
   color: #fff;
-  background: #cc0033 url(<%= asset_path "images/error-badge-bg.png" %>) 0 bottom repeat-x;
+  background-color: #cc0033;
   border: 1px solid #900;
   border-radius: 18px;
   -moz-border-radius: 18px;
@@ -661,7 +657,7 @@ td.count, td.issue_link {
   -webkit-opacity: 0.8
 }
 .count a.resolved {
-  background: #05B81d url(<%= asset_path "images/resolved-badge-bg.png" %>) 0 bottom repeat-x;
+  background-color: #05B81d;
   border: 1px solid #080;
 }
 .count a:hover {
@@ -729,13 +725,17 @@ table.deploys td.when {
 }
 /* Resolve Errs */
-#action-bar a.resolve {
-  background: transparent url(<%= asset_path "images/icons/thumbs-up.png" %>) 6px 5px no-repeat;
+#action-bar .resolve:before {
+  font-family: FontAwesome;
+  content: "\f087";
+  margin-right: 5px;
 }
 /* Go Up */
-#action-bar a.up {
-  background: transparent url(<%= asset_path "images/icons/up.png" %>) 6px 5px no-repeat;
+#action-bar a.up:before {
+  font-family: FontAwesome;
+  content: "\f077";
+  margin-right: 5px;
 }
 /* Notices Pagination */
 - content_for :title, t('.title')
 - content_for :action_bar do
-  %span= link_to(t('.new_app'), new_app_path, :class => 'add') if current_user.admin?
+  - if current_user.admin?
+    %span
+      = link_to(new_app_path) do
+        %i.fa.fa-plus-circle
+        = t('.new_app')
 %table.apps
   %thead
 - content_for :title, 'Deploys'
 - content_for :action_bar do
   - if current_user.authentication_token
-    %span= link_to 'iCal', app_deploys_path(@app, :format => "ics", :auth_token => current_user.authentication_token), :class => "calendar_link"
+    %span
+      = link_to app_deploys_path(@app, :format => "ics", :auth_token => current_user.authentication_token) do
+        %i.fa.fa-calendar
+        iCal
 = render 'table', :deploys => @deploys
 = paginate @deploys
@@ -16,8 +16,10 @@
     %span= link_to 'resolve', [:resolve, app, problem], :method => :put,
       :data => { :confirm => problem_confirm('resolve_one') }, :class => 'resolve'
   - if current_user.authentication_token
-    %span= link_to 'iCal', polymorphic_path([app, problem], :format => "ics",
-      :auth_token => current_user.authentication_token), :class => "calendar_link"
+    %span
+      = link_to polymorphic_path([app, problem], :format => "ics", :auth_token => current_user.authentication_token) do
+        %i.fa.fa-calendar
+        iCal
   %span>= link_to 'up', (request.env['HTTP_REFERER'] ? :back : app_problems_path(app)), :class => 'up'
   %br
   = render "issue_tracker_links"
 - unless flash.keys.empty?
   %ul#flash-messages
     - flash.each do |type, message|
-      %li{:class => type}= message
 \ No newline at end of file
+      %li{:class => type}= message
 - if Errbit::Config.github_authentication && user == current_user
   - if user.github_account?
-    %span.unlink_github= link_to "Unlink GitHub account", unlink_github_user_path(user), :method => :delete, :data => { :confirm => "Are you sure?" }
+    %span.github= link_to "Unlink GitHub account", unlink_github_user_path(user), :method => :delete, :data => { :confirm => "Are you sure?" }
   - else
     %span.github= link_to "Link GitHub account", user_omniauth_authorize_path(:github)
 #nav-bar
   %ul
-    %li.apps{:class => active_if_here(:apps)}= link_to t('.apps'), apps_path
-    %li.errs{:class => active_if_here(:problems)}= link_to t('.errors'), problems_path
+    %li{:class => active_if_here(:apps)}
+      = link_to apps_path do
+        %i.fa.fa-briefcase
+        = t('.apps')
+    %li{:class => active_if_here(:problems)}
+      = link_to problems_path do
+        %i.fa.fa-warning
+        = t('.errors')
     - if user_signed_in? && current_user.admin?
-      %li.users{:class => active_if_here(:users)}= link_to t('.users'), users_path
+      %li{:class => active_if_here(:users)}
+        = link_to users_path do
+          %i.fa.fa-users
+          = t('.users')
   %div.clear
 - if current_user
   %ul#session-links
-    %li= link_to t('.sign_out'), destroy_session_path(:user), :id => 'sign-out', :method => :delete
+    %li
+      = link_to destroy_session_path(:user), :id => 'sign-out', :method => :delete do
+        %i.fa.fa-circle
+        = t('.sign_out')
+
     %li= link_to t('.edit_profile'), edit_user_path(current_user), :id => 'edit-profile'
 - content_for :title, 'Users'
 - content_for :action_bar do
-  %span= link_to('Add a New User', new_user_path, :class => 'add')
+  %span
+    = link_to(new_user_path) do
+      %i.fa.fa-plus-circle
+      = t('.new')
 %table.users
   %thead
@@ -7,7 +7,6 @@
 - content_for :action_bar do
   = render 'shared/link_github_account'
-  %span= link_to('Add a New User', new_user_path, :class => 'add')
   = link_to 'edit', edit_user_path(user), :class => 'button'
   = link_to 'destroy', user_path(user), :method => :delete,
     :data => { :confirm => t('users.confirm_delete') }, :class => 'delete button'
@@ -84,6 +84,8 @@ en:
     confirm_delete: "Permanently delete this comment?"
   users:
     confirm_delete: "Permanently delete this user?"
+    index:
+      new: Add a New User
   apps:
     confirm_delete: "Permanently delete this app?"
     confirm_destroy_all_problems: "Permanently delete all of this app's errors?"
	@@ -136,6 +136,8 @@ GEM		@@ -136,6 +136,8 @@ GEM
136	flowdock (0.6.0)	136	flowdock (0.6.0)
137	httparty (~> 0.7)	137	httparty (~> 0.7)
138	multi_json	138	multi_json
		139	+ font-awesome-rails (4.2.0.0)
		140	+ railties (>= 3.2, < 5.0)
139	globalid (0.3.6)	141	globalid (0.3.6)
140	activesupport (>= 4.1.0)	142	activesupport (>= 4.1.0)
141	haml (4.0.6)	143	haml (4.0.6)
	@@ -436,6 +438,7 @@ DEPENDENCIES		@@ -436,6 +438,7 @@ DEPENDENCIES
436	errbit_plugin	438	errbit_plugin
437	fabrication	439	fabrication
438	flowdock	440	flowdock
		441	+ font-awesome-rails
439	haml	442	haml
440	hipchat	443	hipchat
441	hoi	444	hoi
	@@ -3,5 +3,6 @@		@@ -3,5 +3,6 @@
3	*= require jquery.alerts	3	*= require jquery.alerts
4	*= require errbit	4	*= require errbit
5	*= require notification_service_icons	5	*= require notification_service_icons
		6	+ *= require font-awesome
6	*= require_self	7	*= require_self
7	*/	8	*/
1	- unless flash.keys.empty?	1	- unless flash.keys.empty?
2	%ul#flash-messages	2	%ul#flash-messages
3	- flash.each do \|type, message\|	3	- flash.each do \|type, message\|
4	- %li{:class => type}= message
5	\ No newline at end of file	4	\ No newline at end of file
		5	+ %li{:class => type}= message
1	- if Errbit::Config.github_authentication && user == current_user	1	- if Errbit::Config.github_authentication && user == current_user
2	- if user.github_account?	2	- if user.github_account?
3	- %span.unlink_github= link_to "Unlink GitHub account", unlink_github_user_path(user), :method => :delete, :data => { :confirm => "Are you sure?" }	3	+ %span.github= link_to "Unlink GitHub account", unlink_github_user_path(user), :method => :delete, :data => { :confirm => "Are you sure?" }
4	- else	4	- else
5	%span.github= link_to "Link GitHub account", user_omniauth_authorize_path(:github)	5	%span.github= link_to "Link GitHub account", user_omniauth_authorize_path(:github)
1	#nav-bar	1	#nav-bar
2	%ul	2	%ul
3	- %li.apps{:class => active_if_here(:apps)}= link_to t('.apps'), apps_path
4	- %li.errs{:class => active_if_here(:problems)}= link_to t('.errors'), problems_path	3	+ %li{:class => active_if_here(:apps)}
		4	+ = link_to apps_path do
		5	+ %i.fa.fa-briefcase
		6	+ = t('.apps')
		7	+ %li{:class => active_if_here(:problems)}
		8	+ = link_to problems_path do
		9	+ %i.fa.fa-warning
		10	+ = t('.errors')
5	- if user_signed_in? && current_user.admin?	11	- if user_signed_in? && current_user.admin?
6	- %li.users{:class => active_if_here(:users)}= link_to t('.users'), users_path	12	+ %li{:class => active_if_here(:users)}
		13	+ = link_to users_path do
		14	+ %i.fa.fa-users
		15	+ = t('.users')
7	%div.clear	16	%div.clear
	@@ -7,7 +7,6 @@		@@ -7,7 +7,6 @@
7		7
8	- content_for :action_bar do	8	- content_for :action_bar do
9	= render 'shared/link_github_account'	9	= render 'shared/link_github_account'
10	- %span= link_to('Add a New User', new_user_path, :class => 'add')
11	= link_to 'edit', edit_user_path(user), :class => 'button'	10	= link_to 'edit', edit_user_path(user), :class => 'button'
12	= link_to 'destroy', user_path(user), :method => :delete,	11	= link_to 'destroy', user_path(user), :method => :delete,
13	:data => { :confirm => t('users.confirm_delete') }, :class => 'delete button'	12	:data => { :confirm => t('users.confirm_delete') }, :class => 'delete button'
	@@ -84,6 +84,8 @@ en:		@@ -84,6 +84,8 @@ en:
84	confirm_delete: "Permanently delete this comment?"	84	confirm_delete: "Permanently delete this comment?"
85	users:	85	users:
86	confirm_delete: "Permanently delete this user?"	86	confirm_delete: "Permanently delete this user?"
		87	+ index:
		88	+ new: Add a New User
87	apps:	89	apps:
88	confirm_delete: "Permanently delete this app?"	90	confirm_delete: "Permanently delete this app?"
89	confirm_destroy_all_problems: "Permanently delete all of this app's errors?"	91	confirm_destroy_all_problems: "Permanently delete all of this app's errors?"