Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 860
    • Issues 860
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 51
    • Merge Requests 51
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Packages
    • Packages
    • List
    • Container Registry
  • 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
  • !509

Open
Opened 3 hours ago by Max Nurzia@mnurzia1
  • Report abuse
Report abuse

(wip) Sort selector fixes

I fixed the issues outlined in !472, namely the inconsistent margins across browsers and various instances of colors not being correct. Embarrassingly, I used a CSS feature that wasn't consistent across browsers, so while it looked fine on my Firefox it didn't render correctly in Chrome. Also included is a fix for the weird diff views. I had line endings set incorrectly and was pushing CR+LF instead of just LF. I fixed these here so that the changes getting merged are LF, which is consistent with the rest of the codebase.

Screenshots:

Firefox 68.0.2, desktop:

image

image

Chrome 76.0, desktop:

image

image

Firefox 68.0.2, mobile:

image

image

Chrome 76.0, mobile:

image

image

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 52 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #77628875 failed for c7ea9303 on mnurzia:sort-selector-rework
            Requires 2 more approvals from Devs and Deployers.
            Guy Thouret
            Guy Thouret
            Marcelo Rivera
            Marcelo Rivera
            Martin Santangelo
            Martin Santangelo
            Mark Harding
            Mark Harding
            Ben Hayward
            Ben Hayward
            Ready to be merged automatically. Ask someone with write access to this repository to merge this request
            • Discussion 0
            • Commits 6
            • Pipelines 6
            • Changes 2
            • Loading...
            • 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
            0 Assignees
            None
            Assign to
            None
            Milestone
            None
            Assign milestone
            None
            Time tracking
            No estimate or time spent
            0
            Labels
            None
            Assign labels
            • View project labels
            Lock merge request
            Unlocked
            10
            10 participants
            user avatar
            Guy Thouret
            user avatar
            Marcelo Rivera
            user avatar
            Martin Santangelo
            user avatar
            Mark Harding
            user avatar
            Ben Hayward
            user avatar
            Emiliano Balbuena
            user avatar
            Olivia Madrid
            Reference: minds/front!509