Skip to content

Commit

Permalink
Merge branch 'main' into issues/335-Fix_skinny_buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
loiswells97 committed Jan 16, 2023
2 parents 49e4a67 + 88c5ac3 commit c9bc99f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

- Change port number to fix 'no consent token' error (#326)
- Long file names truncated rather than scrolling in left hand file pane (#316)
- Delete project action on project index page (#330)
- Refactored project list loading to allow loading states to be shown (#330)
- Tab scrollbars only appear when necessary (#331)

### Fixed
- Make sure button text is always centered (#328)
- Touch area of icon-only buttons (#330, #336)
- Delete project action on project index page (#330)
- Refactored project list loading to allow loading states to be shown (#330)
- Removed unneeded scrollbars on the editor and output panels (#331)

## [0.10.0] - 2023-01-06

Expand Down
4 changes: 2 additions & 2 deletions src/components/Editor/Project/Project.scss
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
display: flex;
flex-flow: column;
flex: 5;
overflow-y: scroll;
overflow-y: hidden;
box-sizing: border-box;

.react-tabs__tab-panel--selected {
Expand All @@ -66,7 +66,7 @@
.proj-runner-container {
display: flex;
flex: 5;
overflow-y: scroll;
overflow-y: hidden;

.react-tabs__tab-panel--selected {
overflow-y: auto;
Expand Down
3 changes: 2 additions & 1 deletion src/components/Editor/Runners/PythonRunner/PythonRunner.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
}

.pythonrunner-console {
margin: var(--spacing-2);
padding: var(--spacing-1) var(--spacing-2);
margin: 0;
white-space: pre-wrap;
white-space: -moz-pre-wrap;
white-space: -pre-wrap;
Expand Down
3 changes: 2 additions & 1 deletion src/tabs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ $spacing-four: calc($spacing-eight / 2);
flex-flow: column;
overflow: hidden;
position: relative;
border-radius: 10px;

&__tab-inner {
@extend .btn;
Expand Down Expand Up @@ -96,7 +97,7 @@ $spacing-four: calc($spacing-eight / 2);

&__tab-list {
display: flex;
overflow-x: scroll;
overflow-x: auto;
overflow-y: hidden;
margin: 0;
}
Expand Down

0 comments on commit c9bc99f

Please sign in to comment.