From 1c80a89b8de9418e1e598cea6563a8d4e14a1d15 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 19 Oct 2016 17:43:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/settings/_new_edit.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/projects/settings/_new_edit.html.erb b/app/views/projects/settings/_new_edit.html.erb
index 3463be8ad..d0534701d 100644
--- a/app/views/projects/settings/_new_edit.html.erb
+++ b/app/views/projects/settings/_new_edit.html.erb
@@ -8,13 +8,13 @@
         </li>
         <li class="mb10">
           <label class="label"><span class="c_red f12">*</span>&nbsp;项目名称&nbsp;&nbsp;:&nbsp;</label>
-          <input  type="text" name="project[name]" id="project_name" class="ml5 w690" maxlength="100" onkeyup="regex_project_name();" value="<%= @project.name %>">
-          <span class="c_red ml5 fl" id="project_name_notice" style="display: none;">项目名称不能为空！</span>
+          <input  type="text" name="project[name]" id="project_name" class="ml5 w690" maxlength="100" style="height: 28px;" onkeyup="regex_project_name();" value="<%= @project.name %>">
+          <div></div>
+          <span class="c_red ml5 w690" id="project_name_notice" style="padding-left:100px;display: none;">项目名称不能为空！</span>
         </li>
         <li class="clear mb10">
           <label class="label fl">&nbsp;项目描述&nbsp;&nbsp;:&nbsp;</label>
-          <textarea class="fl ml5 w690" style="height:192px; padding-top:5px;" id="project_description" name="project[description]" rows="8" placeholder="项目描述作为项目的简介，将始终显示在动态页的顶部
-                  最多3000个汉字（或6000个英文字符）"><%= @project.description%></textarea>
+          <textarea class="fl ml5 w690" style="height:192px; padding-top:5px;" id="project_description" name="project[description]" rows="8" placeholder="项目描述作为项目的简介，将始终显示在动态页的顶部&#13;&#10;最多3000个汉字（或6000个英文字符)"><%= @project.description%></textarea>
         </li>
         <% if !@project.gpid.nil? && !@gitlab_branches.blank? %>
             <li class="clear">