diff --git a/Gemfile b/Gemfile index d79c7ba801aa092cafa7b71e77b0724ea66d65f1..6272651e15cfd98d4f38f364379f6fb2ce3362e2 100644 --- a/Gemfile +++ b/Gemfile @@ -91,6 +91,9 @@ gem 'rubycritic', require: false gem 'rdoc' gem 'stackprof' +#Awesome font icons +gem "font-awesome-rails" + group :development, :test do # profiler gem 'rack-mini-profiler' diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index fa2e1abfe2cbb1a83f18fa94066f136fdfe8444a..bbd114b943faf9e26b535e8a1ff81b102472de4e 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -15,13 +15,16 @@ *= require jquery-ui/core *= require jquery-ui/theme *= require jquery-ui/autocomplete + *= require font-awesome */ + @import "bootstrap-sprockets"; @import "bootstrap"; @import "select2"; @import "select2-bootstrap"; @import "bootstrap-tagsinput"; @import "spinners"; +@import "font-awesome"; $header-blue: #1676bc; $link-grey: #343D3E; diff --git a/app/views/learning_objects/_bookmarks_button.html.erb b/app/views/learning_objects/_bookmarks_button.html.erb index f5aaa1ab7eb253c16099de9f8e64120c86036204..cd793b493cdb908b8340e07df36dee094dbb20de 100644 --- a/app/views/learning_objects/_bookmarks_button.html.erb +++ b/app/views/learning_objects/_bookmarks_button.html.erb @@ -1,3 +1,3 @@ <%= link_to bookmark_add_path(id: learning_object.id, type: learning_object.class.to_s), class: 'btn btn-default btn-xs', title: "Adicionar aos favoritos", method: :post, remote: true do %> - <span class="glyphicon glyphicon-bookmark" aria-hidden="true"></span> + <i class="fa fa-bookmark" aria-hidden="true"></i> <% end %> diff --git a/app/views/learning_objects/_collections_button.html.erb b/app/views/learning_objects/_collections_button.html.erb index 1f2b4f7802cf33b365f73a207f3e9620a0124aad..41373e128d9a06117b8ba26be6da5caf85d69258 100644 --- a/app/views/learning_objects/_collections_button.html.erb +++ b/app/views/learning_objects/_collections_button.html.erb @@ -1,3 +1,3 @@ <a tabindex="0" class="add-to-collection btn btn-default btn-xs" role="button" title="Adicionar as coleções" data-loid="<%= learning_object.id %>"> - <span class="glyphicon glyphicon-list" aria-hidden="true"></span> + <i class="fa fa-list" aria-hidden="true"></i> </a> diff --git a/app/views/learning_objects/_learning_object_horizontal.erb b/app/views/learning_objects/_learning_object_horizontal.erb index 6538596f77807cc636867b04e0d45c400a518539..134f597c6e652ff6319623ab7c046487f6584773 100644 --- a/app/views/learning_objects/_learning_object_horizontal.erb +++ b/app/views/learning_objects/_learning_object_horizontal.erb @@ -18,8 +18,8 @@ <% end %> <span class="author-label">Por <%= learning_object.get_metadata_value_of("dc.contributor.author") %></span><br/> - <span class="glyphicon glyphicon-eye-open" data-toggle="tooltip" data-placement="bottom" title="Visualizações"><%= learning_object.views.count %></span> - <span class="glyphicon glyphicon-star votes-count" data-id="<%= learning_object.id %>" data-toggle="tooltip" data-placement="bottom" title="Curtidas"><%= learning_object.likes.count %></span><br> + <i class="fa fa-eye" data-toggle="tooltip" data-placement="bottom" title="Visualizações"><%= learning_object.views.count %></i> + <i class="fa fa-star votes-count" data-id="<%= learning_object.id %>" data-toggle="tooltip" data-placement="bottom" title="Curtidas"><%= learning_object.likes.count %></i><br> <% unless learning_object.description.nil? %> <div class="learning-object-text"> diff --git a/app/views/learning_objects/_learning_object_vertical.erb b/app/views/learning_objects/_learning_object_vertical.erb index 0e22d59fb5bad7cd65ea3d632fdd7f209ffac1f6..61282aeb66ada3527eb238c766b1bb4a49eb97dd 100644 --- a/app/views/learning_objects/_learning_object_vertical.erb +++ b/app/views/learning_objects/_learning_object_vertical.erb @@ -10,8 +10,8 @@ </div> <div class="panel-body"> <h4 class="media-heading"><%= learning_object_title(learning_object) %></h4> - <span class="glyphicon glyphicon-eye-open" data-toggle="tooltip" data-placement="bottom" title="Visualizações"><%= learning_object.views.size %></span> - <span class="glyphicon glyphicon-star votes-count" data-id="<%= learning_object.id %>" data-toggle="tooltip" data-placement="bottom" title="Curtidas"><%= learning_object.likes.size %></span> + <i class="fa fa-eye" data-toggle="tooltip" data-placement="bottom" title="Visualizações"><%= learning_object.views.size %></i> + <i class="fa fa-star votes-count" data-id="<%= learning_object.id %>" data-toggle="tooltip" data-placement="bottom" title="Curtidas"><%= learning_object.likes.size %></i> <span class="author-label">Por <%= learning_object.get_metadata_value_of("dc.contributor.author") %></span> </div> </div> diff --git a/app/views/learning_objects/_like_button.html.erb b/app/views/learning_objects/_like_button.html.erb index 45a5e00594c3d1309068f409a1fa4466f28321af..9b85fb4ea0979597f21588020819de5775e62911 100644 --- a/app/views/learning_objects/_like_button.html.erb +++ b/app/views/learning_objects/_like_button.html.erb @@ -1,3 +1,3 @@ <%= link_to like_learning_object_path(id: learning_object.id), class: 'btn btn-primary btn-xs vote', method: :post, remote: true do %> - <span class="glyphicon glyphicon-thumbs-up" aria-hidden="true"></span> + <i class="fa fa-thumbs-up" aria-hidden="true"></i> <% end %> \ No newline at end of file diff --git a/app/views/learning_objects/show.html.erb b/app/views/learning_objects/show.html.erb index 4b14f459f571c08c8dce4f77e276da9130b82434..c3f3ca11015188e53cfb0cc6e8c2bbd3d233e7f5 100644 --- a/app/views/learning_objects/show.html.erb +++ b/app/views/learning_objects/show.html.erb @@ -5,8 +5,9 @@ <%= display_object_type @learning_object %> </div> <div class="pull-right" style="padding-right:122px"> - <span class="glyphicon glyphicon-eye-open"><%= @learning_object.views.size %> </span> - <span class="glyphicon glyphicon-star votes-count" data-id="<%= @learning_object.id %>" data-toggle="tooltip" data-placement="bottom" title="Curtidas"><%= @learning_object.likes.size %></span> + <i class="fa fa-eye"><%= @learning_object.views.size %> </i> + <i class="fa fa-thumbs-up votes-count" data-id="<%= @learning_object.id %>" data-toggle="tooltip" data-placement="bottom" title="Curtidas"><%= @learning_object.likes.size %></i> + </div> <br/><br/> <h2 class="title"><%= @learning_object.name %></h2> diff --git a/app/views/reviews/_review.html.erb b/app/views/reviews/_review.html.erb index fd549f0dbfd37772bfe972526babd3955ce2f15f..04e71e70676786c6b67521dfdaabec804db00d63 100644 --- a/app/views/reviews/_review.html.erb +++ b/app/views/reviews/_review.html.erb @@ -33,7 +33,7 @@ <div class="col-md-1"> <%= link_to rate_review_path(id: review.id, approves: true), class: 'btn btn-default btn-lg', method: :post, remote: true do %> - <span class="glyphicon glyphicon-menu-up" aria-hidden="true"></span> + <i class="fa fa-caret-up" aria-hidden="true"></i> <% end %> </br> </br> @@ -42,7 +42,7 @@ </br> <%= link_to rate_review_path(id: review.id, approves: false), class: 'btn btn-default btn-lg', method: :post, remote: true do %> - <span class="glyphicon glyphicon-menu-down" aria-hidden="true"></span> + <i class="fa fa-caret-down" aria-hidden="true"></i> <% end %> </br> </div> diff --git a/app/views/shared/application/_header.html.erb b/app/views/shared/application/_header.html.erb index 7b1d1363e660b456cf73e4391c2b67b20c5ce553..8205faa8b5e91bd8d9bd259376f14dc1e9640f2b 100644 --- a/app/views/shared/application/_header.html.erb +++ b/app/views/shared/application/_header.html.erb @@ -45,7 +45,7 @@ <option value="User">Usuários</option> </select> <div class="input-group-btn"> - <button class="btn btn-default" type="submit"><i class="glyphicon glyphicon-search"></i></button> + <button class="btn btn-default" type="submit"><i class="fa fa-search"></i></button> </div> </div> </form>