Skip to content

Commit

Permalink
Merge pull request #103 from Anastasia-Demetriou/last_updates
Browse files Browse the repository at this point in the history
homepage looking normal again
  • Loading branch information
alicezoe authored Nov 29, 2018
2 parents 85c875f + 77fc3ef commit becaf90
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
7 changes: 6 additions & 1 deletion app/assets/stylesheets/components/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,12 @@ input.button {
.edit-form{
display: flex;
width: 100% !important;
.currencyinput {
border: 1px inset #ccc;
}
.currencyinput input {
border: 0;
}
}

.user_first_name {
Expand All @@ -195,4 +201,3 @@ input#user_photo {

}


2 changes: 1 addition & 1 deletion app/assets/stylesheets/pages/home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}

.banner {
margin: auto;
margin-left: 40px;
height: calc(100vh - 150px);
background-repeat: no-repeat;
}
Expand Down
4 changes: 4 additions & 0 deletions app/views/events/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,20 @@
placeholder: "Description",
input_html: { class: "form-inputs" } %>
<div class="edit-form">
<span class="currencyinput">£<input type="text" name="currency">
<%= f.input :min_price,
label: false,
required: false,
placeholder: "Minimum Price",
input_html: { class: "form-inputs" } %>
</span>
<span class="currencyinput">£<input type="text" name="currency">
<%= f.input :max_price,
label: false,
required: false,
placeholder: "Maximum Price",
input_html: { class: "form-inputs" } %>
</span>
</div>
<div class="edit-form">
<%= f.input :date,
Expand Down

0 comments on commit becaf90

Please sign in to comment.