Merge pull request #4349 from arlogn/webkit-cursor-pointer-on-input-file-button

Cursor pointer on upload-photos button in webkit browsers

Changelog.md

@@ -22,6 +22,7 @@
 * Display notices a little bit longer to help on sign up errors [#4274](https://github.com/diaspora/diaspora/issues/4274)
 * Fix user contact sharing/receiving [#4163](https://github.com/diaspora/diaspora/issues/4163)
 * Change image to ajax-loader when closing lightbox [#3229](https://github.com/diaspora/diaspora/issues/3229)
+* Fix pointer cursor on the file upload button [#4349](https://github.com/diaspora/diaspora/pull/4349)
 
 ## Features
 * Admin: add option to find users under 13 (COPPA) [#4252](https://github.com/diaspora/diaspora/pull/4252)

app/assets/stylesheets/application.css.sass

@@ -713,14 +713,6 @@ form p.checkbox_select
 *:-moz-placeholder
   @include placeholder_styles
 
-#file-upload
-  input
-    :height 100%
-    :width 100%
-    :cursor pointer
-  img
-    :margin-right 20px
-
 #publisher
   :z-index 1
   :color #999
@@ -833,10 +825,11 @@ form p.checkbox_select
       :right initial !important
       :height 100%
       :width 100%
+      &::-webkit-file-upload-button
+        :cursor pointer
 
     img
       @include opacity(0.4)
-
       :vertical-align bottom
 
     &:hover