From 5f26061a01a452f5a38a67a9ca5fdffa6d9e3108 Mon Sep 17 00:00:00 2001 From: Hidde Leistra <hleistra@gmail.com> Date: Mon, 27 May 2019 22:14:12 +0200 Subject: [PATCH] Style fixes for feedback options --- client/views/Exam.jsx | 2 +- client/views/grade/EditPanel.jsx | 2 +- client/views/grade/FeedbackBlock.jsx | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/client/views/Exam.jsx b/client/views/Exam.jsx index dcabda0e..8c89effb 100644 --- a/client/views/Exam.jsx +++ b/client/views/Exam.jsx @@ -344,7 +344,7 @@ class Exams extends React.Component { }} /> </div> <br/> - <label className='label'>Feedback options</label> + {!this.state.editActive && <label className='label'>Feedback options</label>} </React.Fragment> )} </div> diff --git a/client/views/grade/EditPanel.jsx b/client/views/grade/EditPanel.jsx index 5639b8b6..92014524 100644 --- a/client/views/grade/EditPanel.jsx +++ b/client/views/grade/EditPanel.jsx @@ -108,7 +108,7 @@ class EditPanel extends React.Component { render () { return ( <React.Fragment> - <p className='panel-heading'> + <p className={this.props.grading ? 'panel-heading' : 'panel-heading is-radiusless'}> Manage feedback </p> diff --git a/client/views/grade/FeedbackBlock.jsx b/client/views/grade/FeedbackBlock.jsx index f3795f29..af1429fd 100644 --- a/client/views/grade/FeedbackBlock.jsx +++ b/client/views/grade/FeedbackBlock.jsx @@ -32,7 +32,9 @@ class FeedbackBlock extends React.Component { render () { const shortcut = (this.props.index < 11 ? '' : 'shift + ') + this.props.index % 10 return ( - <a className='panel-block' onClick={this.props.grading ? this.toggle : this.props.editFeedback} + <a + className={this.props.grading ? 'panel-block is-active' : 'panel-block'} + onClick={this.props.grading ? this.toggle : this.props.editFeedback} style={this.props.selected ? {backgroundColor: '#209cee'} : {}} > <span -- GitLab