Skip to content

Commit

Permalink
Merge branch 'tests/caminhos-tristes' of https://github.com/leogirald…
Browse files Browse the repository at this point in the history
…img/Spottapp into tests/caminhos-tristes
  • Loading branch information
natalypatti committed Dec 4, 2019
2 parents dd256da + c3a9965 commit 7ec7287
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/app/app/assets/stylesheets/spotted.scss
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,11 @@ h2.title {

#show .container-right .scroll {
width: 100%;
height: calc(100% - 60px);
height: -moz-calc(100% - 60px);
height: -webkit-calc(100% - 60px);
height: calc(100% - 66px);
height: -moz-calc(100% - 66px);
height: -webkit-calc(100% - 66px);
height: -o-calc(100% - 60px);
padding-top: 10px;
overflow: auto;
}

Expand Down
1 change: 1 addition & 0 deletions src/app/features/step_definitions/sign_up_steps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
steps %Q{
Given I am on the create account page
When I fill the user registration form
And I attach a profile picture
And I click the Cadastrar button
Then I should see the welcome page
}
Expand Down

0 comments on commit 7ec7287

Please sign in to comment.