From ccdcca578d31b2f59fb2ecb0755ff69d0d4698f7 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Wed, 22 Jul 2015 01:12:03 -0700
Subject: [PATCH] remove fa-plus from upload dialog button

---
 .../discourse/templates/modal/upload_selector.hbs    |  2 +-
 app/assets/stylesheets/common/base/upload.scss       | 12 ------------
 config/locales/client.en.yml                         |  6 +++---
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs b/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs
index 394153f71b3..4423fe5f72d 100644
--- a/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs
@@ -38,7 +38,7 @@
 
 <div class="modal-footer">
   <button class="btn btn-primary" {{action "upload" target="view"}}>
-    <span class='add-upload'><i {{bind-attr class=":fa view.uploadIcon"}}></i><i class='fa fa-plus'></i></span>
+    <span class='add-upload'><i {{bind-attr class=":fa view.uploadIcon"}}></i></span>
     {{i18n 'upload'}}
   </button>
   <a {{action "closeModal"}}>{{i18n 'cancel'}}</a>
diff --git a/app/assets/stylesheets/common/base/upload.scss b/app/assets/stylesheets/common/base/upload.scss
index 60c1f55785f..97fdf508ec4 100644
--- a/app/assets/stylesheets/common/base/upload.scss
+++ b/app/assets/stylesheets/common/base/upload.scss
@@ -1,15 +1,3 @@
-.add-upload .fa-plus {
-  font-size: 0.714em;
-  position: relative;
-  left: -5px;
-  bottom: -5px;
-  text-shadow:
-   -1px -1px 0 scale-color($tertiary, $lightness: -10%),
-    1px 1px 0 scale-color($tertiary, $lightness: -10%),
-    1px -1px 0 scale-color($tertiary, $lightness: -10%),
-    -1px 1px 0 scale-color($tertiary, $lightness: -10%);
-}
-
 .uploaded-image-preview {
   background-position: center center;
   background-size: cover;
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 6d4d67e901b..76613cb5d63 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -870,10 +870,10 @@ en:
       from_the_web: "From the web"
       remote_tip: "link to image"
       remote_tip_with_attachments: "link to image or file ({{authorized_extensions}})"
-      local_tip: "click to select up to 10 images from your device"
-      local_tip_with_attachments: "click to select up to 10 images or files from your device ({{authorized_extensions}})"
+      local_tip: "select images from your device"
+      local_tip_with_attachments: "select images or files from your device ({{authorized_extensions}})"
       hint: "(you can also drag & drop into the editor to upload them)"
-      hint_for_supported_browsers: "(you can also drag and drop or paste images into the editor to upload them)"
+      hint_for_supported_browsers: "you can also drag and drop or paste images into the editor to upload them"
       uploading: "Uploading"
       select_file: "Select File"
       image_link: "link your image will point to"