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

Improve layout of buttons for two factor auth #4865

Merged
merged 1 commit into from
May 16, 2017

Conversation

MorrisJobke
Copy link
Member

Before:

bildschirmfoto 2017-05-14 um 22 13 07

bildschirmfoto 2017-05-14 um 22 12 46

After:

bildschirmfoto 2017-05-14 um 22 16 42

bildschirmfoto 2017-05-14 um 22 14 33

@MorrisJobke MorrisJobke added 3. to review Waiting for reviews design Design, UI, UX, etc. papercut Annoying recurring issue with possibly simple fix. labels May 15, 2017
@MorrisJobke MorrisJobke added this to the Nextcloud 12.0 milestone May 15, 2017
@mention-bot
Copy link

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

@ChristophWurst
Copy link
Member

For some reason the logout button looks different depending on whether backup codes are active. If they are, the button takes up 100% of the box (like on your screenshot). If it's inactive, it's narrower:

bildschirmfoto von 2017-05-15 07-37-02

Copy link
Member

@jancborchardt jancborchardt left a comment

Choose a reason for hiding this comment

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

Looks good except my detail comment and what @ChristophWurst said! :)

color: rgba(255, 255, 255, 0.75);
}
.two-factor-link a.button {
Copy link
Member

Choose a reason for hiding this comment

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

This doesn’t need to be that specific, can be simply .two-factor-link .button (without the a)

@MorrisJobke MorrisJobke self-assigned this May 15, 2017
@codecov
Copy link

codecov bot commented May 15, 2017

Codecov Report

Merging #4865 into master will decrease coverage by <.01%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master    #4865      +/-   ##
============================================
- Coverage     54.19%   54.18%   -0.01%     
+ Complexity    22168    22155      -13     
============================================
  Files          1364     1363       -1     
  Lines         84853    84842      -11     
  Branches       1322     1322              
============================================
- Hits          45984    45970      -14     
- Misses        38869    38872       +3
Impacted Files Coverage Δ Complexity Δ
core/Middleware/TwoFactorMiddleware.php 85.29% <0%> (-3.28%) 16% <0%> (-1%)
lib/private/Accounts/AccountManager.php 47.41% <0%> (-2.59%) 34% <0%> (-1%)
lib/private/App/DependencyAnalyzer.php 94.33% <0%> (-1.26%) 63% <0%> (ø)
core/js/js.js 61.21% <0%> (-0.57%) 0% <0%> (ø)
...amework/Middleware/Security/SecurityMiddleware.php 78.2% <0%> (-0.28%) 26% <0%> (-1%)
lib/private/User/User.php 84.41% <0%> (-0.2%) 60% <0%> (ø)
core/templates/update.use-cli.php 0% <0%> (ø) 0% <0%> (ø) ⬇️
apps/twofactor_backupcodes/appinfo/app.php
.../twofactor_backupcodes/lib/AppInfo/Application.php
settings/ajax/installapp.php 0% <0%> (ø) 0% <0%> (?)
... and 8 more

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke
Copy link
Member Author

Fixed all comments.

@MorrisJobke MorrisJobke removed their assignment May 15, 2017
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

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

Tested and works! Looks a lot better now, thanks :)

Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

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

🎈

@rullzer rullzer merged commit fd74428 into master May 16, 2017
@MariusBluem MariusBluem deleted the improve-two-factor-buttons branch May 16, 2017 11:16
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. papercut Annoying recurring issue with possibly simple fix.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix two factor button layout
5 participants