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 808
    • Issues 808
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 52
    • Merge Requests 52
  • 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

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

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

closes #1507 (closed)

  • 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
Request to merge chore/channel-button-ui-1507 into master
  • Email patches
  • Plain diff
Pipeline #71146819 passed for cacdc10e on chore/channel-button-ui-1507
          Merge request approved. Approved by
          Mark Harding
          Mark Harding
          Emiliano Balbuena
          Emiliano Balbuena
          Brian Hatchet
          Brian Hatchet
          Ben Hayward
          Ben Hayward
          Martin Santangelo
          Martin Santangelo
          Marcelo Rivera
          Marcelo Rivera

          Merged by Mark Harding 1 hour ago

          The changes were merged into master with ae736311

          The source branch has been deleted

          Closed #1507 (closed)

          Pipeline #71191070 passed for ae736311 on master
                • 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 10 hours 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 · 9 hours 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

                • Mark Harding @markeharding approved this merge request 1 hour ago

                  approved this merge request

                • Mark Harding @markeharding merged 1 hour ago

                  merged

                • Mark Harding @markeharding mentioned in commit ae736311 1 hour ago

                  mentioned in commit ae736311

                • 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
                Brian Hatchet
                user avatar
                Ben Hayward
                user avatar
                Martin Santangelo
                user avatar
                Marcelo Rivera
                user avatar
                Mark Harding
                user avatar
                Olivia Madrid
                Reference: minds/front!449

                Revert this merge request

                This will create a new commit in order to revert the existing changes.

                Switch branch
                Cancel
                A new branch will be created in your fork and a new merge request will be started.

                Cherry-pick this merge request

                Switch branch
                Cancel
                A new branch will be created in your fork and a new merge request will be started.