Skip to content
Snippets Groups Projects

Homogenize sort and filter dropdown toggles

2 unresolved threads

What does this MR do?

Homogenizes the style of filter and sort dropdown toggles (aka buttons) related to:

  • issues (index, new & edit views)
  • issue boards (index);
  • merge requests (index, new, edit);
  • projects (index and "explore");
  • projects admin (index);
  • groups (show and "explore");
  • groups admin (index);
  • users admin (index);
  • todos (index);
  • branches (index);
  • commits (index);
  • cycle analytics;
  • network;
  • forks;
  • tags (index);
  • global search

Some other dropdowns are incidently concerned:

  • project admin (show);
  • assigne/due date/milestone/label dropdowns on the issue and board sidebars;
  • stage dropdown on the build sidebar;
  • merge request and comparison dropdowns for choosing forks and branches;
  • ref switcher (e.g. in the blob (show) view or in the graphs view);

Dropdown toggles concerned by #24150 (moved) but not covered in this MR:

  • Dropdowns for selection MR versions to be compared (in the "Changes" tab of an MR);
  • Dropdowns that bring up a list of actions:
    • "Settings" dropdowns (such as the one found on the upper-right corner of all project pages);
    • The download/action/notifications buttons on the main project page;
    • Dropdowns located inside of list items (on list of pipelines, users and groups, for instance);
    • The "Options" button on the commit (show) view;
    • The "+" button on the tree explorer (for creating files, branches, tags, ...)

TODO

  • Update ui.html if needed

Are there points in the code the reviewer needs to double check?

Am I changing any other dropdown toggle than listed above?

Why was this MR needed?

For #24150 (moved)

Screenshots (if relevant)

Issue Index

Before: issue-index-before

After: issue-index-after

Issue New

Before: issue-new-before

After: issue-new-after

Merge Request Branch Selector

Before: merge-request-new-before

After: merge-request-new-after

Global Search

global-search-after

Cycle Analytics

cycle-analytics-after

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

#24150 (moved)

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
199 199 }
200 200
201 201 .fa-caret-down,
202 .fa-caret-up {
202 .fa-chevron-down {
  • Checked it out and this looks good to me :ok_hand:

    Any reason for splitting this work up into separate MRs?

    Until we get the rest done, we'll have to deal with some slightly jarring inconsistencies like this one: Screen_Shot_2016-11-23_at_10.12.24_AM

    Whoever does the merge, make sure it doesn't automatically close #24150 (moved).

    Reassigning to @annabeldunstone

  • @mikegreiling: My understanding is there is concern about some drop downs that currently have a grey background (https://gitlab.com/gitlab-org/gitlab-ce/issues/24150#note_18599304) but are next to buttons that also have a grey background. There is discussion about the button styling (https://gitlab.com/gitlab-org/gitlab-ce/issues/24145), but until that work gets sorted out, we think it will be bizarre to have white drop downs in between grey buttons. So I agree that there are some drop downs that may take some time to update.

    However, I guess I don't understand why the dropdown in the screenshot you have is misaligned, and styled with the old dropdown chevron (since it is white).

    Super excited to moving towards consistent drop downs! :smile:

  • Added 1 commit:

    • 6ca64997 - dropdowns.scss: Fix style issues after review

    Compare with previous version

  • Thanks a lot to whoever started adding the screenshots!

    @annabeldunstone I pushed a new patch removing the superfluous blank lines.

    @mikegreiling the reasons are indeed those explained by @awhildy and also the fact that I'd be more confortable going step by step (less risky, IMHO, and faster to merge what is enhanced). After all, most modified dropdowns are related to sort/filter of issues and MR and most ones that are not modified are not related.

  • 8 8 }
    9 9 }
    10 10
    11 @mixin chevron-active {
    12 .fa-chevron-down {
    13 color: $dropdown-toggle-hover-icon-color;
    14 }
    15 }
  • They look awesome, thanks @deubeuliou! Excited to get them rolled out to the rest of the app :slight_smile:

  • @deubeuliou thanks! Could you resolve the conflicts? Then we can get this merged in

  • @annabeldunstone sure. Do you prefer a rebase or a merge for resolving conflicts?

  • @deubeuliou rebase would be great!

  • Added 526 commits:

    • 6ca64997...4fddd9b7 - 521 commits from branch gitlab-org:master
    • b3ed4e0c - Homogenize dropdowns on Issue page
    • 4c6468aa - Make open and hovered dropdown toggles look the same
    • a3a85c07 - Update the Changelog
    • be0fb391 - Update some more sort/filter dropdowns
    • 92704298 - dropdowns.scss: Fix style issues after review

    Compare with previous version

  • @anabeldunstone done :)

  • Annabel Gray Enabled an automatic merge when the build for 92704298 succeeds

    Enabled an automatic merge when the build for 92704298 succeeds

  • Annabel Gray Status changed to merged

    Status changed to merged

  • Annabel Gray Mentioned in commit 63f5c4ea

    Mentioned in commit 63f5c4ea

  • Annabel Gray Milestone changed to %8.15

    Milestone changed to %8.15

  • Chris Peressini mentioned in merge request !10324 (merged)

    mentioned in merge request !10324 (merged)

  • Chris Peressini mentioned in merge request !13628 (merged)

    mentioned in merge request !13628 (merged)

  • Please register or sign in to reply
    Loading