Merge branch 'hometown-dev' of github.com:hometown-fork/hometown into hometown-dev

app/helpers/accounts_helper.rb

@@ -99,10 +99,6 @@ module AccountsHelper
   end
 
   def svg_logo
-    content_tag(:svg, tag(:use, 'xlink:href' => '#mastodon-svg-logo'), 'viewBox' => '0 0 216.4144 232.00976')
-  end
-
-  def svg_logo_full
-    content_tag(:svg, tag(:use, 'xlink:href' => '#mastodon-svg-logo-full'), 'viewBox' => '0 0 713.35878 175.8678')
+    content_tag(:svg, tag(:use, 'xlink:href' => '#hometownlogo'), 'viewBox' => '0 0 216.4144 232.00976')
   end
 end

app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js

@@ -361,7 +361,7 @@ class EmojiPickerDropdown extends React.PureComponent {
           <img
             className={classNames('emojione', { 'pulse-loading': active && loading })}
             alt='🙂'
-            src={`${assetHost}/emoji/1f602.svg`}
+            src={`${assetHost}/emoji/1f600.svg`}
           />
         </div>
 

app/javascript/styles/macaron.scss

@@ -1,3 +1,3 @@
 @import 'macaron/variables';
 @import 'application';
-@import 'macaron/diff'
+@import 'macaron/diff';

app/views/layouts/application.html.haml

@@ -38,4 +38,3 @@
 
     .logo-resources
       = render file: Rails.root.join('app', 'javascript', 'images', 'hometown.svg')
-      = render file: Rails.root.join('app', 'javascript', 'images', 'logo_full.svg')