Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Harleyg321 feature/temp control #523

Merged
merged 9 commits into from
Mar 30, 2020

Conversation

UnchartedBull
Copy link
Owner

No description provided.

margin: 0 auto;
border: solid 0.6vw;
border-radius: 3vw;
margin-top: 5vh;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
margin-top: 5vh;

Part of the changes you've made seem to have moved the controller box down the screen, removing the top margin gets it back to the center again.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, it was moving the image inside the table that did it.

If you keep the image inside the table, I suggest making this change. If you move the image outside the table as in my other review comment, then this change should not be made.

Comment on lines 32 to 38
[matRippleUnbounded]="false" />back</td>
<img [src]="'assets/' + (view === QuickControlView.HOTEND ? 'nozzle.svg' : view === QuickControlView.HEATBED ? 'heat-bed.svg' : 'fan.svg')"
class="quick-control__center-icon-small">
</tr>
</table>
<div class="quick-control__controller">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<td class="top-bar__back"><img src="assets/back.svg" class="top-bar__back-icon" matRipple
[matRippleUnbounded]="false" />back</td>
<img [src]="'assets/' + (view === QuickControlView.HOTEND ? 'nozzle.svg' : view === QuickControlView.HEATBED ? 'heat-bed.svg' : 'fan.svg')"
class="quick-control__center-icon-small">
</tr>
</table>
<div class="quick-control__controller">
<td class="top-bar__back"><img src="assets/back.svg" class="top-bar__back-icon" matRipple
[matRippleUnbounded]="false" />back</td>
</tr>
</table>
<img [src]="'assets/' + (view === QuickControlView.HOTEND ? 'nozzle.svg' : view === QuickControlView.HEATBED ? 'heat-bed.svg' : 'fan.svg')"
class="quick-control__center-icon-small">
<div class="quick-control__controller">

Currently the icon doesn't display. Moving rows 34/35 down 2 rows so the image is outside the table fixes the issue.

Alternatively, changing the class to top-bar__center-icon and keeping it where it is inside the table row gets it to display although it then isn't centered.

@UnchartedBull
Copy link
Owner Author

Somehow messed it up with the icon. I moved it into the table and everything is working for me now :) Will be released in 1.4.1 (should be in the next couple of days). And once again: Closes #259

@UnchartedBull UnchartedBull merged commit f972fa5 into master Mar 30, 2020
@UnchartedBull UnchartedBull deleted the harleyg321-feature/temp_control branch March 30, 2020 07:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants