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

Change layout to bootstrap's grid system #923

Merged
merged 30 commits into from
May 11, 2021
Merged

Change layout to bootstrap's grid system #923

merged 30 commits into from
May 11, 2021

Conversation

CloCkWeRX
Copy link
Member

@CloCkWeRX CloCkWeRX commented May 9, 2021

Fixes #465

Changes:

Before:
image

After:
image

Smaller device:
image

The sidebar now appears at the bottom:
image

Nav menu open (hamburger menu icon is a bit ugly still)
image

@CloCkWeRX CloCkWeRX changed the title Change layout2 Change layout to bootstrap's grid system May 9, 2021
@CloCkWeRX CloCkWeRX requested a review from steveyken May 9, 2021 05:12
@CloCkWeRX
Copy link
Member Author

Might need a bit more work actually; on the view-entity screens, when its small screen:
image

Will have a think about the best ways to differ between sidebar filters on list view; vs these.

@CloCkWeRX
Copy link
Member Author

Ok, that should be a bit better.

For the entities, the former sidebar content is now part of the main show
image

On mobile:
image

The other links are pushed to the bottom appropriately.

I think #924 might need to be done for the saves that work, as it's not even a failure on further testing but looks like the system is telling me off.

@CloCkWeRX CloCkWeRX requested a review from johnbumgardner May 10, 2021 10:08
Copy link
Member

@johnbumgardner johnbumgardner left a comment

Choose a reason for hiding this comment

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

I had one question/concern about some hard to understand code in one of the haml files, but it may not be applicable. I pulled the code locally, and checked it on my iPhone XR and it works like a champ. I clicked through everything and it seems to work without much trouble.

%tt #{t :assigned_to}:
%dl
%li
%dt= pipeline != 0.0 ? number_to_currency(pipeline, precision: 0) : t(:n_a)
Copy link
Member

Choose a reason for hiding this comment

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

can we use unless pipeline.zero? instead. might make the code more readable and ruby-esque

Copy link
Member

Choose a reason for hiding this comment

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

Yes that's a good idea.

Copy link
Member Author

Choose a reason for hiding this comment

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

I broadly just lifted and shifted existing code (here its mostly just adding a dl element; so it can be stuck into a flexbox model); but how about we put that into the rubocop rules/apply that globally?

Copy link
Member Author

Choose a reason for hiding this comment

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

I've captured this one in #929 so we can do wider cleanup

@johnbumgardner
Copy link
Member

Instead of that hamburger icon logo, could we have users click on the logo for ffcrm?

Copy link
Member

@steveyken steveyken left a comment

Choose a reason for hiding this comment

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

Huge effort. Great to see the screenshots. Thank you

@CloCkWeRX
Copy link
Member Author

Instead of that hamburger icon logo, could we have users click on the logo for ffcrm?

Yeah, its currently at the point it 'works' but it's ugly, so keen to style it better.

Raised #928 to really focus on the whole header more, particularly on mobile.

@CloCkWeRX
Copy link
Member Author

Ok, I might merge this now with a view to start work on the improvements discussed this week.

I'm pretty confident all of the feature tests actually pass; they are just flakey on CI - different failures for different runs.

@CloCkWeRX CloCkWeRX merged commit bda5b0a into master May 11, 2021
@CloCkWeRX CloCkWeRX deleted the change-layout2 branch October 4, 2021 04:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants