Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 817
    • Issues 817
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 69
    • Merge Requests 69
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Packages
    • Packages
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds FrontendMinds Frontend
  • Merge Requests
  • !383

Open
Opened 4 days ago by Max Nurzia@mnurzia1
  • Report abuse
Report abuse

(wip) Sort selector rework

New sort-selector interface.

Desktop/Tablet: new ui

Mobile:

new ui mobile

Notably this is still missing some kind of distinction between the algorithms and custom types selectors, as well as the settings icon being in an awkward location, both of which I plan to address soon.

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://gitlab.com/mnurzia/front.git sort-selector-rework
git checkout -b mnurzia/front-sort-selector-rework FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/master
git merge --no-ff mnurzia/front-sort-selector-rework

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Request to merge mnurzia:sort-selector-rework into master
The source branch is 13 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #68560747 failed for f2e75c32 on mnurzia:sort-selector-rework
      Requires 2 more approvals from Devs and Deployers.
      Martin Santangelo
      Martin Santangelo
      Emiliano Balbuena
      Emiliano Balbuena
      Ben Hayward
      Ben Hayward
      Marcelo Rivera
      Marcelo Rivera
      Mark Harding
      Mark Harding
      Ready to be merged automatically. Ask someone with write access to this repository to merge this request
      • Discussion 4
      • Commits 1
      • Pipelines 1
      • Changes 2
      0/3 discussions resolved
      • Loading...
      • Mark Harding @markeharding added MR::Awaiting Review label 1 day ago

        added MR::Awaiting Review label

      • Mark Harding
        Mark Harding @markeharding started a discussion on the diff 1 hour ago
        src/app/common/components/sort-selector/sort-selector.component.scss
        7 7 > :last-child {
        8 8 margin-left: auto;
        9 9 }
        10
        10
        11 11 .m-dropdown--list--item {
        12 12 cursor: pointer;
        13 &.m-sort-selector--custom-type-item,
        • Mark Harding
          Mark Harding @markeharding · 1 hour ago
          Owner

          sounds like this should be moved up a level? I don't think it need to be inside the .m-dropdown--list--item block

        Please register or sign in to reply
      • Mark Harding
        Mark Harding @markeharding started a discussion on the diff 1 hour ago
        src/app/common/components/sort-selector/sort-selector.component.scss
        8 8 margin-left: auto;
        9 9 }
        10
        10
        11 11 .m-dropdown--list--item {
        12 12 cursor: pointer;
        13 &.m-sort-selector--custom-type-item,
        14 &.m-sort-selector--algorithm-item {
        15 width: auto;
        16 display: block;
        17 text-align: center;
        18 .m-sort-selector--item-label-icon {
        19 margin-right: 0px;
        20 margin-inline: 8px;
        21 }
        22 }
        • Mark Harding
          Mark Harding @markeharding · 1 hour ago
          Owner

          spacing (make sure you use spaces and not tabs)

          Edited by Mark Harding 1 hour ago
        Please register or sign in to reply
      • Mark Harding
        Mark Harding @markeharding started a discussion on the diff 1 hour ago
        src/app/common/components/sort-selector/sort-selector.component.scss
        61 83
        62 84 .m-sort-selector--algorithm-dropdown,
        63 85 .m-sort-selector--period-dropdown {
        64 .m-dropdown--list {
        86 .li {
        • Mark Harding
          Mark Harding @markeharding · 1 hour ago
          Owner

          can you double check this?

        Please register or sign in to reply
      • Mark Harding
        Mark Harding @markeharding · 1 hour ago
        Owner

        Nice start @mnurzia ! Left some comments for you

      • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
      Please register or sign in to reply
      Assignee
      None
      Assign to
      None
      Milestone
      None
      Assign milestone
      None
      Time tracking
      No estimate or time spent
      1
      Labels
      MR::Awaiting Review
      Assign labels
      • View project labels
      Lock merge request
      Unlocked
      7
      7 participants
      user avatar
      Martin Santangelo
      user avatar
      Emiliano Balbuena
      user avatar
      Ben Hayward
      user avatar
      Marcelo Rivera
      user avatar
      Mark Harding
      user avatar
      Brian Hatchet
      user avatar
      Max Nurzia
      Reference: minds/front!383