From 997053b235c4e406efff993f8d7d69cfad77d3ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 10 Jul 2019 15:25:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/public/css/css_min_all.css | 5 +
public/react/public/css/edu-all.css | 2 +-
.../src/modules/courses/poll/pollStyle.css | 2 +-
.../shixunHomework/Trainingjobsetting.js | 130 ++++---
public/stylesheets/css/login.css | 335 +++++++++---------
public/stylesheets/educoder/edu-all.css | 1 +
6 files changed, 264 insertions(+), 211 deletions(-)
diff --git a/public/react/public/css/css_min_all.css b/public/react/public/css/css_min_all.css
index 9ebeeda88..e74bbea13 100755
--- a/public/react/public/css/css_min_all.css
+++ b/public/react/public/css/css_min_all.css
@@ -1799,6 +1799,11 @@ ol.linenums{margin-top:0;margin-bottom:0}li.L1,li.L3,li.L5,li.L7,li.L9{backgroun
.page--body {
margin-top: 54px;
}
+.yslflexhome {
+ display: flex;
+ align-items: center;
+ flex-direction: row;
+}
#games_repository_contents,
.cm-s-railscasts .CodeMirror-gutters,
diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css
index e1a4640c8..216e11266 100644
--- a/public/react/public/css/edu-all.css
+++ b/public/react/public/css/edu-all.css
@@ -455,7 +455,7 @@ li.li-width7{width: 7%;text-align: left}
.top-black-trangle{display: block;border-width: 8px;position: absolute;top: -16px;right: 4px;border-style: dashed solid dashed dashed;border-color: transparent transparent rgba(5,16,26,0.6) transparent;font-size: 0;line-height: 0;}
.right-black-trangle{display: block;border-width: 8px;position: absolute;top: 10px;right: -16px;border-style: dashed solid dashed dashed;border-color: transparent transparent transparent rgba(5,16,26,0.6);font-size: 0;line-height: 0;}
.activity-nav.active{color: #4CACFF!important;}
-
+.yslinvitetip{right: 140px;color: #fff; box-sizing: border-box;width: 170px;text-align: center;border-radius: 2px;background-color: rgba(5,16,26,0.6)}
.courseNewNum{display: block;background: #FF6800;border-radius:30px;padding:0px 2px;color: #fff!important;font-size: 11px;
height: 16px;line-height: 15px;min-width: 12px;text-align: center;margin-top: 17px;}
diff --git a/public/react/src/modules/courses/poll/pollStyle.css b/public/react/src/modules/courses/poll/pollStyle.css
index 27a88b95e..a80d24105 100644
--- a/public/react/src/modules/courses/poll/pollStyle.css
+++ b/public/react/src/modules/courses/poll/pollStyle.css
@@ -38,7 +38,7 @@
.problemShow:last-child{
border-bottom: none;
}
-
+.yslinvitetip{right: 140px;color: #fff; box-sizing: border-box;width: 170px;text-align: center;border-radius: 2px;background-color: rgba(5,16,26,0.6)}
/* 问卷详情 */
/* 答题列表 */
.unlimit{
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index f6d6e4077..69a718c28 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -1,7 +1,7 @@
import React, {Component} from "react";
import CoursesListType from '../coursesPublic/CoursesListType';
import HomeworkModal from "../coursesPublic/HomeworkModal";
-import {WordsBtn, ActionBtn, handleDateString} from 'educoder';
+import {WordsBtn, ActionBtn, handleDateString,getImageUrl} from 'educoder';
import PollDetailTabForthRules from '../poll/PollDetailTabForthRules';
import ShixunWorkModal from './Shixunworkdetails/ShixunWorkModal';
import {
@@ -1709,7 +1709,13 @@ class Trainingjobsetting extends Component {
lineHeight: '30px',
color:"#666666"
};
-
+ const radioStyles = {
+ display: 'block',
+ height: '30px',
+ lineHeight: '30px',
+ color:"#666666",
+ marginLeft:'38px',
+ };
// const startDate=moment(this.state.publish_time).format('YYYY-MM-DD HH:mm');
// const endDate =moment(this.state.publish_time).add('months',1).format('YYYY-MM-DD HH:mm');
@@ -1879,7 +1885,7 @@ class Trainingjobsetting extends Component {
{ @@ -1953,7 +1959,7 @@ class Trainingjobsetting extends Component { - (学生“按时”提交作品的时间截点) + (学生“按时”提交作品的时间截点)
{ @@ -1987,9 +1993,9 @@ class Trainingjobsetting extends Component {