From 3e95b070d0ec52a4b7e3db1ff0a5c191eba315c4 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 2 Aug 2016 15:00:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/pull_requests/new.html.erb | 86 ++++++++++++++++++++++++++++ public/stylesheets/css/common.css | 7 ++- public/stylesheets/css/courses.css | 4 -- public/stylesheets/css/project.css | 15 ++++- 4 files changed, 104 insertions(+), 8 deletions(-) diff --git a/app/views/pull_requests/new.html.erb b/app/views/pull_requests/new.html.erb index e69de29bb..e206f2775 100644 --- a/app/views/pull_requests/new.html.erb +++ b/app/views/pull_requests/new.html.erb @@ -0,0 +1,86 @@ +
+
新的合并请求
+
+ 从 dev_huang 合并至 master修改分支 +
+
+
+
+
标题
+

标题以[WIP]或WIP开头：以防还在进程中的合并请求在它完成之前被合并

+
+
描述
+

上传附件

+
+
+
+
源分支
dev_huang +
+
目标分支
master +
+

修改分支

+
+
+
+ 提交请求 + 取消 +
+
+ +
根据最近提交时间排列
+
+
+ 2016-08-02 +

1次提交

+
+
+ 第一次提交 +

黄井泉创建于24小时前

+
+
+ 5202e2ef +

浏览文件

+
+
+
+
+
Showing 3 changed files with 3 additions and 3 deletions +
    +
  1. app/views/organizations/_org_course_homework.html.erb
    2. +
  2. app/views/users/_course_homework.html.erb
    3. +
  3. app/views/users/_user_homework_detail.html.erb
    4. +
+
+
app/views/organizations/_org_course_homework.html.erb
+
+ + + + + + + + + + + + + + + + + + + + + +
9999<% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
100100<div class="mt10">
111- <div class="fl mr5 fontGrey3">
111+ <div class="fl mr20 fontGrey3 w80">
+
+
+ + \ No newline at end of file diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index 7db3c4370..cfbf83394 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -94,9 +94,6 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/ .flow_hidden{ width:300px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} .white_space{white-space:nowrap;} .pr {position:relative;} -.fontGrey3 {color:#484848;} -a.linkGrey6 {color:#484848 !important;} -a.linkGrey6:hover {color:#ffffff !important;} .markPopup {width:290px; height:auto; padding:5px 0px 15px 15px; background-color:#ffffff; z-index:1000;} .markInput { outline:none; border:1px solid #e6e6e6; height:30px; width:50px; color:#3d3c3c; margin-bottom:10px; text-align:center; margin-right:5px; padding-left:0;} .markPercentage {margin:10px 0; border:1px solid #e6e6e6; width:70px; height:30px; outline:none; font-size:12px; color:#3d3c3c;} @@ -545,6 +542,10 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;} .borderRadius {border-radius:5px;} a.Blue-btn{ display:block; margin-right:15px;width:65px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #3598db; color:#3598db; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} a:hover.Blue-btn{ background:#3598db; color:#fff;} +a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#fff; line-height:28px; vertical-align:middle; text-align:center; border:1px solid #3598db; color:#3598db; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} +a:hover.BlueCirBtn{ background:#3598db; color:#fff;} +a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #3598db; color:#3598db; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} +a:hover.BlueCirBtnMini{ background:#3598db; color:#fff;} /*20160725 项目申请按钮*/ a.sy_btn_grey{ diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css index 7a1a0dabb..163f33338 100644 --- a/public/stylesheets/css/courses.css +++ b/public/stylesheets/css/courses.css @@ -8,14 +8,10 @@ .HomeWork {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd; float:right;} .RightBanner {font-size:16px; width:733px; color:#4b4b4b; padding:10px 0 0 15px; margin-bottom:10px; background:#fff; border:1px solid #dddddd;height:34px;} select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;} -a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#fff; line-height:28px; vertical-align:middle; text-align:center; border:1px solid #3598db; color:#3598db; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} -a:hover.BlueCirBtn{ background:#3598db; color:#fff;} /*a.AnnexBtn{ background: url(../images/homepage_icon.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}*/ /*a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat; color:#3598db;}*/ a.FilesBtn{ background: url(../images/homepage_icon.png) 0px -373px no-repeat; width:38px; height:20px; display:block; padding-left:20px; color:#888888;} a:hover.FilesBtn{background: url(../images/homepage_icon.png) -89px -372px no-repeat; color:#3598db;} -a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #3598db; color:#3598db; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} -a:hover.BlueCirBtnMini{ background:#3598db; color:#fff;} a.ProBtn{background: url(../images/homepage_icon.png) -86px -396px no-repeat; width:30px; height:20px; display:block; padding-left:20px; color:#888888;} a:hover.ProBtn{background: url(../images/homepage_icon.png) -86px -426px no-repeat; color:#3598db;} diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index 573948d66..cca2cde83 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -524,4 +524,17 @@ a:hover.upload_btn_grey{background:#8a8a8a;} .project-number-dot {display:inline-block; min-width:10px; padding:3px 5px; font-size:12px; color:#888; line-height:1; vertical-align:middle; white-space:nowrap; text-align:center; background-color:#eee; border-radius:10px; margin-left:5px;} .project-merge-content {} .project-merge-content li {padding:10px; margin:0 -10px; background-color:#f9f9f9; border-bottom:1px solid #e5e5e5;} -.no-merge-content {padding:10px 15px; color:#888;} \ No newline at end of file +.no-merge-content {padding:10px 15px; color:#888;} +.new-merge-request {border-bottom:1px solid #ddd; padding-bottom:10px;} +.new-merge-wrap {font-size:13px; color:#484848; border-bottom:1px solid #ddd; padding:10px 0;} +.new-merge-row {font-size:13px; color:#484848; border-bottom:1px solid #ddd; margin:0 -10px; padding:10px;} +.merge-option-name {width:70px; text-align:right; } +.merge-title-input {width:610px; height:16px; padding:8px 5px; border-radius:2px;} +.merge-description-input {width:610px; height:90px; line-height:18px; padding:8px 5px;} +.merge-record {font-size:13px; color:#484848; border-bottom:1px solid #ddd; margin:0 -10px; text-align:center;} +.merge-record li {display:inline-block;} +.merge-record li a {display:inline-block; padding:10px;} +.merge-record .active {border-bottom:2px solid #3b94d6;} +.merge-commit-time {width:200px; float:left;} +.merge-commit-detail {width:380px; float:left;} +.merge-commit-code {width:150px; float:left; text-align:right;} \ No newline at end of file