From 601f4439efaafd834bea2ee8c4db9db047b549d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Sat, 31 Aug 2019 09:03:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/poll/PollNewQuestbank.js | 598 +++++++++++------- .../src/modules/courses/poll/pollStyle.css | 17 +- public/stylesheets/educoder/edu-main.css | 4 +- 3 files changed, 400 insertions(+), 219 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js index d56cf7dc3..35e2a60ae 100644 --- a/public/react/src/modules/courses/poll/PollNewQuestbank.js +++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js @@ -266,7 +266,7 @@ class PollNewQuestbank extends Component { this.setState({ projects: result.data, pollid: pollid, - polls_status: 1, + polls_status: result.data.poll.is_public===false?1:2, polls_name: result.data.poll.name, polls_description: result.data.poll.description, poll_questions: result.data.questions, @@ -315,7 +315,7 @@ class PollNewQuestbank extends Component { this.setState({ projects: result.data, pollid: pollid, - polls_status: 1, + polls_status: result.data.poll.is_public===false?1:2, polls_name: result.data.poll.name, polls_description: result.data.poll.description, poll_questions: result.data.questions, @@ -673,7 +673,7 @@ class PollNewQuestbank extends Component { {"answer_id": 2, "answer_position": 2, "answer_text": ""}, {"answer_id": 3, "answer_position": 3, "answer_text": ""}, {"answer_id": 4, "answer_position": 4, "answer_text": ""}, - // {"answer_id": 5, "answer_position": 5, "answer_text": "其他"}, + {"answer_id": 5, "answer_position": 5, "answer_text": "其他"}, ] }; question = {"question": questiontwo}; @@ -767,7 +767,7 @@ class PollNewQuestbank extends Component { {"answer_id": 2, "answer_position": 2, "answer_text": ""}, {"answer_id": 3, "answer_position": 3, "answer_text": ""}, {"answer_id": 4, "answer_position": 4, "answer_text": ""}, - // {"answer_id": 5, "answer_position": 5, "answer_text": "其他"}, + {"answer_id": 5, "answer_position": 5, "answer_text": "其他"}, ] }; question = {"question": questiontwo}; @@ -823,6 +823,7 @@ class PollNewQuestbank extends Component { problemtopicbool: false, bindingid:undefined, Newdisplay:false, + newoption: false, }) }else{ @@ -832,6 +833,7 @@ class PollNewQuestbank extends Component { problemtopic: null, problemtopicbool: false, Newdisplay:false, + newoption: false, }) } @@ -1775,7 +1777,7 @@ class PollNewQuestbank extends Component { createquestionsandanswers = (object, number, option, other, max_choices, min_choices, insert_id) => { var thiss = this; var poll_id = this.state.pollid; - var urlly = `/polls/${poll_id}/poll_questions.json` + var urlly = `/poll_bank_questions.json`; var max_choicess = null; var min_choicess = null; if (max_choices === 0 && min_choices === 0) { @@ -1786,6 +1788,7 @@ class PollNewQuestbank extends Component { min_choicess = min_choices; } axios.post(urlly, { + exercise_bank_id:poll_id, question_title: object.question.question_title, question_type: number, is_necessary: object.question.is_necessary, @@ -1823,7 +1826,7 @@ class PollNewQuestbank extends Component { ///编辑修改到服务器当中 edittotheserver = (object, number, option, other, max_choices, min_choices) => { // console.log("调用了edittotheserver") - var url = `/poll_questions/${object.question.id}.json` + var url = `/poll_bank_questions/${object.question.id}.json` var thiss = this; axios.put(url, { // debug: true, @@ -1851,7 +1854,7 @@ class PollNewQuestbank extends Component { eletetoserver = (pollid, newarr, type, index) => { // console.log("调用了eletetoserver") var id = pollid; - var url = `/poll_questions/${id}.json` + var url = `/exercise_bank_questions/${id}.json` let {mysingles, mydoubles, mymainsint} = this.state var thiss = this; @@ -1893,7 +1896,7 @@ class PollNewQuestbank extends Component { var thiss = this; if (bool === true) { var url = `/exercise_bank_questions/${poll_question_id}/up_down.json`; - axios.post(url, { + axios.put(url, { opr: "up", }).then((result) => { try { @@ -1910,7 +1913,7 @@ class PollNewQuestbank extends Component { }) } else { var url = `/exercise_bank_questions/${poll_question_id}/up_down.json`; - axios.post(url, { + axios.put(url, { opr: "down", }).then((result) => { try { @@ -2444,7 +2447,7 @@ class PollNewQuestbank extends Component { } //试图 toWorkDetail = () => { - this.props.history.push(`/banks/poll/${this.props.match.params.workId}`); + this.props.history.push(`/banks/poll/${this.props.match.params.workId} `); this.props.initPublic(undefined); } @@ -2707,7 +2710,7 @@ class PollNewQuestbank extends Component { console.log(this.state.poll_questions); console.log(this.state.adddom); let resultDom; - resultDom =
+ resultDom =

第{index + 1}题： return ( -

+
{/*这里是编辑和新增的地方*/} { this.state.bindingid && this.state.bindingid===item.question.id? @@ -2798,6 +2801,7 @@ class PollNewQuestbank extends Component { resultDomtwo =
{itemo.question.question_type === 1 ? "单选题" : itemo.question.question_type === 2 ? "多选题" : "主观题"}
) : itemt.answer_text === "其他" ? (

其它 + {this.state.polls_status === undefined || this.state.polls_status === 1 ? - this.Deleteentrys(arrid, indext, true)}> - : ""} + itemo.question.question_type === 1?( + indext>1? + + { + itemo.question.question_type === 2 ?"": + this.Deleteentrys(arrid, indext, true)}> + } + + + + :"") + : "":""} +

) : (

- 选项 {this.state.polls_status === undefined || this.state.polls_status === 1 ? - this.Deleteentrys(arrid, indext, false)}> + indext>1? + + this.Deleteentrys(arrid, indext, false)}> + { + itemo.question.answers[itemo.question.answers.length-1].answer_text === "其他"&&itemo.question.answers.length-2===indext? + + this.Ewoption(itemo.question.id, itemo)}> + : itemo.question.answers.length-1===indext? + this.Ewoption(itemo.question.id, itemo)}> + : + } + + :indext===1&&itemo.question.answers.length===2||indext===1&&itemo.question.answers.length===3? this.Ewoption(itemo.question.id, itemo)}>:"" : ""}

)}
@@ -2867,26 +2909,26 @@ class PollNewQuestbank extends Component {
{itemo.question.question_type === 1 ? (
-
+ {/* this.Ewoption(itemo.question.id, itemo)}>新增选项*/} +
{this.state.polls_status === undefined || this.state.polls_status === 1 ? - this.Ewoption(itemo.question.id, itemo)}>新增选项 - + "" : ""} {this.state.polls_status === undefined || this.state.polls_status === 1 ? (this.state.newoption === false ? - this.Addanotheroption(itemo.question.id)}>新增其他选项 + this.Addanotheroption(itemo.question.id)}>添加[其它]选项 : "") : ""} - this.Deleteadddom(indexo,true)}>取消 this.Deleteadddomthree(indexo, itemo,true)}>保存 + onClick={() => this.Deleteadddomtwo(indexo, itemo,true)} >保存并继续 this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 + onClick={() => this.Deleteadddomthree(indexo, itemo,true)}>保存并退出
@@ -2897,8 +2939,8 @@ class PollNewQuestbank extends Component { : itemo.question.question_type === 2 ? ( //////////////////////////////////////////// 可选 -
-
+
+
可选 @@ -2950,6 +2992,14 @@ class PollNewQuestbank extends Component { className="ml10 mr20 color-grey-6 lineh-40 fl font-16">项 （学生答题时，系统对其选择的选项个数进行限制，--表示不限制） + + this.Deleteadddom(indexo,true)}>取消 + this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 + this.Deleteadddomthree(indexo, itemo,true)}>保存并退出 +
@@ -2957,60 +3007,60 @@ class PollNewQuestbank extends Component {
) - : (
) + : (
) }
{itemo.question.question_type === 2 ? - ( - this.state.polls_status === undefined || this.state.polls_status === 1 ? -
- -
this.Ewoption(itemo.question.id, itemo)}>新增选项 - - { - this.state.newoption === false ? this.Addanotheroption(itemo.question.id)}>新增其他选项 : "" - } - -
- - - - this.Deleteadddom(indexo,true)}>取消 - this.Deleteadddomthree(indexo, itemo,true)}>保存 - this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 - -
- - - : -
- - this.Deleteadddom(indexo,true)}>取消 - this.Deleteadddomthree(indexo, itemo,true)}>保存 - this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 - -
- ) - + // ( + // this.state.polls_status === undefined || this.state.polls_status === 1 ? + //
+ // + // {/*
this.Ewoption(itemo.question.id, itemo)}>新增选项*/} + // + // {/* {*/} + // {/* this.state.newoption === false ? this.Addanotheroption(itemo.question.id)}>新增其他选项 : ""*/} + // {/* }*/} + // + // {/*
*/} + // + // + // + // this.Deleteadddom(indexo,true)}>取消 + // this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 + // this.Deleteadddomthree(indexo, itemo,true)}>保存并退出 + // + //
+ // + // + // : + //
+ // + // this.Deleteadddom(indexo,true)}>取消 + // this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 + // this.Deleteadddomthree(indexo, itemo,true)}> 保存并退出 + // + //
+ // ) +"" : itemo.question.question_type === 3 ?
- this.Deleteadddom(indexo,true)}>取消 this.Deleteadddomthree(indexo, itemo,true)}>保存 + onClick={() => this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 + onClick={() => this.Deleteadddomthree(indexo, itemo,true)}>保存并退出
: @@ -3041,6 +3091,7 @@ class PollNewQuestbank extends Component { resultDomtwo =
{itemo.question.question_type === 1 ? "单选题" : itemo.question.question_type === 2 ? "多选题" : "主观题"} this.HandleInputTopic(e, indexo)}>{itemo.question.question_title} {itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => { + console.log("chishiyong1"); + console.log( itemo.question.answers[itemo.question.answers.length - 1]); return (
{itemt.answer_text === undefined ? (
) : itemt.answer_text === "其他" ? (

其它 {this.state.polls_status === undefined || this.state.polls_status === 1 ? - this.Deleteentrys(arrid, indext, true)}> + indext>1? + + { + itemo.question.question_type === 2?"": + this.Deleteentrys(arrid, indext, true)}> + } + + {/* {*/} + {/* itemo.question.answers.length-1=== indext?*/} + {/* this.Ewoption(itemo.question.id, itemo)}>*/} + {/*: */} + {/* }*/} + + :"" : ""}

) : (

- 选项 {this.state.polls_status === undefined || this.state.polls_status === 1 ? - this.Deleteentrys(arrid, indext, false)}> + indext>1? + + this.Deleteentrys(arrid, indext, false)}> + { + itemo.question.answers[itemo.question.answers.length - 1].answer_text==="其他"&&itemo.question.answers.length - 2 === indext ? + this.Ewoption(itemo.question.id, itemo)}> + : itemo.question.answers.length - 1 === indext ? + this.Ewoption(itemo.question.id, itemo)}> + : + + } + + :indext===1&&itemo.question.answers.length===2||indext===1&&itemo.question.answers.length===3? this.Ewoption(itemo.question.id, itemo)}>:"" : ""}

)}
@@ -3110,26 +3206,26 @@ class PollNewQuestbank extends Component {
{itemo.question.question_type === 1 ? (
-
+ {/* this.Ewoption(itemo.question.id, itemo)}>新增选项*/} +
{this.state.polls_status === undefined || this.state.polls_status === 1 ? - this.Ewoption(itemo.question.id, itemo)}>新增选项 - + "" : ""} {this.state.polls_status === undefined || this.state.polls_status === 1 ? (this.state.newoption === false ? - this.Addanotheroption(itemo.question.id)}>新增其他选项 + this.Addanotheroption(itemo.question.id)}>添加[其它]选项 : "") : ""} - this.Deleteadddom(indexo,true)}>取消 this.Deleteadddomthree(indexo, itemo,true)}>保存 + onClick={() => this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 + onClick={() => this.Deleteadddomthree(indexo, itemo,true)}>保存并退出
@@ -3141,7 +3237,7 @@ class PollNewQuestbank extends Component { : itemo.question.question_type === 2 ? ( //////////////////////////////////////////// 可选
-
+
可选 @@ -3193,6 +3289,15 @@ class PollNewQuestbank extends Component { className="ml10 mr20 color-grey-6 lineh-40 fl font-16">项 （学生答题时，系统对其选择的选项个数进行限制，--表示不限制） + + this.Deleteadddom(indexo,true)}>取消 + this.Deleteadddomtwo(indexo, itemo,true)} + >保存并继续 + this.Deleteadddomthree(indexo, itemo,true)}>保存并退出 +
@@ -3200,60 +3305,64 @@ class PollNewQuestbank extends Component {
) - : (
) + : (
) }
{itemo.question.question_type === 2 ? - ( - this.state.polls_status === undefined || this.state.polls_status === 1 ? -
- -
this.Ewoption(itemo.question.id, itemo)}>新增选项 - - { - this.state.newoption === false ? this.Addanotheroption(itemo.question.id)}>新增其他选项 : "" - } - -
- - - - this.Deleteadddom(indexo,true)}>取消 - this.Deleteadddomthree(indexo, itemo,true)}>保存 - this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 - -
- - - : -
- - this.Deleteadddom(indexo,true)}>取消 - this.Deleteadddomthree(indexo, itemo,true)}>保存 - this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 - -
- ) + // ( + // this.state.polls_status === undefined || this.state.polls_status === 1 ? + //
+ // + //
this.Ewoption(itemo.question.id, itemo)}>新增选项 + // + // { + // this.state.newoption === false ? this.Addanotheroption(itemo.question.id)}>新增其他选项 : "" + // } + // + //
+ // + // + // + // this.Deleteadddom(indexo,true)}>取消 + // this.Deleteadddomtwo(indexo, itemo,true)} + // >保存并继续 + // this.Deleteadddomthree(indexo, itemo,true)}>保存并退出 + // + //
+ // + // + // : + //
+ // + // this.Deleteadddom(indexo,true)}>取消 + // this.Deleteadddomtwo(indexo, itemo,true)} + // >保存并继续 + // this.Deleteadddomthree(indexo, itemo,true)}> 保存并退出 + // + //
+ // ) + "" : itemo.question.question_type === 3 ?
- this.Deleteadddom(indexo,true)}>取消 this.Deleteadddomthree(indexo, itemo,true)}>保存 + onClick={() => this.Deleteadddomtwo(indexo, itemo,true)} + >保存并继续 this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 + onClick={() => this.Deleteadddomthree(indexo, itemo,true)}> 保存并退出
: @@ -3293,6 +3402,7 @@ class PollNewQuestbank extends Component { resultDomtwo =
{itemo.question.question_type === 1 ? "单选题" : itemo.question.question_type === 2 ? "多选题" : "主观题"} this.HandleInputTopic(e, indexo)}>{itemo.question.question_title} {itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => { + console.log("ceshiyong2"); + console.log(itemo.question.answers.length-1); return (
{itemt.answer_text === undefined ? (
) : itemt.answer_text === "其他" ? (

其它 {polls_status === undefined || polls_status === 1 ? - this.Deleteentrys(arrid, indext, true)}> + indext>1? + + { + itemo.question.question_type === 2?"" + : + this.Deleteentrys(arrid, indext, true)}> + } + + + + + :"" : ""}

) : (

- 选项 {polls_status === undefined || polls_status === 1 ? - this.Deleteentrys(arrid, indext, false)}> + (indext>1? + + this.Deleteentrys(arrid, indext, false)}> + { + itemo.question.answers[itemo.question.answers.length-1].answer_text==="其他"&&itemo.question.answers.length-2===indext? + this.Ewoption(itemo.question.id, itemo)}> + : + itemo.question.answers.length - 1 === indext ? + this.Ewoption(itemo.question.id, itemo)}> + : + + + } + + :indext===1&&itemo.question.answers.length===2||indext===1&&itemo.question.answers.length===3? this.Ewoption(itemo.question.id, itemo)}>:"") : ""}

)}
@@ -3362,26 +3513,27 @@ class PollNewQuestbank extends Component {
{itemo.question.question_type === 1 ? (
-
+ {/* this.Ewoption(itemo.question.id, itemo)}>新增选项*/} +
{polls_status === undefined || polls_status === 1 ? - this.Ewoption(itemo.question.id, itemo)}>新增选项 - + "" : ""} {polls_status === undefined || polls_status === 1 ? (newoption === false ? - this.Addanotheroption(itemo.question.id)}>新增其他选项 + this.Addanotheroption(itemo.question.id)}>添加[其它]选项 : "") : ""} - this.Deleteadddom(indexo)}>取消 this.Deleteadddomthree(indexo, itemo)}>保存 + onClick={() => this.Deleteadddomtwo(indexo, itemo)} + > 保存并继续 this.Deleteadddomtwo(indexo, itemo)}>保存并继续 + onClick={() => this.Deleteadddomthree(indexo, itemo)}>保存并退出
@@ -3393,7 +3545,7 @@ class PollNewQuestbank extends Component { : itemo.question.question_type === 2 ? ( //////////////////////////////////////////// 可选
-
+
可选 @@ -3445,6 +3597,15 @@ class PollNewQuestbank extends Component { className="ml10 mr20 color-grey-6 lineh-40 fl font-16">项 （学生答题时，系统对其选择的选项个数进行限制，--表示不限制） + + this.Deleteadddom(indexo)}>取消 + this.Deleteadddomtwo(indexo, itemo)} + >保存并继续 + this.Deleteadddomthree(indexo, itemo)}> 保存并退出 +
@@ -3452,60 +3613,63 @@ class PollNewQuestbank extends Component {
) - : (
) + : (
) }
{itemo.question.question_type === 2 ? - ( - polls_status === undefined || polls_status === 1 ? -
- -
this.Ewoption(itemo.question.id, itemo)}>新增选项 - - { - newoption === false ? this.Addanotheroption(itemo.question.id)}>新增其他选项 : "" - } - -
- - - - this.Deleteadddom(indexo)}>取消 - this.Deleteadddomthree(indexo, itemo)}>保存 - this.Deleteadddomtwo(indexo, itemo)}>保存并继续 - -
- - - : -
- - this.Deleteadddom(indexo)}>取消 - this.Deleteadddomthree(indexo, itemo)}>保存 - this.Deleteadddomtwo(indexo, itemo)}>保存并继续 - -
- ) - + // ( + // polls_status === undefined || polls_status === 1 ? + //
+ // + //
this.Ewoption(itemo.question.id, itemo)}>新增选项 + // + // { + // newoption === false ? this.Addanotheroption(itemo.question.id)}>新增其他选项 : "" + // } + // + //
+ // + // + // + // this.Deleteadddom(indexo)}>取消 + // this.Deleteadddomtwo(indexo, itemo)} + // >保存并继续 + // this.Deleteadddomthree(indexo, itemo)}> 保存并退出 + // + //
+ // + // + // : + //
+ // + // this.Deleteadddom(indexo)}>取消 + // this.Deleteadddomtwo(indexo, itemo)} + // > 保存并继续 + // this.Deleteadddomthree(indexo, itemo)}>保存并退出 + // + //
+ // ) + "" : itemo.question.question_type === 3 ?
- this.Deleteadddom(indexo)}>取消 this.Deleteadddomthree(indexo, itemo)}>保存 + onClick={() => this.Deleteadddomtwo(indexo, itemo)} + >保存并继续 this.Deleteadddomtwo(indexo, itemo)}>保存并继续 + onClick={() => this.Deleteadddomthree(indexo, itemo)}>保存并退出
: diff --git a/public/react/src/modules/courses/poll/pollStyle.css b/public/react/src/modules/courses/poll/pollStyle.css index 023229f92..19f1b35cd 100644 --- a/public/react/src/modules/courses/poll/pollStyle.css +++ b/public/react/src/modules/courses/poll/pollStyle.css @@ -17,7 +17,22 @@ min-height: 40px; min-line-height: 40px; } - +.ml61{ + margin-left: 61px; +} +.w64{ + width: 64px; +} +.w55{ + width: 55px!important; +} +.max1010{ + width: 1010px !important; + max-width: 1010px !important; +} +.yw18{ + min-width: 18px; +} /* 选答 */ .chooseAnswer{ display: inline-block; diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index 1cceab275..05a7bdba5 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -103,6 +103,9 @@ a.decoration{text-decoration: underline} .mb0{margin-bottom: 0px!important;}.mb3{ margin-bottom: 3px;}.mb5{ margin-bottom: 5px;}.mb7{ margin-bottom: 7px;}.mb10{ margin-bottom: 10px;}.mb11{ margin-bottom: 11px;}.mb14{ margin-bottom: 14px;}.mb15{ margin-bottom: 15px;}.mb16{ margin-bottom: 16px;}.mb20{ margin-bottom: 20px!important;}.mb25{ margin-bottom: 25px;}.mb26{ margin-bottom: 26px;}.mb28{ margin-bottom: 28px;}.mb30{ margin-bottom: 30px!important;}.mb40{ margin-bottom: 40px!important;}.mb50{ margin-bottom: 50px!important;}.mb60{ margin-bottom: 60px!important;}.mb70{ margin-bottom: 70px!important;}.mb80{ margin-bottom: 80px!important;}.mb90{ margin-bottom: 90px!important;}.mb100{ margin-bottom: 100px!important;}.mb110{ margin-bottom: 110px;} .ml-3{ margin-left: -3px;}.ml1{margin-left: 1px;}.ml2{margin-left: 2px;}.ml3{margin-left: 3px;}.ml4{margin-left: 4px;}.ml5{ margin-left: 5px;}.ml6{ margin-left: 6px;}.ml10{ margin-left: 10px;}.ml12{ margin-left:12px!important;}.ml13{ margin-left:13px!important;}.ml15{ margin-left: 15px;}.ml18{ margin-left: 18px;}.ml20{ margin-left: 20px;}.ml22{ margin-left: 22px;}.ml25{ margin-left: 25px;}.ml29{margin-left: 29px;}.ml30{ margin-left: 30px;}.ml33{ margin-left: 33px;}.ml35{ margin-left:35px;}.ml40{margin-left:40px;}.ml42{margin-left:42px;}.ml45{ margin-left: 45px;}.ml50{ margin-left: 50px;}.ml55{ margin-left: 55px;}.ml60{ margin-left: 60px;}.ml72{ margin-left: 72px;}.ml73{ margin-left: 73px;}.ml75{ margin-left: 75px;}.ml80{ margin-left: 80px;}.ml85{margin-left:85px;}.ml95{ margin-left: 95px;}.ml115{margin-left: 115px}.ml123{ margin-left: 123px;}.ml150{ margin-left: 150px;}.ml180{ margin-left: 180px;}.ml230{ margin-left: 230px;}.ml240{margin-left: 240px;}.ml250{ margin-left: 250px;}.ml290{ margin-left: 290px;} .mr3{margin-right: 3px}.mr4{margin-right: 4px}.mr5{ margin-right: 5px;}.mr8{ margin-right: 8px;}.mr10{ margin-right: 10px;}.mr12{ margin-right:12px!important;}.mr15{ margin-right: 15px;}.mr18{ margin-right: 18px;}.mr20{ margin-right: 20px;}.mr24{ margin-right: 24px;}.mr25{ margin-right: 25px;}.mr30{ margin-right:30px;}.mr35{margin-right:35px;}.mr40{margin-right:40px;}.mr45{margin-right:45px;}.mr50{ margin-right: 50px;}.mr60{ margin-right:60px;}.mr70{ margin-right: 70px;}.mr75{ margin-right: 75px;}.mr80{ margin-right:80px;}.mr90{ margin-right:90px;}.mr100{ margin-right: 100px;}.mr110{ margin-right:110px;}.mr350{ margin-right:350px;} +.ml61{ + margin-left: 61px; +} .pt1{ padding-top:1px;}.pt3{ padding-top:3px!important;}.pt5{ padding-top:5px!important;}.pt10{ padding-top:10px;}.pt15{ padding-top:15px;}.pt17{ padding-top:17px;}.pt20{ padding-top:20px!important;}.pt25{ padding-top:25px;}.pt30{ padding-top:30px;}.pt35{ padding-top:35px;}.pt37{ padding-top:37px;}.pt40{ padding-top:40px;}.pt47{ padding-top:47px;}.pt49{ padding-top:49px;}.pt50{ padding-top:50px;}.pt60{ padding-top:60px;}.pt70{ padding-top:70px;}.pt80{ padding-top:80px;}.pt90{ padding-top:90px;}.pt100{padding-top:100px;}.pt110{ padding-top:110px;}.pt120{ padding-top:120px;}.pt130{padding-top:130px;} .pb3{ padding-bottom:3px!important;}.pb5{ padding-bottom:5px!important;}.pb10{ padding-bottom:10px;}.pb15{ padding-bottom:15px;}.pb20{ padding-bottom:20px;}.pb25{ padding-bottom:20px;}.pb25{ padding-bottom:20px;}.pb30{ padding-bottom:30px;}.pb35{ padding-bottom:35px;}.pb40{ padding-bottom:40px;}.pb47{ padding-bottom:47px;}.pb50{ padding-bottom:50px;}.pb60{ padding-bottom:60px;}.pb70{ padding-bottom:70px;}.pb80{ padding-bottom:80px;}.pb90{ padding-bottom:90px;}.pb100{ padding-bottom:100px;}.pb110{ padding-bottom:110px;}.pb155{ padding-bottom:155px;} @@ -111,7 +114,6 @@ a.decoration{text-decoration: underline} .pl0{ padding-left:0px!important;}.pl2{ padding-left:2px;}.pl5{ padding-left:5px;}.pl7{ padding-left:7px;}.pl8{ padding-left:8px;}.pl10{ padding-left:10px;}.pl15{ padding-left:15px;}.pl20{ padding-left:20px;}.pl22{ padding-left:22px;}.pl25{ padding-left:25px;}.pl28{ padding-left:28px;}.pl30{ padding-left:30px !important;}.pl33{padding-left: 33px}.pl35{ padding-left:35px;}.pl40{ padding-left:40px;}.pl42{ padding-left:42px;}.pl45{ padding-left:45px;}.pl50{ padding-left:50px;}.pl60{ padding-left:60px;}.pl70{padding-left:70px;}.pl75{padding-left:75px;}.pl80{padding-left:80px;}.pl88{ padding-left:88px;}.pl92{padding-left:92px;}.pl100{ padding-left:100px;} .pr2{ paddding-right:2px;}.pr5{ padding-right:5px;}.pr7{ padding-right:7px;}.pr10{ padding-right:10px;}.pr15{ padding-right:15px;}.pr20{ padding-right:20px!important;}.pr25{ padding-right:25px!important;}.pr30{ padding-right:30px!important;}.pr40{ padding-right:40px;}.pr42{ padding-right:42px;}.pr45{ padding-right:45px;}.pr60{padding-right:60px;}.pr75{padding-right:75px;} - .padding5-10{padding:5px 10px;box-sizing: border-box} .padding5-20{padding:5px 20px;box-sizing: border-box} .padding10{padding: 10px;box-sizing: border-box}