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 810
    • Issues 810
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 54
    • Merge Requests 54
  • 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
  • !449

Open
Opened 4 days ago by Olivia Madrid@omadrid
  • Report abuse
Report abuse

[Sprint/InterestingIguana](chore): channel button UI adjustments

closes #1507

  • Prepares the channel sidebar to accommodate 'refer friends' button (to be added later)
  • Moved settings cog up to the right of the username (where the edit pencil is on your own channel)
  • Prevents 'complete your profile' button span from overflowing outside its border
  • Stop showing the tag icon when the user hasn't selected any hashtags
  • Deleted some styles that had been commented out for multiple years

Check out, review, and merge locally

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

git fetch origin
git checkout -b chore/channel-button-ui-1507 origin/chore/channel-button-ui-1507

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 chore/channel-button-ui-1507

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 chore/channel-button-ui-1507 into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #71146819 passed for cacdc10e on chore/channel-button-ui-1507
          Requires 2 more approvals from Devs and Deployers.
          Emiliano Balbuena
          Emiliano Balbuena
          Mark Harding
          Mark Harding
          Ben Hayward
          Ben Hayward
          Martin Santangelo
          Martin Santangelo
          Brian Hatchet
          Brian Hatchet
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Closes #1507

          • Discussion 2
          • Commits 7
          • Pipelines 3
          • Changes 6
          • Loading...
          • Olivia Madrid @omadrid changed milestone to %sprint: Interesting Iguana 4 days ago

            changed milestone to %sprint: Interesting Iguana

          • Mark Harding @markeharding added MR::Requires Changes label 3 days ago

            added MR::Requires Changes label

          • Mark Harding
            Mark Harding @markeharding · 3 days ago
            Owner

            We have some failing tests here @omadrid

          • Olivia Madrid @omadrid added 12 commits 1 hour ago

            added 12 commits

            • 01e28752...79dc4a4f - 8 commits from branch master
            • 1b8f6217 - Merge branch 'chore/channel-button-ui-1507' of gitlab.com:minds/front into...
            • f9b03e34 - Merge branch 'chore/channel-button-ui-1507' of gitlab.com:minds/front into...
            • 304341f5 - Merge branch 'master' of gitlab.com:minds/front into chore/channel-button-ui-1507
            • cacdc10e - (chore): Sidebar buttons will all wrap individually

            Compare with previous version

            Toggle commit list
          • Olivia Madrid
            Olivia Madrid @omadrid · 50 minutes ago
            Developer

            Had to remove a fix (don't show hashtag icon on profile when user hasn't selected any tags) in order to pass the tests so I don't spend too much time on this. Will just add that as a to a todo for a later date

          • 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
          sprint: Interesting Iguana
          Milestone
          sprint: Interesting Iguana
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          1
          Labels
          MR::Requires Changes
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          7
          7 participants
          user avatar
          Emiliano Balbuena
          user avatar
          Mark Harding
          user avatar
          Ben Hayward
          user avatar
          Martin Santangelo
          user avatar
          Brian Hatchet
          user avatar
          Marcelo Rivera
          user avatar
          Olivia Madrid
          Reference: minds/front!449