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
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 820
    • Issues 820
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 62
    • Merge Requests 62
  • 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
  • !318

Open
Opened 2 weeks ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

WIP: [Sprint/FunnyFrog](feat): Updated the styling of the discovery to add clarity #1326

Closes #1326

Edited 4 minutes ago by Ben Hayward

Check out, review, and merge locally

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

git fetch https://gitlab.com/benhayward.ben/front.git discovery-selector-restyle-1326
git checkout -b benhayward.ben/front-discovery-selector-restyle-1326 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 benhayward.ben/front-discovery-selector-restyle-1326

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 benhayward.ben:discovery-selector-restyle-1326 into master
The source branch is 43 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #65768832 (#894) running for 120c7abc on benhayward.ben:discovery-selector-restyle-1326
    Requires 2 more approvals from Devs.
    Emiliano Balbuena
    Emiliano Balbuena
    Martin Santangelo
    Martin Santangelo
    Mark Harding
    Mark Harding
    Marcelo Rivera
    Marcelo Rivera
    Brian Hatchet
    Brian Hatchet
    This is a Work in Progress

    Allows commits from members who can merge to the target branch

    Closes #1326

    Deletes source branch

    You can merge this merge request manually using the
    • Discussion 2
    • Commits 5
    • Pipelines 5
    • Changes 6
    • Loading...
    • Ben Hayward @benhayward.ben changed the description 2 weeks ago

      changed the description

    • Ben Hayward @benhayward.ben changed the description 2 weeks ago

      changed the description

    • Ben Hayward @benhayward.ben added 1 commit 2 weeks ago

      added 1 commit

      • a15090c3 - Fixing up discovery selector #1326

      Compare with previous version

    • Ben Hayward @benhayward.ben added 1 commit 2 weeks ago

      added 1 commit

      • f32d65e6 - Fixed up for channels and changed the algorithm filter

      Compare with previous version

    • Ben Hayward @benhayward.ben added 1 commit 2 weeks ago

      added 1 commit

      • d200862b - Updated theming

      Compare with previous version

    • Ben Hayward @benhayward.ben added 1 commit 5 minutes ago

      added 1 commit

      • 120c7abc - matched mockup visually

      Compare with previous version

    • Ben Hayward
      Ben Hayward @benhayward.ben · 4 minutes ago
      Developer

      image

      image

    • Ben Hayward @benhayward.ben changed the description 4 minutes ago

      changed the description

    • Ben Hayward
      Ben Hayward @benhayward.ben · 3 minutes ago
      Developer

      Just got an issue at the moment with being unable to click on the top dropdown - I'm thinking we could have the menu pop up on hover, but will experiment and see how it feels.

    • 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
    0
    Labels
    None
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    6
    6 participants
    user avatar
    Emiliano Balbuena
    user avatar
    Martin Santangelo
    user avatar
    Mark Harding
    user avatar
    Marcelo Rivera
    user avatar
    Brian Hatchet
    user avatar
    Ben Hayward
    Reference: minds/front!318