From b99f8d80566885d8e4c4ea664427cd7454fcff01 Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Tue, 21 Apr 2015 17:56:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B4=E5=83=8F=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=AF=BE=E7=A8=8B=E9=A1=B9=E7=9B=AElogo?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/avatar/_avatar_form.html.erb     | 3 ++-
 app/views/avatar/_new_avatar_form.html.erb | 3 ++-
 public/stylesheets/application.css         | 4 ++++
 public/stylesheets/public.css              | 2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/views/avatar/_avatar_form.html.erb b/app/views/avatar/_avatar_form.html.erb
index 6f9b9c7b1..fef9f7bdb 100644
--- a/app/views/avatar/_avatar_form.html.erb
+++ b/app/views/avatar/_avatar_form.html.erb
@@ -46,7 +46,8 @@
 <%= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "btn_addPic", :style => "text-decoration:none;" %>
   <a href="javascript:void(0);" class="btn_addPic" style="text-decoration:none;">
 	<span><%= l(:button_upload_photo) %></span>
-</a>
+  </a>
+  <span class="c_orange ml25 f12">(个人头像建议90*90大小，课程和项目logo建议60*60大小，或者等比图像)</span>
   <!--         :accept => 'image/png,image/gif,image/jpeg', -->
 <span class="add_avatar" style="margin-left: -55px;width: 70px">
 	<%= file_field_tag 'avatar[image]',
diff --git a/app/views/avatar/_new_avatar_form.html.erb b/app/views/avatar/_new_avatar_form.html.erb
index 8ca08c766..8b81ebf66 100644
--- a/app/views/avatar/_new_avatar_form.html.erb
+++ b/app/views/avatar/_new_avatar_form.html.erb
@@ -2,7 +2,8 @@
   <%= image_tag(url_to_avatar(source), id: "avatar_image", :width =>"60", :height =>"60",:alt=>"上传图片")%>
 </a>
 <%#= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "upbtn fl" %>
-<a href="javascript:void(0)" class="upbtn fl">上传图片</a>
+<a href="javascript:void(0)" class="upbtn fl"><%= l(:button_upload_photo) %></a>
+<span class="c_orange ml25 mt43 f12 fl ">(个人头像建议90*90大小，课程和项目logo建议60*60大小，或者等比图像)</span>
 <%= file_field_tag 'avatar[image]',
                    :id => nil,
                    :class => 'upload_file ',
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 4b6b681c7..3e88bb30a 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -30,9 +30,13 @@ ol,ul,li{ list-style-type:none}
 a{ text-decoration:none; }
 .ml10{ margin-left:10px;}
 .ml20{ margin-left:20px;}
+.ml25{ margin-left:25px;}
+.ml30{ margin-left:30px;}
 .mr10{ margin-right:10px;}
 .mb5{ margin-bottom:5px;}
 .mb10{ margin-bottom:10px;}
+.f12{font-size:12px; font-weight:normal;}
+.c_orange{color:#ff5722;}
 .fl{ float: left;}
 .fr{ float:right;}
 .project_h4{ font-size:14px; color:#3b3b3b;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 9d714b1de..917360b38 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -54,6 +54,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .ml10{ margin-left:10px;}
 .ml15{ margin-left:15px;}
 .ml20{ margin-left:20px;}
+.ml25{ margin-left:25px;}
 .ml40{ margin-left:40px;}
 .ml45{ margin-left:45px;}
 .ml55{ margin-left:55px;}
@@ -71,6 +72,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mt5{ margin-top:5px;}
 .mt8{ margin-top:8px;}
 .mt10{ margin-top:10px;}
+.mt43{ margin-top:43px;}
 .mb5{ margin-bottom:5px;}
 .mb10{ margin-bottom:10px;}
 .pl15{ padding-left:15px;}