From c1f105b769332c62c3038e4ee898a724a23ceff1 Mon Sep 17 00:00:00 2001 From: coderrick Date: Thu, 31 Jul 2014 23:09:56 -0400 Subject: [PATCH 1/2] Made main.css resource and facebook sign in button. --- app/assets/stylesheets/main.css | 19 +++++++++++++++++++ app/views/layouts/application.html.erb | 1 + app/views/pages/home.html.erb | 24 +++++++++++++++++++----- db/schema.rb | 1 - 4 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 app/assets/stylesheets/main.css diff --git a/app/assets/stylesheets/main.css b/app/assets/stylesheets/main.css new file mode 100644 index 0000000..e0a5891 --- /dev/null +++ b/app/assets/stylesheets/main.css @@ -0,0 +1,19 @@ +h1, h4{ +text-align: center; +} +.sign-in{ +display:inline-flex; +} +#f{ + + width:50px; + background-color: #2c3e50; + border-radius:4px; + padding-top:11px; + padding-bottom:11px; + color:white; + border-color:#2c3e50; + text-align:center; + float:left; + margin-right: 2px; +} \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e0aa6df..9e629e5 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,6 +7,7 @@ + <%= csrf_meta_tags %> diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb index 4cf49c6..fc33a8f 100644 --- a/app/views/pages/home.html.erb +++ b/app/views/pages/home.html.erb @@ -1,12 +1,26 @@ <% if user_signed_in? %>

Welcome <%= current_user.name %>, you're signed in!

- <%= link_to "Click Here to Log out!", destroy_user_session_path, method: :delete %> + <%= button_to "Click Here to Log out!", destroy_user_session_path, :class => "btn btn-primary", method: :delete %> <%= link_to "Click Here to make an event", "/events/new" %> <% else %> -
-

This is Project PHL's Homepage

-

Yo

- <%= link_to "Log in with Facebook", user_omniauth_authorize_path(:facebook) %> +
+
+
+
+
+
+
+
+

Game On lets people connect with one another through competitive sport.

+

Try it out!

+
+
+
+ +
<% end %> diff --git a/db/schema.rb b/db/schema.rb index bad60e9..5c763cc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -34,7 +34,6 @@ create_table "events", force: true do |t| t.float "latitude" t.float "longitude" - #We didn't create a migration for long and lat t.string "location" t.datetime "starts_at" t.string "details" From 49b37b167ee4811002175e1a883e433727744b85 Mon Sep 17 00:00:00 2001 From: coderrick Date: Thu, 31 Jul 2014 23:50:24 -0400 Subject: [PATCH 2/2] Layout issue with fb button taken care of. --- app/assets/stylesheets/main.css | 2 +- app/views/pages/home.html.erb | 49 ++++++++++++++++++--------------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/app/assets/stylesheets/main.css b/app/assets/stylesheets/main.css index e0a5891..b4c4ef4 100644 --- a/app/assets/stylesheets/main.css +++ b/app/assets/stylesheets/main.css @@ -1,4 +1,4 @@ -h1, h4{ +.h4{ text-align: center; } .sign-in{ diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb index ca8616d..bbca454 100644 --- a/app/views/pages/home.html.erb +++ b/app/views/pages/home.html.erb @@ -36,7 +36,25 @@ body { body { font-family: "Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif; } +.h4{ +text-align: center; +} +.sign-in{ +display:inline-flex; +} +#f{ + width:50px; + background-color: #2c3e50; + border-radius:4px; + padding-top:11px; + padding-bottom:11px; + color:white; + border-color:#2c3e50; + text-align:center; + float:left; + margin-right: 2px; +} .text-vertical-center { display: table-cell; text-align: center; @@ -259,7 +277,12 @@ footer { padding: 100px 0; } - + +
+
+ +

We're some KICKASS PEOPLE

+ <% if user_signed_in? %>

Welcome <%= current_user.name %>, you're signed in!

@@ -267,16 +290,8 @@ footer { <%= link_to "Click Here to make an event", "/events/new" %> <% else %>
-
-
-
-
-
-
-
-

Game On lets people connect with one another through competitive sport.

-

Try it out!

-
+

Game On lets people connect with one another through competitive sport.

+

Try it out!


-
-
- -

We're some KICKASS PEOPLE

-
- <%= link_to user_omniauth_authorize_path(:facebook) do %> - - <% end %> +