Skip to content

Commit

Permalink
Actually, we could just copy those two SVGs out of font awesome, and …
Browse files Browse the repository at this point in the history
…not require a gem…
  • Loading branch information
mattslack committed Dec 1, 2015
1 parent 475dddd commit c544846
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 8 deletions.
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ group :assets do
gem 'jquery-rails'
end

gem 'font-awesome-rails'

gem 'turbolinks'

gem 'bcrypt', '~> 3.1.7'
Expand Down
3 changes: 0 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ GEM
erubis (2.7.0)
eventmachine (1.0.8)
execjs (2.2.2)
font-awesome-rails (4.4.0.0)
railties (>= 3.2, < 5.0)
hike (1.2.3)
i18n (0.6.11)
jquery-rails (3.1.2)
Expand Down Expand Up @@ -131,7 +129,6 @@ DEPENDENCIES
capistrano-bundler
capistrano-rails
coffee-rails (~> 4.0.0)
font-awesome-rails
jquery-rails
pg
rails (~> 4.1.8)
Expand Down
5 changes: 5 additions & 0 deletions app/assets/images/chevron-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/assets/images/chevron-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
* defined in the other CSS/SCSS files in this directory. It is generally better to create a new
* file per style scope.
*
*= require font-awesome
*= require_tree .
*= require_self
*/
3 changes: 3 additions & 0 deletions app/assets/stylesheets/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ input[type=number] {
border: none;
margin: 10px;
}
.temp-action img {
width: 64px;
}
input[type=submit] {
display: block;
width: 80%;
Expand Down
8 changes: 6 additions & 2 deletions app/views/dashboard/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@
<%= f.label :temp, "Set Temp" %>
<%= f.number_field :temp, min: 50, max: 85, size: 2, pattern: "\\d*" %>
<div class="temp-action-group">
<button class="temp-action decrease-temp" type="button"><%= fa_icon("chevron-down") %></button>
<button class="temp-action increase-temp" type="button"><%= fa_icon("chevron-up") %></button>
<button class="temp-action decrease-temp" type="button">
<%= image_tag "chevron-down.svg", alt: "Decrease" %>
</button>
<button class="temp-action increase-temp" type="button">
<%= image_tag "chevron-up.svg", alt: "Increase" %>
</button>
</div>
<%= f.submit "Set" %>
<% end %>

0 comments on commit c544846

Please sign in to comment.