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

Use flexbox for header and rearrange some elements #2924

Merged
merged 8 commits into from
Jan 23, 2017
Merged

Conversation

ChristophWurst
Copy link
Member

this is just a little cleanup for #207

@ChristophWurst ChristophWurst added 2. developing Work in progress design Design, UI, UX, etc. labels Jan 3, 2017
@ChristophWurst ChristophWurst added this to the Nextcloud 12.0 milestone Jan 3, 2017
@mention-bot
Copy link

@ChristophWurst, thanks for your PR! By analyzing the history of the files in this pull request, we identified @jancborchardt, @Henni and @nickvergessen to be potential reviewers.

@@ -125,7 +124,6 @@ body {
.searchbox input[type="search"]:valid {
color: #fff;
width: 155px;
max-width: 50%;
Copy link
Member Author

Choose a reason for hiding this comment

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

@skjnldsv if this line is active, the input is narrower on the right, which means some space between the input and the settings menu shows ups. Any idea what might cause that? I've tried different fixes but none solved it so far. The max-width is needed for narrow window sizes like on mobile to prevent the input take up too much space.

Copy link
Member

Choose a reason for hiding this comment

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

Will look into it asap

Copy link
Member

Choose a reason for hiding this comment

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

Almost have it. Will push it tonight!

@nickvergessen
Copy link
Member

Did you try if this breaks the notification UI?

@ChristophWurst
Copy link
Member Author

Did you try if this breaks the notification UI?

Not yet, thanks for the hint

@skjnldsv
Copy link
Member

skjnldsv commented Jan 5, 2017

@ChristophWurst Pushed what I got so far.
You can now tweak the input width to fit. The issue is coming from it.

@ChristophWurst
Copy link
Member Author

Awesome, thank you @skjnldsv!

I added another small fix. Now it seems to work nicely, except for extremely narrow window sizes. There, the fixed search input width is too big.

@ChristophWurst
Copy link
Member Author

@nickvergessen apparently works with notifications too:
bildschirmfoto von 2017-01-09 14-18-14

@ChristophWurst ChristophWurst added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jan 9, 2017
@ChristophWurst
Copy link
Member Author

I added another small fix. Now it seems to work nicely, except for extremely narrow window sizes. There, the fixed search input width is too big.

@eppfel @jancborchardt @juliushaertl @skjnldsv not sure how much of an issue that is, but would be great if we can fix this too. Suggestions are very welcome :-)

@ChristophWurst ChristophWurst added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jan 9, 2017
@nickvergessen
Copy link
Member

Previously the notification icon was right of the search, but I guess it's okay

@ChristophWurst
Copy link
Member Author

Previously the notification icon was right of the search, but I guess it's okay

We can change that of course. https://github.com/nextcloud/notifications/blob/643b3d8e26a821a2b5257064f9b9d8804e8e044d/js/app.js#L93-L94 modifies the relevant elements.

@codecov-io
Copy link

codecov-io commented Jan 9, 2017

Current coverage is 53.92% (diff: 0.00%)

Merging #2924 into master will not change coverage

@@             master      #2924   diff @@
==========================================
  Files          1302       1302          
  Lines         80097      80097          
  Methods        7905       7905          
  Messages          0          0          
  Branches       1245       1245          
==========================================
  Hits          43189      43189          
  Misses        36908      36908          
  Partials          0          0          
Diff Coverage File Path
0% core/templates/layout.user.php
0% apps/files_sharing/templates/public.php

Powered by Codecov. Last update 250b711...db5f164

</h1>
</div>
</a>
<div class="header-left">
Copy link
Member

Choose a reason for hiding this comment

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

You use an ID for header-right, but a class here. Better would be an ID here too. :)

@@ -414,6 +412,20 @@
/* do not show display name when profile picture is present */

#header {
#header-left #header-right {
Copy link
Member

Choose a reason for hiding this comment

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

Comma and line break missing I guess? Because header-right is a sibling of header-left, and not a child.

display: flex;
}

div.header-left {
Copy link
Member

Choose a reason for hiding this comment

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

As with the comment below, use an ID. Then also remove the div part because an ID (or class) is enough to identify. :)

@jancborchardt
Copy link
Member

@ChristophWurst @skjnldsv see my detail comments. Except if this is intentional of course, but it doesn’t look like it :)

Copy link
Member

@skjnldsv skjnldsv left a comment

Choose a reason for hiding this comment

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

The search icon is a little too low.

@@ -169,7 +169,6 @@ body {
border: 0;
border-radius: 3px;
margin-top: 9px;
Copy link
Member

@skjnldsv skjnldsv Jan 17, 2017

Choose a reason for hiding this comment

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

Search box is too low.
Remove the marginTop

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

@ChristophWurst ChristophWurst added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jan 17, 2017
@skjnldsv
Copy link
Member

Very nice work!
Glad to see we're improving the css a lot! ;)

@ChristophWurst
Copy link
Member Author

I will take care of fixing Gallery in case this breaks something there too

@jancborchardt
Copy link
Member

Gallery is also effected btw 🙌

Video calls shared by link will be affected too ;) And maybe Collabora Office uses a separate template for the header too?

@ChristophWurst
Copy link
Member Author

Video calls shared by link will be affected too ;) And maybe Collabora Office uses a separate template for the header too?

then someone will fix it ;-)

Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

I rebased this, resolved the conflicts, tested it and it works like a charm 👍

@ChristophWurst Could you please check that the rebase went fine (otherwise db5f164 is the old sha sum ;))

@skjnldsv
Copy link
Member

@MorrisJobke 😍

@ChristophWurst
Copy link
Member Author

I rebased this, resolved the conflicts, tested it and it works like a charm 👍

❤️ 😗 thanks :-)

Will check it ASAP

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@ChristophWurst
Copy link
Member Author

ChristophWurst commented Jan 23, 2017

rebased again because it was conflicting with the changes from #3187

New issues:

bildschirmfoto von 2017-01-23 10-58-41

cc @nextcloud/designers

Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

I tested this again and it looks fine 👍

@MorrisJobke
Copy link
Member

It will only need a little adjustment of the notification icon in the notifications app. I will do that.

@MorrisJobke MorrisJobke merged commit d80bc6c into master Jan 23, 2017
@MorrisJobke MorrisJobke deleted the flexbox-header branch January 23, 2017 18:16
MorrisJobke added a commit to nextcloud/notifications that referenced this pull request Jan 23, 2017
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke
Copy link
Member

It will only need a little adjustment of the notification icon in the notifications app. I will do that.

nextcloud/notifications#58

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews design Design, UI, UX, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants