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

Small UI Changes #4404

Merged
merged 3 commits into from
Nov 8, 2017
Merged

Small UI Changes #4404

merged 3 commits into from
Nov 8, 2017

Conversation

madd15
Copy link
Contributor

@madd15 madd15 commented Nov 8, 2017

This is 2 of the 3 issues from #4403

I'm not 100% sure on the ramification of removing the min-height from the Assets by status box

As always let me know if I need to change or revert anything.

Removed min-height from Assets by Status
@madd15 madd15 requested a review from snipe as a code owner November 8, 2017 20:40
@@ -178,7 +178,7 @@ class="table table-striped snipe-table"
</div> <!--/row-->
<div class="row">
<div class="col-md-6">
<div class="box box-default" style="min-height: 400px;">
Copy link
Owner

Choose a reason for hiding this comment

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

Why are you removing this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

As min-height is set when you collapse the box it doesn't collapse only hides the content, if there is a better way i'm happy to change it back

Copy link
Owner

Choose a reason for hiding this comment

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

Hm. Yeah, I can see what you mean. Unfortunately that pie chart can show up funny on some browsers if a min height isn't set. Maybe put it inside of a div that has a min-height (within the box-default div)

Copy link
Contributor Author

@madd15 madd15 Nov 8, 2017

Choose a reason for hiding this comment

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

How about attaching the min-height to the box-body instead of the entire box? save adding another div

Copy link
Owner

Choose a reason for hiding this comment

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

Give it a try - if it works, I'm cool with it

Copy link
Contributor Author

@madd15 madd15 Nov 8, 2017

Choose a reason for hiding this comment

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

i pushed the change anyways :D

Copy link
Owner

Choose a reason for hiding this comment

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

:-P

@@ -513,7 +513,7 @@
@endcan

@can('backend.interact')
<li>
<li class="treeview">
Copy link
Owner

Choose a reason for hiding this comment

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

What does this actually do?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

this fixes the rounded corner on the settings menu

Copy link
Contributor Author

Choose a reason for hiding this comment

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

this is also used on the Assets and Reports menus

Copy link
Owner

Choose a reason for hiding this comment

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

Ahh, right! Thanks!

@snipe snipe merged commit 59c9c22 into snipe:develop Nov 8, 2017
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