Merge pull request #456 from ReCodEx/ux-improvements

Ux improvements
ReCodEx · Feb 11, 2022 · b25b7b0 · b25b7b0
2 parents 98946c0 + 9d17ad9
commit b25b7b0
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 41 deletions.
diff --git a/src/components/ReferenceSolutions/EvaluationTable/EvaluationTable.js b/src/components/ReferenceSolutions/EvaluationTable/EvaluationTable.js
@@ -10,7 +10,7 @@ import { BugIcon } from '../../icons';
 import './EvaluationTable.css';
 
 const EvaluationTable = ({ evaluations, renderButtons, selectedRowId = '' }) => (
-  <Table>
+  <Table className="mb-0">
     <thead>
       <tr>
         <th />

diff --git a/src/components/Solutions/TestResultsTable/TestResultsTable.js b/src/components/Solutions/TestResultsTable/TestResultsTable.js
@@ -301,7 +301,7 @@ class TestResultsTable extends Component {
       showLogButton && results.reduce((out, { testName }) => out && !this.isLogOpen(testName), true);
 
     return (
-      <Table responsive>
+      <Table responsive className="mb-0">
         <thead>
           <tr>
             <th />

diff --git a/src/containers/App/recodex.css b/src/containers/App/recodex.css
@@ -296,7 +296,11 @@ a:focus {
  * Bootstrap Enhancements
  */
 code {
-  color: #063;
+  color: #072;
+}
+
+.recodex-markdown-container code {
+  white-space: pre-wrap;
 }
 
 .wider-tooltip {

diff --git a/src/pages/ReferenceSolution/ReferenceSolution.js b/src/pages/ReferenceSolution/ReferenceSolution.js
@@ -11,7 +11,7 @@ import { ReferenceSolutionNavigation } from '../../components/layout/Navigation'
 import ReferenceSolutionDetail from '../../components/ReferenceSolutions/ReferenceSolutionDetail';
 import FetchManyResourceRenderer from '../../components/helpers/FetchManyResourceRenderer';
 import ResourceRenderer from '../../components/helpers/ResourceRenderer';
-import Button, { TheButtonGroup } from '../../components/widgets/TheButton';
+import { TheButtonGroup } from '../../components/widgets/TheButton';
 import Callout from '../../components/widgets/Callout';
 import { ReferenceSolutionIcon } from '../../components/icons';
 
@@ -34,7 +34,6 @@ import {
   fetchManyStatus,
 } from '../../redux/selectors/referenceSolutionEvaluations';
 
-import { ENV_CS_DOTNET_CORE_ID } from '../../helpers/exercise/environments';
 import { hasPermissions } from '../../helpers/common';
 
 const exerciseHasRuntime = defaultMemoize(
@@ -116,22 +115,11 @@ class ReferenceSolution extends Component {
                             isDebug={false}
                             locale={locale}
                           />
-
-                          {referenceSolution.runtimeEnvironmentId ===
-                          ENV_CS_DOTNET_CORE_ID /* temporary disable debug resubmits of .NET Core */ ? (
-                            <Button disabled={true}>
-                              <FormattedMessage
-                                id="app.solution.dotnetResubmitTemporaryDisabled"
-                                defaultMessage="Debug Resubmit Temporary Disabled"
-                              />
-                            </Button>
-                          ) : (
-                            <ResubmitReferenceSolutionContainer
-                              id={referenceSolution.id}
-                              isDebug={true}
-                              locale={locale}
-                            />
-                          )}
+                          <ResubmitReferenceSolutionContainer
+                            id={referenceSolution.id}
+                            isDebug={true}
+                            locale={locale}
+                          />
                         </TheButtonGroup>
                       </div>
                     )}

diff --git a/src/pages/Solution/Solution.js b/src/pages/Solution/Solution.js
@@ -13,7 +13,7 @@ import AcceptSolutionContainer from '../../containers/AcceptSolutionContainer';
 import ReviewSolutionContainer from '../../containers/ReviewSolutionContainer';
 import ResubmitSolutionContainer from '../../containers/ResubmitSolutionContainer';
 import FetchManyResourceRenderer from '../../components/helpers/FetchManyResourceRenderer';
-import Button, { TheButtonGroup } from '../../components/widgets/TheButton';
+import { TheButtonGroup } from '../../components/widgets/TheButton';
 
 import { fetchRuntimeEnvironments } from '../../redux/modules/runtimeEnvironments';
 import { fetchAssignmentIfNeeded } from '../../redux/modules/assignments';
@@ -35,7 +35,6 @@ import {
 import { evaluationsForSubmissionSelector, fetchManyStatus } from '../../redux/selectors/submissionEvaluations';
 import { assignmentSubmissionScoreConfigSelector } from '../../redux/selectors/exerciseScoreConfig';
 
-import { ENV_CS_DOTNET_CORE_ID } from '../../helpers/exercise/environments';
 import { hasPermissions } from '../../helpers/common';
 import { SolutionResultsIcon, WarningIcon } from '../../components/icons';
 
@@ -130,24 +129,13 @@ class Solution extends Component {
                             userId={solution.authorId}
                             locale={locale}
                           />
-
-                          {solution.runtimeEnvironmentId ===
-                          ENV_CS_DOTNET_CORE_ID /* temporary disable debug resubmits of .NET Core */ ? (
-                            <Button disabled={true}>
-                              <FormattedMessage
-                                id="app.solution.dotnetResubmitTemporaryDisabled"
-                                defaultMessage="Debug Resubmit Temporary Disabled"
-                              />
-                            </Button>
-                          ) : (
-                            <ResubmitSolutionContainer
-                              id={solution.id}
-                              assignmentId={assignment.id}
-                              isDebug={true}
-                              userId={solution.authorId}
-                              locale={locale}
-                            />
-                          )}
+                          <ResubmitSolutionContainer
+                            id={solution.id}
+                            assignmentId={assignment.id}
+                            isDebug={true}
+                            userId={solution.authorId}
+                            locale={locale}
+                          />
                         </>
                       )}
                   </TheButtonGroup>