jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'yuanke_youhua' of https://git.trustie.net/jacknudt/trustieforge into yuanke_youhua

This commit is contained in:
yuanke 2016-11-23 09:28:04 +08:00
parent c40288b8c3 c571d19548
commit 40c7afbc38
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/projects/show.html.erb
View File

@ -1,7 +1,7 @@
<!--新版项目头部结束--> <!--新版项目头部结束-->
<div class="pro_new_info mb10 break_word" style="padding-bottom: 5px" > <div class="ke-block pro_new_info mb10 " style="padding-bottom: 5px;word-break: normal;word-wrap: break-word" >
<div id="project_invite_code"><%= render :partial => 'projects/invite_code' %></div> <div id="project_invite_code"><%= render :partial => 'projects/invite_code' %></div>
<div id="project_description_code" > <div id="project_description_code" style="padding: 0 15px 10px 15px;">
<% if @project.description.blank? %> <% if @project.description.blank? %>
<p class="break_word" style="padding-top:5px"><%= @project.name %></p> <p class="break_word" style="padding-top:5px"><%= @project.name %></p>
<% else %> <% else %>

4
lib/trustie/gitlab/sync.rb
View File

@ -42,7 +42,7 @@ module Trustie
gproject = g.create_project(repository.identifier, gproject = g.create_project(repository.identifier,
path: repository.identifier, path: repository.identifier,
description: project.description, description: false,
wiki_enabled: false, wiki_enabled: false,
wall_enabled: false, wall_enabled: false,
issues_enabled: false, issues_enabled: false,
@ -88,7 +88,7 @@ module Trustie
# can use password # can use password
gproject = self.g.create_project(path, gproject = self.g.create_project(path,
path: path, path: path,
description: project.description, description: false,
wiki_enabled: false, wiki_enabled: false,
wall_enabled: false, wall_enabled: false,
issues_enabled: false, issues_enabled: false,

11
public/stylesheets/css/common.css
View File

@ -812,3 +812,14 @@ a:hover.btn_newpro_grey,a:active.btn_newpro_grey{ background: #eaeaea;}
.my_issues_form_filter select{ width:70px; height:30px; border:none; font-size:14px; border:none;border-right:none; color: #888; font-size: 12px; line-height: 30px; text-align:center} .my_issues_form_filter select{ width:70px; height:30px; border:none; font-size:14px; border:none;border-right:none; color: #888; font-size: 12px; line-height: 30px; text-align:center}
.my_issues_form_filter select.issues_filter_select_min{width:50px; } .my_issues_form_filter select.issues_filter_select_min{width:50px; }
.my_issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none;} .my_issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none;}
.ke-block pre{
font-size:9pt;
font-family:Courier New,Arial;
border:1px solid #ddd;
border-left:5px solid #6CE26C;
background:#f6f6f6;
padding:5px;
}
.ke-block ol li{list-style-type: decimal;margin-left: 40px;}
.ke-block ul li{list-style-type: disc;margin-left: 40px;}

2
public/stylesheets/css/project.css
View File

@ -888,7 +888,7 @@ a:hover.btn_newpro_grey,a:active.btn_newpro_grey{ background: #eaeaea;}
/*项目简介*/ /*项目简介*/
.pro_new_info{ border:1px solid #ddd; background-color:#fff; width: 998px;} .pro_new_info{ border:1px solid #ddd; background-color:#fff; width: 998px;}
.pro_new_info h2{ background: #fff; font-size: 14px; color: #333; height: 40px; line-height: 40px; padding-left: 15px; border-bottom:1px solid #e5e5e5;} .pro_new_info h2{ background: #fff; font-size: 14px; color: #333; height: 40px; line-height: 40px; padding-left: 15px; border-bottom:1px solid #e5e5e5;}
.pro_new_info p{ padding-bottom:2px; padding-left: 15px; color: #666; padding-right: 5px} /*.pro_new_info p{ padding-bottom:2px; padding-left: 15px; color: #666; padding-right: 5px}*/
.pro_new_info_weight{ font-size: 16px; font-weight: bold;} .pro_new_info_weight{ font-size: 16px; font-weight: bold;}
/* 新版项目配置*/ /* 新版项目配置*/
.pro_new_setting_leftnav{ width: 162px; border:1px solid #ddd; background-color:#fff; padding:3px; padding-bottom: 0;} .pro_new_setting_leftnav{ width: 162px; border:1px solid #ddd; background-color:#fff; padding:3px; padding-bottom: 0;}