diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index c8cf178..c060696 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -45,11 +45,69 @@ body { } .sign-up { - height: 10%; - width: 20%; + padding: 1%; + width: 30%; font-size: 20px; + text-decoration: none; + background-color: white; + text-align: center; + border-radius: 5px; } +.new-user { + background-color: $color2; + display: flex; + flex-direction: row; + align-items: center; + height: 75%; + width: 100%; + border: 1px solid black; + border-radius: 5px; +} + +.new-user form { + width: 50%; + height: 50%; + padding-left: 30%; +} + +label { + text-align: center; + width: 100px; + float: left; + font-weight: bold; + padding-right: 50px; + font-size: 25px; +} + +.field input { + width: 50%; + height: 50%; + float: left; + border-radius: 5px; +} + +.field { + clear: both; + padding: 20px; +} + +.subscribe { + padding-top: 20px; + margin-top: 4%; + width: 25%; + font-size: 30px; +} + +// label { +// margin-right: 2%; +// } +// +// input { +// vertical-align: top; +// +// } + @media only screen and (min-device-width : 320px) and (max-device-width : 480px) { .home { flex-direction: column; diff --git a/app/views/home/show.html.erb b/app/views/home/show.html.erb index 29edec2..6b529e1 100644 --- a/app/views/home/show.html.erb +++ b/app/views/home/show.html.erb @@ -6,14 +6,15 @@
- <%= @joke.question %> + Q: <%= @joke.question %>
- <%= @joke.answer %> + A: <%= @joke.answer %>
- + <%= link_to "Sign Up!", new_user_path, class: "sign-up" %> + diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 6f08183..da701d9 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -1,16 +1,35 @@ - -<%= form_for @user do |f| %> - <%= f.label :email %> - <%= f.text_field :email %> - <%= f.label :password %> - <%= f.password_field :password %> - <%= f.label :password_confirmation %> - <%= f.password_field :password_confirmation %> - <%= f.label :phone %> - <%= f.text_field :phone %> - <%= f.submit "Subscribe" %> -<% end %> +
+
+ +
+ +
+ <%= form_for @user do |f| %> +
+ <%= f.label :email %> + <%= f.text_field :email %> +
+ +
+ <%= f.label :password %> + <%= f.password_field :password %> +
+ +
+ <%= f.label :password_confirmation %> + <%= f.password_field :password_confirmation %> +
+ +
+ <%= f.label :phone %> + <%= f.text_field :phone %> +
+ + <%= f.submit "Subscribe", class: "subscribe" %> + <% end %> +
+