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 829
    • Issues 829
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 60
    • Merge Requests 60
  • 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
  • !348

Closed
Opened 1 week ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/GiddyGiraffe](bug): Removed height from login component to stop overflow on TOS button

Closes minds#450 (closed)

image

The above button was previously cut off

We could possibly get rid of the margin too, but I decided to leave it in to be safe. Let me know.

Edited 1 week 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 fix-slight-tos-cutoff-onboarding
git checkout -b benhayward.ben/front-fix-slight-tos-cutoff-onboarding 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-fix-slight-tos-cutoff-onboarding

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:fix-slight-tos-cutoff-onboarding into master
  • Email patches
  • Plain diff
Pipeline #67204271 passed for bd971963 on benhayward.ben:fix-slight-tos-cutoff-onboarding
    Requires approval from Devs. Approved by
    Mark Harding
    Mark Harding
    Marcelo Rivera
    Marcelo Rivera
    Martin Santangelo
    Martin Santangelo
    Brian Hatchet
    Brian Hatchet
    Emiliano Balbuena
    Emiliano Balbuena

    Closed by Mark Harding 1 hour ago

    The changes were not merged into master

    Allows commits from members who can merge to the target branch

    Did not close minds#450 (closed)

    Deletes source branch

    • Discussion 2
    • Commits 3
    • Pipelines 3
    • Changes 1
    1/2 discussions resolved
    • Loading...
    • Ben Hayward @benhayward.ben changed the description 1 week ago

      changed the description

    • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 1 week ago

      approved this merge request

    • Marcelo Rivera @eiennohi approved this merge request 1 week ago

      approved this merge request

    • Mark Harding
      Mark Harding @markeharding started a discussion on the diff 1 day ago
      Resolved by Ben Hayward 1 day ago
    • Ben Hayward @benhayward.ben added 1 commit 1 day ago

      added 1 commit

      • 3afacb06 - updated to meet feedback

      Compare with previous version

    • Ben Hayward @benhayward.ben resolved all discussions 1 day ago

      resolved all discussions

    • Mark Harding
      Mark Harding @markeharding started a discussion on an old version of the diff 23 hours ago
      Last updated by Ben Hayward 2 hours ago
      src/app/modules/auth/login.component.scss
      12 12 display: flex;
      13 13 max-width: 990px;
      14 14 flex-direction: row;
      15 height: 100%;
      15 min-height: 100&;
      • Mark Harding
        Mark Harding @markeharding · 23 hours ago
        Owner

        100&?

      • Ben Hayward @benhayward.ben changed this line in version 3 of the diff 2 hours ago

        changed this line in version 3 of the diff

      Please register or sign in to reply
    • Ben Hayward @benhayward.ben added 1 commit 2 hours ago

      added 1 commit

      • bd971963 - Update login.component.scss

      Compare with previous version

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

      approved this merge request

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

      unapproved this merge request

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

      approved this merge request

    • Mark Harding @markeharding closed 1 hour ago

      closed

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